From 3cb0a380408c17147d292c7c7b053646fe2c90c8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 13 Feb 2022 01:42:21 +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.desktop | 5 +++++ quicksettings/powermenu/package/metadata.desktop | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/quicksettings/caffeine/metadata.desktop b/quicksettings/caffeine/metadata.desktop index fd6d8d84..f4c6b897 100644 --- a/quicksettings/caffeine/metadata.desktop +++ b/quicksettings/caffeine/metadata.desktop @@ -3,6 +3,11 @@ [Desktop Entry] Name=Caffeine +Name[ca]=Caffeine +Name[nl]=Cafeïne +Name[sv]=Koffein +Name[uk]=Кофеїн +Name[x-test]=xxCaffeinexx Icon=system-suspend-hibernate Type=Service diff --git a/quicksettings/powermenu/package/metadata.desktop b/quicksettings/powermenu/package/metadata.desktop index fbcfe4f0..e4923934 100644 --- a/quicksettings/powermenu/package/metadata.desktop +++ b/quicksettings/powermenu/package/metadata.desktop @@ -3,6 +3,11 @@ [Desktop Entry] Name=Power Menu +Name[ca]=Power Menu +Name[nl]=Energiemenu +Name[sv]=Strömmeny +Name[uk]=Меню живлення +Name[x-test]=xxPower Menuxx Icon=system-shutdown-symbolic Type=Service