From c2d4424b8f22423422be53560b8938becd271c07 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 1 Sep 2019 08:24:07 +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/findmyphone/kdeconnect_findmyphone.json | 1 + plugins/ping/kdeconnect_ping.json | 1 + plugins/sftp/kdeconnect_sftp.json | 1 + 3 files changed, 3 insertions(+) diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json index 2223eadfd..93b83a216 100644 --- a/plugins/findmyphone/kdeconnect_findmyphone.json +++ b/plugins/findmyphone/kdeconnect_findmyphone.json @@ -95,6 +95,7 @@ "Description[nl]": "Zoek uw verloren telefoon door het een wekkersignaal te laten spelen", "Description[nn]": "Finn telefonen ved å la han spela eit lydsignal", "Description[pl]": "Znajdź twój zgubiony telefon odgrywając na nim dźwięk", + "Description[pt]": "Descobrir o seu telefone perdido, fazendo-o tocar um som de alarme", "Description[ru]": "Поиск утерянного телефона при помощи звукового сигнала", "Description[sk]": "Nájsť váš stratený telefón zahraním zvuku budíka", "Description[sr@ijekavian]": "Нађите изгубљени телефон активирањем звука аларма", diff --git a/plugins/ping/kdeconnect_ping.json b/plugins/ping/kdeconnect_ping.json index 87ffc3849..082319396 100644 --- a/plugins/ping/kdeconnect_ping.json +++ b/plugins/ping/kdeconnect_ping.json @@ -58,6 +58,7 @@ "Description[nl]": "Pings verzenden en ontvangen", "Description[nn]": "Send og ta imot pingsignal", "Description[pl]": "Wysyłaj i otrzymuj pingi", + "Description[pt]": "Enviar e receber contactos", "Description[ru]": "Отправка и получение пингов", "Description[sk]": "Poslať a prijať pingy", "Description[sr@ijekavian]": "Шаље и прима пингове", diff --git a/plugins/sftp/kdeconnect_sftp.json b/plugins/sftp/kdeconnect_sftp.json index 21ee1fea8..9dfe4cb44 100644 --- a/plugins/sftp/kdeconnect_sftp.json +++ b/plugins/sftp/kdeconnect_sftp.json @@ -98,6 +98,7 @@ "Name[nl]": "Bestandssysteembrowser op afstand", "Name[nn]": "Bla gjennom eksternt filsystem", "Name[pl]": "Przeglądarka zdalnego systemu plików", + "Name[pt]": "Navegador de sistemas de ficheiros remotos", "Name[ru]": "Удалённый просмотр файловой системы", "Name[sk]": "Prehliadač vzdialeného súborového systému", "Name[sr@ijekavian]": "Прегледач удаљеног фајл система",