From 1799b03c026407b3da5102c41a0017c761c75865 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Mar 2024 01:16:49 +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" --- kded/autodetectapn/kded_plasma_mobile_autodetectapn.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kded/autodetectapn/kded_plasma_mobile_autodetectapn.json b/kded/autodetectapn/kded_plasma_mobile_autodetectapn.json index b57a4c58..b9b463ba 100644 --- a/kded/autodetectapn/kded_plasma_mobile_autodetectapn.json +++ b/kded/autodetectapn/kded_plasma_mobile_autodetectapn.json @@ -8,6 +8,7 @@ "Description[eu]": "Plasma Mugikorrean APN mugikorren hautemate automatikoa", "Description[fr]": "Détecter automatiquement les APN cellulaires dans Plasma Mobile", "Description[gl]": "Detectar APN celulares automaticamente en Plasma Mobile.", + "Description[hu]": "APN-ek automatikus észlelése a Plasma Mobile-ban", "Description[ia]": "Auto releva APNs de cellular in Plasma Mobile", "Description[it]": "Rileva automaticamente gli APN cellulari in Plasma Mobile", "Description[ka]": "ფიჭური APN-ების ავტომატური დადგენა Plasma Mobile-ში", @@ -27,6 +28,7 @@ "Name[eu]": "Plasma Mugikorrean APN hautemate automatikoa", "Name[fr]": "Auto-détection des APN de Plasma Mobile", "Name[gl]": "Detección de APN", + "Name[hu]": "Plasma Mobile automatikus APN észlelés", "Name[ia]": "Autorelevation de APNs de Plasma Mobile", "Name[it]": "Rilevamento automatico APN di Plasma Mobile", "Name[ka]": "Plasma Mobile-ის APN-ების ავტომატური დადგენა",