tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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-04-23 05:25:53 +02:00
parent 53f2e78b5b
commit 634d33be0c
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
smsapp/org.kde.kdeconnect.sms.desktop
View file

@ -6,6 +6,7 @@ Name[cs]=KDE Connect SMS
Name[de]=KDE-Connect-SMS
Name[en_GB]=KDE Connect SMS
Name[es]=SMS de KDE Connect
Name[gl]=SMS de KDE Connect
Name[it]=KDE Connect SMS
Name[nl]=KDE Connect SMS
Name[pt]=SMS do KDE Connect
@ -20,6 +21,7 @@ GenericName[cs]=SMS
GenericName[de]=SMS
GenericName[en_GB]=SMS
GenericName[es]=SMS
GenericName[gl]=SMS
GenericName[it]=SMS
GenericName[nl]=SMS
GenericName[pt]=SMS
@ -35,6 +37,7 @@ Comment[cs]=Zprávy
Comment[de]=Text-Nachrichten
Comment[en_GB]=Text Messaging
Comment[es]=Envío de mensajes de texto
Comment[gl]=Mensaxaría de texto.
Comment[it]=Messaggi di testo
Comment[nl]=Tekstberichten versturen
Comment[pt]=Mensagem de Texto