From 9b0cb6c109a771cf9704229166c002ee8f35f5a5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 25 Apr 2025 01:31:19 +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/autohidepanels/metadata.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/quicksettings/autohidepanels/metadata.json b/quicksettings/autohidepanels/metadata.json index 12a5d4fc..ca1cbfb1 100644 --- a/quicksettings/autohidepanels/metadata.json +++ b/quicksettings/autohidepanels/metadata.json @@ -8,6 +8,7 @@ "Name[ca@valencia]": "Micah Stanley", "Name[ca]": "Micah Stanley", "Name[es]": "Micah Stanley", + "Name[fr]": "Micah Stanley", "Name[he]": "מיקה סטנלי", "Name[ia]": "Micah Stanley", "Name[ka]": "Micah Stanley", @@ -22,6 +23,7 @@ "Description[ca@valencia]": "Configuració ràpida per a ocultar automàticament els quadros a Plasma Mobile", "Description[ca]": "Configuració ràpida per a ocultar automàticament els plafons al Plasma Mobile", "Description[es]": "Ajuste rápido de ocultación automática de paneles para Plasma Mobile", + "Description[fr]": "Configuration rapide pour le masquage automatique des panneaux de Plasma Mobile", "Description[he]": "הגדרות הסתרת לוחות אוטומטית מהירות לפלזמה לניידים", "Description[ia]": "Auto Cela Pannellos Preferentia rapide per Plasma Mobile", "Description[ka]": "პანელების ავტოდამალვის სწრაფად დაყენება Plasma Mobile-სთვის", @@ -37,6 +39,7 @@ "Name[ca@valencia]": "Oculta automàticament els quadros", "Name[ca]": "Oculta automàticament els plafons", "Name[es]": "Ocultar paneles automáticamente", + "Name[fr]": "Masquer automatiquement les panneaux", "Name[he]": "הסתרת לוחות אוטומטית", "Name[ia]": "Auto-Cela Pannellos", "Name[ka]": "პანელების ავტომატური დამალვა",