From a72d22101c832ebdfbae237edc704247b765cb3f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 2 Jan 2023 02:27:35 +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" --- kcm/kcm_kdeconnect.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kcm/kcm_kdeconnect.json b/kcm/kcm_kdeconnect.json index 635bf9be1..aa103364b 100644 --- a/kcm/kcm_kdeconnect.json +++ b/kcm/kcm_kdeconnect.json @@ -3,9 +3,12 @@ "KPlugin": { "Description": "Connect and sync your devices", "Description[ar]": "اتّصل وزامن أجهزتك", + "Description[ca@valencia]": "Connecta i sincronitza els vostres dispositius", "Description[ca]": "Connecta i sincronitza els vostres dispositius", "Description[en_GB]": "Connect and sync your devices", "Description[eu]": "Zure gailuak konektatu eta sinkronizatzea", + "Description[fr]": "Vous connecter à vos périphériques et se synchroniser avec eux", + "Description[ka]": "თქვენი მოწყობილობების მიერთება და სინქრონიზაცია", "Description[nl]": "Uw apparaten verbinden en synchroniseren", "Description[tr]": "Aygıtlarını bağla ve eşzamanla", "Description[uk]": "З'єднання і синхронізація ваших пристроїв", @@ -13,10 +16,12 @@ "Icon": "preferences-kde-connect", "Name": "KDE Connect", "Name[ar]": "كدي المتّصل", + "Name[ca@valencia]": "KDE Connect", "Name[ca]": "KDE Connect", "Name[en_GB]": "KDE Connect", "Name[es]": "KDE Connect", "Name[eu]": "KDE Connect", + "Name[fr]": "KDE Connect", "Name[nl]": "KDE Connect", "Name[tr]": "KDE Connect", "Name[uk]": "KDE Connect",