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-12-23 05:14:11 +01:00
parent f4c7e12ea6
commit e36bf748cc
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/kdeconnect-thunar.desktop
View file

@ -12,6 +12,7 @@ Name[de]=Mit KDE-Connect versenden
Name[en_GB]=Send via KDE Connect
Name[es]=Enviar via KDE Connect
Name[eu]=Bidali KDE Connect bidez
Name[fr]=Envoyer via KDE Connect
Name[gl]=Enviar mediante KDE Connect
Name[it]=Invia tramite KDE Connect
Name[nl]=Via KDE Connect versturen

2
plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json
View file

@ -34,6 +34,7 @@
"Description[en_GB]": "Control the volume of the connected device",
"Description[es]": "Controle el volumen del dispositivo conectado",
"Description[eu]": "Kontrolatu konektatutako gailuaren bolumena",
"Description[fr]": "Contrôler le volume du périphérique connecté",
"Description[gl]": "Controlar o volume do dispositivo conectado",
"Description[it]": "Controlla il volume del dispositivo connesso",
"Description[nl]": "Bestuur het volume van het verbonden apparaat",
@ -55,6 +56,7 @@
"Name[en_GB]": "Remote system volume",
"Name[es]": "Volumen del sistema remoto",
"Name[eu]": "Urruneko sistemaren bolumena",
"Name[fr]": "Volume du système distant",
"Name[gl]": "Volume de sistema remoto",
"Name[it]": "Volume del sistema remoto",
"Name[nl]": "Systeemvolume op afstand",