From fec583a198f76b240472b67396553ec67f6ac46d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 27 Mar 2021 06:01:16 +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 8ad71fa7f..263a08aca 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -7,6 +7,7 @@ "Name[az]": "David Shlemayev", "Name[ca@valencia]": "David Shlemayev", "Name[ca]": "David Shlemayev", + "Name[cs]": "David Shlemayev", "Name[es]": "David Shlemayev", "Name[fr]": "David Shlemayev", "Name[it]": "David Shlemayev", @@ -27,6 +28,7 @@ "Description[az]": "Telefonunuzun şəbəkə siqnalı gücü göstərilsin", "Description[ca@valencia]": "Mostra la intensitat del senyal de xarxa del vostre telèfon", "Description[ca]": "Mostra la intensitat del senyal de xarxa del vostre telèfon", + "Description[cs]": "Zobrazit sílu signálu telefonu", "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", @@ -49,6 +51,7 @@ "Name[az]": "Bağlantı monitoru", "Name[ca@valencia]": "Monitor de la connectivitat", "Name[ca]": "Monitor de la connectivitat", + "Name[cs]": "Monitor spojení", "Name[es]": "Monitor de conectividad", "Name[fr]": "Surveillance de connectivité", "Name[ia]": "Controlator de connectivitate",