From bd586b5fc1b0e0c909bc13be6b237a5fb0744c34 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 4 Jun 2023 02:34:51 +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 dffcc970..06efd30b 100644 --- a/kcms/time/clockconfig_actions.actions +++ b/kcms/time/clockconfig_actions.actions @@ -69,7 +69,7 @@ Description[eo]=Sistemaj politikoj malhelpas vin konservi la agordojn de dato/te Description[es]=Las políticas del sistema le impiden guardar las preferencias de fecha y hora. Description[eu]=Sistemako gidalerroek data/ordu ezarpenak gordetzea eragozten dizute. Description[fi]=Järjestelmäkäytäntö estää sinua tallentamasta aika-asetuksia. -Description[fr]=La politique du système vous empêche d’enregistrer la configuration pour la date et l'heure. +Description[fr]=La politique du système vous empêche d'enregistrer la configuration pour la date et l'heure. Description[ia]=Le politicas de systema preveni te ex salveguardar le preferentias de tempore/data. Description[it]=Le politiche del sistema ti impediscono di salvare le impostazioni di data e ora. Description[ka]=სისტემის წესები გიკრძალავთ დროის/თარიღის პარამეტრების შენახვას.