From fc3ee357eff3c5ae96239fa81eecd6f3e2a7b2f3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 18 Nov 2024 03:14:01 +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 | 1 + plasmoid/package/metadata.json | 1 + 2 files changed, 2 insertions(+) diff --git a/kcm/kcm_kdeconnect.json b/kcm/kcm_kdeconnect.json index ed3bfd15b..9c737fb4d 100644 --- a/kcm/kcm_kdeconnect.json +++ b/kcm/kcm_kdeconnect.json @@ -14,6 +14,7 @@ "Description[fr]": "Configurer la synchronisation des périphériques", "Description[gl]": "Configurar a sincronización de dispositivos.", "Description[he]": "הגדרת סנכרון מכשירים", + "Description[hu]": "Eszközszinkronizáció beállítása", "Description[ia]": "Configura Synchronisation de dispositivo", "Description[is]": "Grunnstilla samstillingu tækja", "Description[it]": "Configura la sincronizzazione del dispositivo", diff --git a/plasmoid/package/metadata.json b/plasmoid/package/metadata.json index a3eff1c7d..8f95e219e 100644 --- a/plasmoid/package/metadata.json +++ b/plasmoid/package/metadata.json @@ -62,6 +62,7 @@ "Description[fr]": "Gérer les appareils connectés", "Description[gl]": "Xestionar os dispositivos conectados.", "Description[he]": "ניהול התקנים מחוברים", + "Description[hu]": "Csatlakoztatott eszközök kezelése", "Description[ia]": "Gere dispositivos connectite", "Description[is]": "Stjórna tengdum tækjum", "Description[it]": "Gestisci i dispositivi connessi",