From f09927a1f06c2baa0b4a7dfb70edd31c113963e1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 29 May 2018 05:34:48 +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 | 1 + 2 files changed, 3 insertions(+) diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice.json b/plugins/findthisdevice/kdeconnect_findthisdevice.json index 17ef78106..4e7a608ad 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice.json +++ b/plugins/findthisdevice/kdeconnect_findthisdevice.json @@ -15,6 +15,7 @@ "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", + "Description[nn]": "Finn denne eininga ved å la ho spela eit lydsignal", "Description[pt]": "Descubra este dispositivo, pondo-o a tocar um alarme de som", "Description[sv]": "Hitta apparaten genom att få den att spela ett alarmljud", "Description[uk]": "Знайти цей пристрій, наказавши йому відтворити дзвінок", @@ -29,6 +30,7 @@ "Name[gl]": "Atopar o dispositivo", "Name[it]": "Trova questo dispositivo", "Name[nl]": "Dit apparaat zoeken", + "Name[nn]": "Finn denne eininga", "Name[pt]": "Procurar este dispositivo", "Name[sv]": "Hitta apparaten", "Name[uk]": "Знайти цей пристрій", diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop index 92300ffa1..0e7c91f29 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop +++ b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop @@ -12,6 +12,7 @@ Name[en_GB]=Find This Device plugin settings 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 +Name[nn]=Innstillingar for einingsfinning Name[pt]=Configuração do 'plugin' para Procurar Este Dispositivo Name[sv]=Inställningar av insticksprogrammet Hitta apparaten Name[uk]=Параметри додатка пошуку пристрою