From b9aad6286fde2492c363dc0b1ec1a1388049a074 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 24 Mar 2023 02:23:55 +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/clockconfig_actions.actions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcms/time/clockconfig_actions.actions b/kcms/time/clockconfig_actions.actions index 499060f5..81437868 100644 --- a/kcms/time/clockconfig_actions.actions +++ b/kcms/time/clockconfig_actions.actions @@ -16,7 +16,7 @@ Name[nl]=Controlemodule van datum en tijd Name[nn]=Kontrollmodul for dato og klokkeslett Name[pt_BR]=Módulo de controle da data e hora Name[sl]=Kontrolni modul datuma in časa -Name[tr]=Tarih ve Saat Denetim Modülü +Name[tr]=Tarih ve Zaman Denetim Modülü Name[uk]=Модуль керування датою і часом Name[x-test]=xxDate and Time Control Modulexx Icon=preferences-system-time