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-03-27 05:26:51 +02:00
parent bee6c4a8be
commit 35f0747ff0

View file

@ -1,7 +1,28 @@
[Desktop Entry] [Desktop Entry]
Name=KDE Connect SMS Name=KDE Connect SMS
Name[ca]=SMS del KDE Connect
Name[ca@valencia]=SMS del KDE Connect
Name[nl]=KDE Connect SMS
Name[pt]=SMS do KDE Connect
Name[sv]=KDE-anslut SMS
Name[uk]=KDE Connect SMS
Name[x-test]=xxKDE Connect SMSxx
GenericName=SMS GenericName=SMS
GenericName[ca]=SMS
GenericName[ca@valencia]=SMS
GenericName[nl]=SMS
GenericName[pt]=SMS
GenericName[sv]=SMS
GenericName[uk]=SMS
GenericName[x-test]=xxSMSxx
Comment=Text Messaging Comment=Text Messaging
Comment[ca]=Missatgeria de text
Comment[ca@valencia]=Missatgeria de text
Comment[nl]=Tekstberichten versturen
Comment[pt]=Mensagem de Texto
Comment[sv]=Textmeddelanden
Comment[uk]=Обмін текстовими повідомленнями
Comment[x-test]=xxText Messagingxx
Exec=kdeconnect-sms Exec=kdeconnect-sms
Icon=kdeconnect Icon=kdeconnect
Type=Application Type=Application