From 67a6a9f0a6a9c3289456f4a41439f58e3e6a8a6b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 15 Mar 2021 06:53:29 +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" --- .../kdeconnect_connectivity_report.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plugins/connectivity-report/kdeconnect_connectivity_report.json b/plugins/connectivity-report/kdeconnect_connectivity_report.json index 7c2903552..6010d9bee 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -6,7 +6,10 @@ "Name": "David Shlemayev", "Name[az]": "David Shlemayev", "Name[ca]": "David Shlemayev", + "Name[nl]": "David Shlemayev", "Name[pt]": "David Shlemayev", + "Name[sk]": "David Shlemayev", + "Name[sl]": "David Shlemayev", "Name[sv]": "David Shlemayev", "Name[uk]": "Давид Шлемаєв", "Name[x-test]": "xxDavid Shlemayevxx" @@ -15,7 +18,10 @@ "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[nl]": "Signaalsterkte van het netwerk van uw telefoon tonen", "Description[pt]": "Mostrar a potência do sinal da rede do seu telefone", + "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", "Description[uk]": "Показ потужності сигналу мережі на вашому телефоні", "Description[x-test]": "xxShow your phone's network signal strengthxx", @@ -26,7 +32,10 @@ "Name": "Connectivity monitor", "Name[az]": "Bağlantı monitoru", "Name[ca]": "Monitor de la connectivitat", + "Name[nl]": "Monitor van connectiviteit", "Name[pt]": "Monitor de conectividade", + "Name[sk]": "Monitor pripojenia", + "Name[sl]": "Nadzornik povezovanja", "Name[sv]": "Anslutningsövervakare", "Name[uk]": "Монітор з'єднання", "Name[x-test]": "xxConnectivity monitorxx",