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-04-14 05:49:06 +02:00
parent 2c44f55f55
commit af97c5f1ff

View file

@ -1,5 +1,13 @@
[Desktop Entry] [Desktop Entry]
Name=KDE Connect SMS URL Handler Name=KDE Connect SMS URL Handler
Name[ca]=Gestor d'URL de SMS del KDE Connect
Name[en_GB]=KDE Connect SMS URL Handler
Name[nl]=URL behandelaar van KDE-Connect-SMS
Name[pt]=Tratamento de URL's de SMS do KDE Connect
Name[sv]=KDE-anslut hanterare av SMS-webbadress
Name[uk]=Обробник адрес у SMS KDE Connect
Name[x-test]=xxKDE Connect SMS URL Handlerxx
Name[zh_TW]=KDE
Exec=kdeconnect-handler %U Exec=kdeconnect-handler %U
Icon=kdeconnect Icon=kdeconnect
Type=Application Type=Application