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-06 05:23:01 +02:00
parent a8d5bb8c01
commit 44df1c3d07
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[de]=KDE-Connect-SMS
Name[en_GB]=KDE Connect SMS Name[en_GB]=KDE Connect SMS
Name[es]=SMS de KDE Connect Name[es]=SMS de KDE Connect
Name[it]=KDE Connect SMS
Name[nl]=KDE Connect SMS Name[nl]=KDE Connect SMS
Name[pt]=SMS do KDE Connect Name[pt]=SMS do KDE Connect
Name[sv]=KDE-anslut SMS Name[sv]=KDE-anslut SMS
@ -18,6 +19,7 @@ GenericName[cs]=SMS
GenericName[de]=SMS GenericName[de]=SMS
GenericName[en_GB]=SMS GenericName[en_GB]=SMS
GenericName[es]=SMS GenericName[es]=SMS
GenericName[it]=SMS
GenericName[nl]=SMS GenericName[nl]=SMS
GenericName[pt]=SMS GenericName[pt]=SMS
GenericName[sv]=SMS GenericName[sv]=SMS
@ -30,6 +32,7 @@ Comment[ca@valencia]=Missatgeria de text
Comment[cs]=Zprávy Comment[cs]=Zprávy
Comment[en_GB]=Text Messaging Comment[en_GB]=Text Messaging
Comment[es]=Envío de mensajes de texto Comment[es]=Envío de mensajes de texto
Comment[it]=Messaggi di testo
Comment[nl]=Tekstberichten versturen Comment[nl]=Tekstberichten versturen
Comment[pt]=Mensagem de Texto Comment[pt]=Mensagem de Texto
Comment[sv]=Textmeddelanden Comment[sv]=Textmeddelanden