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-11-16 05:48:33 +01:00
parent c1e36895b5
commit 50a94b26e8
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/kdeconnect-thunar.desktop
View file

@ -7,6 +7,9 @@ Icon=kdeconnect
Name=Send via KDE Connect Name=Send via KDE Connect
Name[ca]=Envia a través del KDE Connect Name[ca]=Envia a través del KDE Connect
Name[ca@valencia]=Envia a través del KDE Connect Name[ca@valencia]=Envia a través del KDE Connect
Name[cs]=Poslat přes KDE Connect
Name[de]=Mit KDE-Connect versenden
Name[es]=Enviar via KDE Connect
Name[gl]=Enviar mediante KDE Connect Name[gl]=Enviar mediante KDE Connect
Name[nl]=Via KDE Connect versturen Name[nl]=Via KDE Connect versturen
Name[nn]=Send via KDE Connect Name[nn]=Send via KDE Connect

2
plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json
View file

@ -28,6 +28,7 @@
"Description": "Control the volume of the connected device", "Description": "Control the volume of the connected device",
"Description[ca@valencia]": "Controla el volum del dispositiu connectat", "Description[ca@valencia]": "Controla el volum del dispositiu connectat",
"Description[ca]": "Controla el volum del dispositiu connectat", "Description[ca]": "Controla el volum del dispositiu connectat",
"Description[cs]": "Ovládejte hlasitost připojeného zařízení",
"Description[nl]": "Bestuur het volume van het verbonden apparaat", "Description[nl]": "Bestuur het volume van het verbonden apparaat",
"Description[nn]": "Juster lydstyrken til ekstern eining", "Description[nn]": "Juster lydstyrken til ekstern eining",
"Description[pt]": "Controle o volume do dispositivo ligado", "Description[pt]": "Controle o volume do dispositivo ligado",
@ -41,6 +42,7 @@
"Name": "Remote system volume", "Name": "Remote system volume",
"Name[ca@valencia]": "Volum del sistema remot", "Name[ca@valencia]": "Volum del sistema remot",
"Name[ca]": "Volum del sistema remot", "Name[ca]": "Volum del sistema remot",
"Name[cs]": "Hlasitost vzdáleného systému",
"Name[nl]": "Systeemvolume op afstand", "Name[nl]": "Systeemvolume op afstand",
"Name[nn]": "Ekstern lydstyrke", "Name[nn]": "Ekstern lydstyrke",
"Name[pt]": "Volume do sistema remoto", "Name[pt]": "Volume do sistema remoto",