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-19 05:16:12 +02:00
parent dd031d3deb
commit 53f2e78b5b
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,7 @@ Comment=Text Messaging
Comment[ca]=Missatgeria de text Comment[ca]=Missatgeria de text
Comment[ca@valencia]=Missatgeria de text Comment[ca@valencia]=Missatgeria de text
Comment[cs]=Zprávy Comment[cs]=Zprávy
Comment[de]=Text-Nachrichten
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[it]=Messaggi di testo