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-09-11 04:50:44 +02:00
parent 9348e14b01
commit 688b21f9f7
1 changed files with 1 additions and 0 deletions

View File

@ -162,6 +162,7 @@ Categories=System;Filesystem;KDE;Qt;
X-KDE-StartupNotify=true
Keywords=partition;disk;
Keywords[ca]=partició;disc;
Keywords[es]=partición;disco;
Keywords[nl]=partitie;schijf
Keywords[pt]=partição;disco;
Keywords[sr]=partition;disk;партиција;диск;