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-03-31 05:16:01 +02:00
parent 45c00f8db4
commit 88516226a4
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

@ -3,6 +3,7 @@ Name=KDE Connect SMS
Name[ca]=SMS del KDE Connect
Name[ca@valencia]=SMS del KDE Connect
Name[cs]=KDE Connect SMS
Name[en_GB]=KDE Connect SMS
Name[nl]=KDE Connect SMS
Name[pt]=SMS do KDE Connect
Name[sv]=KDE-anslut SMS
@ -12,6 +13,7 @@ GenericName=SMS
GenericName[ca]=SMS
GenericName[ca@valencia]=SMS
GenericName[cs]=SMS
GenericName[en_GB]=SMS
GenericName[nl]=SMS
GenericName[pt]=SMS
GenericName[sv]=SMS
@ -22,6 +24,7 @@ Comment=Text Messaging
Comment[ca]=Missatgeria de text
Comment[ca@valencia]=Missatgeria de text
Comment[cs]=Zprávy
Comment[en_GB]=Text Messaging
Comment[nl]=Tekstberichten versturen
Comment[pt]=Mensagem de Texto
Comment[sv]=Textmeddelanden