From 6be4fae2c7b3d413ab6be023afd7393df19a9fdf Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 13 Mar 2022 01:57:43 +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 | 1 + quicksettings/powermenu/package/metadata.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/quicksettings/caffeine/metadata.desktop b/quicksettings/caffeine/metadata.desktop index 4acc5e22..52ec01b9 100644 --- a/quicksettings/caffeine/metadata.desktop +++ b/quicksettings/caffeine/metadata.desktop @@ -10,6 +10,7 @@ Name[cs]=Caffeine Name[en_GB]=Caffeine Name[es]=Cafeína Name[eu]=Caffeine +Name[fi]=Caffeine Name[fr]=Caffeine Name[hi]=कैफीन Name[hu]=Caffeine diff --git a/quicksettings/powermenu/package/metadata.desktop b/quicksettings/powermenu/package/metadata.desktop index 040ba963..75582e4c 100644 --- a/quicksettings/powermenu/package/metadata.desktop +++ b/quicksettings/powermenu/package/metadata.desktop @@ -9,6 +9,7 @@ Name[ca@valencia]=Power Menu Name[en_GB]=Power Menu Name[es]=Menú de energía Name[eu]=Energia menua +Name[fi]=Virranhallintavalikko Name[fr]=Menu « Énergie » Name[hi]=शक्ती मेन्यू Name[hu]=Energia menü