From a8e6caf7c0305abba8e58171f6d95775b49f6583 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 14 Mar 2024 01:15:01 +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/powermanagement/kcm_mobile_power.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcms/powermanagement/kcm_mobile_power.json b/kcms/powermanagement/kcm_mobile_power.json index 424e5780..f3c88018 100644 --- a/kcms/powermanagement/kcm_mobile_power.json +++ b/kcms/powermanagement/kcm_mobile_power.json @@ -25,7 +25,7 @@ "Description[pl]": "Ustawienia zarządzania energią", "Description[pt_BR]": "Configurar as opções do gerenciamento de energia", "Description[sk]": "Konfigurácia nastavení správy napájania", - "Description[sl]": "Konfiguriraj nastavitve upravljanja z energijo", + "Description[sl]": "Nastavi upravljanje z energijo", "Description[tr]": "Güç yönetimi ayarlarını yapılandır", "Description[uk]": "Налаштовування керування живленням", "Description[x-test]": "xxConfigure power management settingsxx",