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"
master
l10n daemon script 2019-06-03 05:24:26 +02:00
parent dc1a874188
commit 874d6c36ce
1 changed files with 1 additions and 0 deletions

View File

@ -15,6 +15,7 @@ GenericName[sk]=Programovací generátor väzieb
GenericName[sv]=Programmerar bindningsgenerator
GenericName[uk]=Засіб створення програмних прив'язок
GenericName[x-test]=xxProgramming Binding Generatorxx
GenericName[zh_TW]=程式 Binding 產生器
Icon=applications-development
Name=Rust Qt Binding Generator
Name[ca]=Generador de vincles pel Rust a les Qt