From af1ab23e0a9b01cdb6cff94d072403929027a30c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 12 Feb 2019 05:40:56 +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 1defebd88..876e2eb6a 100644 --- a/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop +++ b/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop @@ -2,6 +2,7 @@ Name= Find my device Name[ca]= Troba el meu dispositiu Name[ca@valencia]= Troba el meu dispositiu +Name[es]=Encontrar mi dispositivo Name[gl]=Atopar o meu dispositivo Name[nl]= Zoek mijn apparaat Name[pt]= Procurar o meu dispositivo @@ -11,6 +12,7 @@ Name[x-test]=xx Find my devicexx Comment=Ring connected devices Comment[ca]=Fa sonar als dispositius connectats Comment[ca@valencia]=Fa sonar als dispositius connectats +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 diff --git a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop index 7a962c697..046438a06 100644 --- a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop +++ b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop @@ -2,6 +2,7 @@ Name=Run command Name[ca]=Executa una ordre Name[ca@valencia]=Executa una ordre +Name[es]=Ejecutar orden Name[gl]=Executar unha orde Name[nl]=Commando uitvoeren Name[pt]=Executar um comando @@ -11,6 +12,7 @@ Name[x-test]=xxRun commandxx Comment=Run commands on connected devices Comment[ca]=Executa les ordres als dispositius connectats Comment[ca@valencia]=Executa les ordres als dispositius connectats +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