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-12-24 04:48:55 +01:00
parent c3b143903c
commit 7c1ff3cc19
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

@ -183,3 +183,4 @@ Keywords[sv]=partition;disk;
Keywords[tr]=bölümleme;disk;
Keywords[uk]=розділ;диск;
Keywords[x-test]=xxpartitionxx;xxdiskxx;
Keywords[zh_CN]=partition;disk;分区;磁盘;