From 704265a3d5b6868dc6fbb33811452aa0d6dca557 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 4 Apr 2024 01:15:46 +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" --- quicksettings/caffeine/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quicksettings/caffeine/metadata.json b/quicksettings/caffeine/metadata.json index cad3c471..51d5be45 100644 --- a/quicksettings/caffeine/metadata.json +++ b/quicksettings/caffeine/metadata.json @@ -66,7 +66,7 @@ "Description[pt]": "Configuração rápida para interromper a suspensão do sistema do Plasma Mobile", "Description[ru]": "Быстрая настройка приостановки системного сна для Plasma Mobile", "Description[sk]": "Rýchle nastavenie pozastavenia spánku systému pre Plasma Mobile", - "Description[sl]": "Hitre nastavitve za preprečevanje sistemskega dremeža za Plasma Mobile", + "Description[sl]": "Hitre nastavitve za preprečevanje sistemskega spanja za Plasma Mobile", "Description[tr]": "Plasma Cep sistem uykusunu askıya alma tez ayarı", "Description[uk]": "Швидке налаштовування призупинення роботи системи для Мобільної Плазми", "Description[x-test]": "xxQuick setting to suspend system sleep for Plasma Mobilexx",