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-05-30 05:30:31 +02:00
parent 138147bf58
commit 2724ca1f64
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/findthisdevice/kdeconnect_findthisdevice.json
View file

@ -12,6 +12,7 @@
"Description[ca@valencia]": "Troba aquest dispositiu fent que reproduïsca un so d'alarma",
"Description[ca]": "Troba aquest dispositiu fent que reprodueixi un so d'alarma",
"Description[de]": "Finden Sie Ihr dieses Gerät, indem Sie mit ihm eine Warnton abspielen",
"Description[es]": "Encuentre este dispositivo haciéndole reproducir un sonido de alarma",
"Description[gl]": "Reproducir un son de alarma neste dispositivo para atopalo.",
"Description[it]": "Trova questo dispositivo facendogli suonare un allarme sonoro",
"Description[nl]": "Zoek dit apparaat door het een wekkersignaal te laten spelen",
@ -27,6 +28,7 @@
"Name": "Find this device",
"Name[ca@valencia]": "Troba aquest dispositiu",
"Name[ca]": "Troba aquest dispositiu",
"Name[es]": "Encontrar este dispositivo",
"Name[gl]": "Atopar o dispositivo",
"Name[it]": "Trova questo dispositivo",
"Name[nl]": "Dit apparaat zoeken",

2
plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop
View file

@ -8,7 +8,9 @@ X-KDE-ParentComponents=kdeconnect_findthisdevice
Name=Find This Device plugin settings
Name[ca]=Troba els ajustaments d'aquest connector de dispositiu
Name[ca@valencia]=Troba els ajustaments d'aquest connector de dispositiu
Name[de]=Modul-Einstellungen diese Geräts suchen
Name[en_GB]=Find This Device plugin settings
Name[es]=Preferencias del complemento «Encontrar este dispositivo»
Name[gl]=Configuración do complemento de atopar o dispositivo
Name[it]=Impostazioni estensione Trova questo dispositivo
Name[nl]=Plug-in-instellingen van dit apparaat zoeken