andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours 

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
l10n daemon script 2017-10-24 05:07:07 +02:00
parent 7acc8b226e
commit 0b1780397e
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/org.kde.partitionmanager.desktop
View File

@ -176,5 +176,6 @@ Keywords[sr@ijekavian]=partition;disk;партиција;диск;
Keywords[sr@ijekavianlatin]=partition;disk;particija;disk;
Keywords[sr@latin]=partition;disk;particija;disk;
Keywords[sv]=partition;disk;
Keywords[tr]=bölümleme;disk;
Keywords[uk]=розділ;диск;
Keywords[x-test]=xxpartitionxx;xxdiskxx;