From f681911dd3638466f5bc98c3d465c665003f5b27 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 15 Jun 2021 01:17:48 +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 ad136b313..d5a51e0ac 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -9,6 +9,7 @@ "Name[ca]": "David Shlemayev", "Name[cs]": "David Shlemayev", "Name[de]": "David Shlemayev", + "Name[el]": "David Shlemayev", "Name[en_GB]": "David Shlemayev", "Name[es]": "David Shlemayev", "Name[eu]": "David Shlemayev", @@ -37,6 +38,7 @@ "Description[ca]": "Mostra la intensitat del senyal de xarxa del vostre telèfon", "Description[cs]": "Zobrazit sílu signálu telefonu", "Description[de]": "Signalstärke des Mobiltelefons anzeigen", + "Description[el]": "Εμφάνιση της ισχύος του δικτυακού σήματος", "Description[en_GB]": "Show your phone's network signal strength", "Description[es]": "Muestra la fuerza de la señal de red de su teléfono", "Description[eu]": "Erakutsi zure telefonoaren sare-seinalearen sendotasuna", @@ -67,6 +69,7 @@ "Name[ca]": "Monitor de la connectivitat", "Name[cs]": "Monitor spojení", "Name[de]": "Verbindungs-Überwachung", + "Name[el]": "Παρακολούθηση συνδεσιμότητας", "Name[en_GB]": "Connectivity monitor", "Name[es]": "Monitor de conectividad", "Name[eu]": "Konektagarritasun begiralea",