From 8804c67e61f6d9ea595433c8ee025ec9cf58705c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 22 Mar 2021 08:43:10 +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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/connectivity-report/kdeconnect_connectivity_report.json b/plugins/connectivity-report/kdeconnect_connectivity_report.json index 8d79adbdc..12d25c5ee 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -11,6 +11,7 @@ "Name[ia]": "David Shlemayev", "Name[it]": "David Shlemayev", "Name[nl]": "David Shlemayev", + "Name[nn]": "David Shlemayev", "Name[pl]": "David Shlemayev", "Name[pt]": "David Shlemayev", "Name[pt_BR]": "David Shlemayev", @@ -27,6 +28,7 @@ "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[nn]": "Vis signalstyrke til telefon­nettverket", "Description[pl]": "Pokaż siłę sygnału sieciowego swojego telefnou", "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", @@ -46,6 +48,7 @@ "Name[ia]": "Controlator de connectivitate", "Name[it]": "Monitor di connettività", "Name[nl]": "Monitor van connectiviteit", + "Name[nn]": "Sambands­overvaking", "Name[pl]": "Monitor łączności", "Name[pt]": "Monitor de conectividade", "Name[pt_BR]": "Monitor de conectividade",