From f5ac506835798c9c6ad11ae1c84a50fb05dafe52 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 16 Feb 2019 05:37:45 +0100 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" --- .../findmyphone/plasma-runner-kdeconnect-findmyphone.desktop | 2 ++ .../plasma-runner-kdeconnect-remotecommands.desktop | 2 ++ 2 files changed, 4 insertions(+) diff --git a/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop b/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop index b6e33d365..c2d3d3660 100644 --- a/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop +++ b/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop @@ -7,6 +7,7 @@ Name[es]=Encontrar mi dispositivo Name[gl]=Atopar o meu dispositivo Name[nl]= Zoek mijn apparaat Name[pt]= Procurar o meu dispositivo +Name[pt_BR]= Localizar meu dispositivo Name[sv]=Hitta min apparat Name[uk]=Знайти пристрій Name[x-test]=xx Find my devicexx @@ -19,6 +20,7 @@ Comment[es]=Hacer sonar los dispositivos conectados Comment[gl]=Facer soar os dispositivos conectados Comment[nl]=Bel verbonden apparaten Comment[pt]=Tocar os dispositivos ligados +Comment[pt_BR]=Toca os dispositivos conectados Comment[sv]=Ring anslutna apparater Comment[uk]=Дзвінок на з'єднаних пристроях Comment[x-test]=xxRing connected devicesxx diff --git a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop index 25aeb1639..17c0050ce 100644 --- a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop +++ b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop @@ -7,6 +7,7 @@ Name[es]=Ejecutar orden Name[gl]=Executar unha orde Name[nl]=Commando uitvoeren Name[pt]=Executar um comando +Name[pt_BR]=Executar comando Name[sv]=Kör kommando Name[uk]=Виконати команду Name[x-test]=xxRun commandxx @@ -19,6 +20,7 @@ Comment[es]=Ejecutar órdenes en los dispositivos conectados Comment[gl]=Executar ordes nos dispositivos conectados Comment[nl]=Commando's op verbonden apparaten uitvoeren Comment[pt]=Executar comandos nos dispositivos ligados +Comment[pt_BR]=Executa comandos nos dispositivos conectados Comment[sv]=Kör kommando på anslutna apparater Comment[uk]=Виконання команд на з'єднаних пристроях Comment[x-test]=xxRun commands on connected devicesxx