From 8f70d0afcb8a6ea0a3df20fa4500e93b52c5e2a2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 31 May 2024 01:20:19 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/kded/autodetectapn/kded_plasma_mobile_autodetectapn.json b/kded/autodetectapn/kded_plasma_mobile_autodetectapn.json index ebef761e..3e00e1c9 100644 --- a/kded/autodetectapn/kded_plasma_mobile_autodetectapn.json +++ b/kded/autodetectapn/kded_plasma_mobile_autodetectapn.json @@ -28,6 +28,7 @@ "Name": "Plasma Mobile Autodetect APNs", "Name[ca@valencia]": "Detecció automàtica dels APN de Plasma Mobile", "Name[ca]": "Detecció automàtica dels APN del Plasma Mobile", + "Name[cs]": "Automatická detekce APN v Plasma Mobile", "Name[en_GB]": "Plasma Mobile Autodetect APNs", "Name[eo]": "Atomata APN-Ekkono de Plasma-Mobile", "Name[es]": "Detección automática de APN en Plasma Mobile",