From 2724ca1f6437b5ae73b037cdb7be48606f7c59e0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 30 May 2018 05:30:31 +0200 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours 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" --- plugins/findthisdevice/kdeconnect_findthisdevice.json | 2 ++ plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop | 2 ++ 2 files changed, 4 insertions(+) diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice.json b/plugins/findthisdevice/kdeconnect_findthisdevice.json index 4e7a608ad..95e876a65 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice.json +++ b/plugins/findthisdevice/kdeconnect_findthisdevice.json @@ -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", diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop index 0e7c91f29..b3ce19576 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop +++ b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop @@ -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