From 45691c6a810f88586a900d95209083a38d145a85 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 23 Mar 2021 05:42:13 +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 5c1cf0956..d3527e51f 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -5,6 +5,7 @@ "Email": "david.shlemayev@gmail.com", "Name": "David Shlemayev", "Name[az]": "David Shlemayev", + "Name[ca@valencia]": "David Shlemayev", "Name[ca]": "David Shlemayev", "Name[es]": "David Shlemayev", "Name[fr]": "David Shlemayev", @@ -23,6 +24,7 @@ ], "Description": "Show your phone's network signal strength", "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[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", @@ -43,6 +45,7 @@ "License": "GPL", "Name": "Connectivity monitor", "Name[az]": "Bağlantı monitoru", + "Name[ca@valencia]": "Monitor de la connectivitat", "Name[ca]": "Monitor de la connectivitat", "Name[es]": "Monitor de conectividad", "Name[fr]": "Surveillance de connectivité",