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 2019-01-14 05:31:55 +01:00
parent 0b1fbde12d
commit 708262e195
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

@ -18,6 +18,7 @@ Name[it]=Invia tramite KDE Connect
Name[nl]=Via KDE Connect versturen
Name[nn]=Send via KDE Connect
Name[pt]=Enviar pelo KDE Connect
Name[pt_BR]=Enviar via KDE Connect
Name[sv]=Skicka via KDE-anslut
Name[uk]=Надіслати за допомогою KDE Connect
Name[x-test]=xxSend via KDE Connectxx

2
plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json
View file

@ -42,6 +42,7 @@
"Description[nn]": "Juster lydstyrken til ekstern eining",
"Description[pl]": "Sterowanie głośnością podłączonego urządzenia",
"Description[pt]": "Controle o volume do dispositivo ligado",
"Description[pt_BR]": "Controle o volume do dispositivo conectado",
"Description[sv]": "Kontrollera volymen på ansluten apparat",
"Description[uk]": "Керування томом сховища даних на з'єднаному пристрої",
"Description[x-test]": "xxControl the volume of the connected devicexx",
@ -66,6 +67,7 @@
"Name[nn]": "Ekstern lydstyrke",
"Name[pl]": "Głośność na zdalnym systemie",
"Name[pt]": "Volume do sistema remoto",
"Name[pt_BR]": "Volume do sistema remoto",
"Name[sv]": "Fjärrsystemvolym",
"Name[uk]": "Віддалений системний том",
"Name[x-test]": "xxRemote system volumexx",