From 6a48931c7c09a50ac30ac40501e434f9e3159616 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 31 Mar 2026 01:41:23 +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" --- kcms/time/kcm_mobile_time.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kcms/time/kcm_mobile_time.json b/kcms/time/kcm_mobile_time.json index 25c704bb..8aac99aa 100644 --- a/kcms/time/kcm_mobile_time.json +++ b/kcms/time/kcm_mobile_time.json @@ -3,8 +3,8 @@ "KPlugin": { "Description": "Timezone, Date Display", "Description[ar]": "المنطقة الزمنية,عرض التاريخ", - "Description[ca@valencia]": "Zona horària, Mostra la data", - "Description[ca]": "Zona horària, Mostra la data", + "Description[ca@valencia]": "Fus horari, Mostra la data", + "Description[ca]": "Fus horari, Mostra la data", "Description[cs]": "Zobrazení data a časového pásma", "Description[de]": "Zeitzone, Datumsanzeige", "Description[en_GB]": "Timezone, Date Display",