From 36f672beb862e38e31d10fa59b3e07302190c0b6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 14 Sep 2016 11:52:55 +0000 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/kdeconnect.notifyrc | 1 + .../kdeconnect_sendnotifications_config.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 12196be51..4d2eb51de 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -102,6 +102,7 @@ Comment[it]=Richiesta di associazione ricevuta da un dispositivo Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat Comment[pl]=Otrzymano żądanie parowania z urządzenia Comment[pt]=Pedido de emparelhamento recebido de um dispositivo +Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo Comment[sk]=Požiadavka na spárovanie prijatá zo zariadenia Comment[sv]=Begäran om ihopparning mottagen från en apparat Comment[uk]=Від пристрою отримано запит щодо пов’язування diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop index 77bed1f6a..7bfab0e50 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop +++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop @@ -16,6 +16,7 @@ Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche Name[nl]=Instellingen voor meldingen van synchronisatie plug-in Name[pl]=Ustawienia wtyczki synchronizującej powiadomienia Name[pt]=Configuração do 'plugin' de sincronização das notificações +Name[pt_BR]=Configuração do plugin de sincronização das notificações Name[sk]=Nastavenia pluginu notifikácií synchronizácie Name[sv]=Inställningar av insticksprogram för underrättelsesynkronisering Name[uk]=Параметри додатка синхронізації сповіщень