From fe1a7e5f7c63083067932a87e3560f193e7dd072 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 21 Dec 2022 01:55:48 +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/powermenu/package/metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quicksettings/powermenu/package/metadata.json b/quicksettings/powermenu/package/metadata.json index 3939c5b6..68330c04 100644 --- a/quicksettings/powermenu/package/metadata.json +++ b/quicksettings/powermenu/package/metadata.json @@ -32,7 +32,7 @@ ], "Description": "Power menu quick setting", "Description[ca@valencia]": "Configuració ràpida del menú d'energia", - "Description[ca]": "Configuració ràpida del menú d'energia", + "Description[ca]": "Configuració ràpida del menú d'engegada", "Description[en_GB]": "Power menu quick setting", "Description[es]": "Ajuste rápido del menú de energía", "Description[eu]": "Indar-menuaren ezarpen azkarra", @@ -56,7 +56,7 @@ "Name": "Power Menu", "Name[az]": "Güc menyusu", "Name[ca@valencia]": "Menú d'energia", - "Name[ca]": "Menú d'energia", + "Name[ca]": "Menú d'engegada", "Name[en_GB]": "Power Menu", "Name[es]": "Menú de energía", "Name[eu]": "Energia menua",