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 2015-05-29 10:01:23 +00:00
parent 397e6f69e3
commit 3c1cdc3545
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kdeconnect-non-plasma.desktop
View file

@ -32,6 +32,7 @@ Comment[ca]=Connecteu amb els vostres dispositius
Comment[cs]=Dosáhněte na svá zařízení Comment[cs]=Dosáhněte na svá zařízení
Comment[en_GB]=Reach out to your devices Comment[en_GB]=Reach out to your devices
Comment[es]=Contactar con sus dispositivos Comment[es]=Contactar con sus dispositivos
Comment[fi]=Tavoitettavuutta laitteillesi
Comment[gl]=Chega aos teus dispositivos. Comment[gl]=Chega aos teus dispositivos.
Comment[hu]=Érje el eszközeit Comment[hu]=Érje el eszközeit
Comment[it]=Comunica con i tuoi dispositivi Comment[it]=Comunica con i tuoi dispositivi