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-05 05:26:49 +02:00
parent f1f19eb01b
commit a8d5bb8c01
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ Name=KDE Connect SMS
Name[ca]=SMS del KDE Connect Name[ca]=SMS del KDE Connect
Name[ca@valencia]=SMS del KDE Connect Name[ca@valencia]=SMS del KDE Connect
Name[cs]=KDE Connect SMS Name[cs]=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[nl]=KDE Connect SMS Name[nl]=KDE Connect SMS
@ -14,6 +15,7 @@ GenericName=SMS
GenericName[ca]=SMS GenericName[ca]=SMS
GenericName[ca@valencia]=SMS GenericName[ca@valencia]=SMS
GenericName[cs]=SMS GenericName[cs]=SMS
GenericName[de]=SMS
GenericName[en_GB]=SMS GenericName[en_GB]=SMS
GenericName[es]=SMS GenericName[es]=SMS
GenericName[nl]=SMS GenericName[nl]=SMS