From e8cffe2d4925dc4a240d62c987291f4528df5195 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 17 May 2021 01:29:19 +0000 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 a2d34357a..bb250b264 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -14,6 +14,7 @@ "Name[fi]": "David Shlemayev", "Name[fr]": "David Shlemayev", "Name[it]": "David Shlemayev", + "Name[ko]": "David Shlemayev", "Name[nl]": "David Shlemayev", "Name[nn]": "David Shlemayev", "Name[pl]": "David Shlemayev", @@ -40,6 +41,7 @@ "Description[fi]": "Näytä puhelimen kentän voimakkuus", "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[ko]": "내 휴대폰의 네트워크 신호 세기 표시", "Description[nl]": "Signaalsterkte van het netwerk van uw telefoon tonen", "Description[nn]": "Vis signalstyrke til telefon­nettverket", "Description[pl]": "Pokazuje siłę sygnału sieciowego innego urządzenia", @@ -69,6 +71,7 @@ "Name[fr]": "Surveillance de connectivité", "Name[ia]": "Controlator de connectivitate", "Name[it]": "Monitor di connettività", + "Name[ko]": "연결 모니터", "Name[nl]": "Monitor van connectiviteit", "Name[nn]": "Sambands­overvaking", "Name[pl]": "Zgłaszanie łączności",