From b2036bd374fe375bcfddbe1ef59fcdd99695f91c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 20 Mar 2021 06:24:53 +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" --- .../connectivity-report/kdeconnect_connectivity_report.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/connectivity-report/kdeconnect_connectivity_report.json b/plugins/connectivity-report/kdeconnect_connectivity_report.json index be0a73103..cc125a8f1 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -6,10 +6,12 @@ "Name": "David Shlemayev", "Name[az]": "David Shlemayev", "Name[ca]": "David Shlemayev", + "Name[es]": "David Shlemayev", "Name[fr]": "David Shlemayev", "Name[it]": "David Shlemayev", "Name[nl]": "David Shlemayev", "Name[pt]": "David Shlemayev", + "Name[pt_BR]": "David Shlemayev", "Name[sk]": "David Shlemayev", "Name[sl]": "David Shlemayev", "Name[sv]": "David Shlemayev", @@ -20,10 +22,12 @@ "Description": "Show your phone's network signal strength", "Description[az]": "Telefonunuzun şəbəkə siqnalı gücü göstərilsin", "Description[ca]": "Mostra la intensitat del senyal de xarxa del vostre telèfon", + "Description[es]": "Muestra la fuerza de la señal de red de su teléfono", "Description[fr]": "Afficher la force du signal du réseau pour votre téléphone", "Description[it]": "Mostra la potenza del segnale di rete del tuo telefono", "Description[nl]": "Signaalsterkte van het netwerk van uw telefoon tonen", "Description[pt]": "Mostrar a potência do sinal da rede do seu telefone", + "Description[pt_BR]": "Mostra a força do sinal de rede do seu celular", "Description[sk]": "Zobraziť silu signálu vášho telefónu", "Description[sl]": "Pokaži moč omrežnega signala telefona", "Description[sv]": "Visa telefonens nätverkssignalstyrka", @@ -36,10 +40,12 @@ "Name": "Connectivity monitor", "Name[az]": "Bağlantı monitoru", "Name[ca]": "Monitor de la connectivitat", + "Name[es]": "Monitor de conectividad", "Name[fr]": "Surveillance de connectivité", "Name[it]": "Monitor di connettività", "Name[nl]": "Monitor van connectiviteit", "Name[pt]": "Monitor de conectividade", + "Name[pt_BR]": "Monitor de conectividade", "Name[sk]": "Monitor pripojenia", "Name[sl]": "Nadzornik povezovanja", "Name[sv]": "Anslutningsövervakare",