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 2019-02-10 05:24:10 +01:00
parent 98d59e69ff
commit 0e714dee65
1 changed files with 1 additions and 1 deletions

View File

@ -160,7 +160,7 @@ Icon=partitionmanager
Categories=System;Filesystem;KDE;Qt;
X-KDE-StartupNotify=true
Keywords=partition;disk;
Keywords[ast]=partición;discu;
Keywords[ast]=partición;particionar;discu;
Keywords[ca]=partició;disc;
Keywords[ca@valencia]=partició;disc;
Keywords[cs]=oddíl;disk;