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 2018-12-03 05:30:16 +01:00
parent beed97ee84
commit 033651f422
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

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