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-08-01 10:37:53 +00:00
parent 886787f732
commit 43161b3932
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/lockdevice/kdeconnect_lockdevice.json
View file

@ -11,6 +11,7 @@
"Description[ca]": "Bloqueja els vostres sistemes",
"Description[de]": "Sperrt Ihre Systeme",
"Description[es]": "Bloquear sus sistemas",
"Description[fi]": "Lukitsee järjestelmäsi",
"Description[gl]": "Bloquea os seus sistemas.",
"Description[nl]": "Vergrendeld uw systemen",
"Description[pl]": "Zablokuj swoje systemy",
@ -27,6 +28,7 @@
"Name[ca]": "Bloqueja el dispositiu",
"Name[de]": "Gerätesperrung",
"Name[es]": "Bloquear dispositivo",
"Name[fi]": "Lukitse laite",
"Name[gl]": "Bloqueo do dispositivo",
"Name[nl]": "Apparaat vergrendelen",
"Name[pl]": "ZablokujUrządzenie",

4
plugins/mpriscontrol/kdeconnect_mpriscontrol.json
View file

@ -13,7 +13,7 @@
"Description[de]": "Fernbedienung für Musik und Videos",
"Description[en_GB]": "Remote control your music and videos",
"Description[es]": "Controlar remotamente vídeos y música",
"Description[fi]": "Kaukosäädin musiikkiisi ja videoihisi",
"Description[fi]": "Kauko-ohjain musiikkiisi ja videoihisi",
"Description[gl]": "Use o teléfono móbil como mando a distancia para música e vídeos.",
"Description[hu]": "A zene- és videolejátszás irányítása távolról",
"Description[it]": "Controlla da remoto la tua musica e i video",
@ -37,7 +37,7 @@
"Name[de]": "Steuerung für Multimedia-Empfänger",
"Name[en_GB]": "Multimedia control receiver",
"Name[es]": "Receptor de control multimedia",
"Name[fi]": "Multimediakaukosäädin",
"Name[fi]": "Multimediakauko-ohjain",
"Name[gl]": "Receptor de controis multimedia",
"Name[hu]": "Multimédiavezérlő",
"Name[it]": "Ricevitore di controllo multimediale",

2
plugins/mprisremote/kdeconnect_mprisremote.json
View file

@ -33,7 +33,7 @@
"Name[cs]": "MprisRemote",
"Name[de]": "MprisRemote",
"Name[es]": "MprisRemote",
"Name[fi]": "MPRIS-kaukosäädin",
"Name[fi]": "MPRIS-kauko-ohjain",
"Name[gl]": "MprisRemote",
"Name[it]": "MprisRemote",
"Name[nl]": "MprisRemote",

2
plugins/remotecontrol/kdeconnect_remotecontrol.json
View file

@ -10,6 +10,7 @@
"Description": "Control Remote systems",
"Description[ca]": "Sistemes de control remot",
"Description[es]": "Controlar sistemas remotos",
"Description[fi]": "Ohjaa järjestelmiä etänä",
"Description[gl]": "Controla sistemas remotos.",
"Description[nl]": "Systemen op afstand bedienen",
"Description[pl]": "Sterowanie zdalnymi systemami",
@ -25,6 +26,7 @@
"Name": "RemoteControl",
"Name[ca]": "Control remot",
"Name[es]": "Control remoto",
"Name[fi]": "Kauko-ohjain",
"Name[gl]": "Mando a distancia",
"Name[nl]": "Afstandsbediening",
"Name[pl]": "ZdalneSterowanie",