From 0adcf627d87b3504454582213a535485dba406c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 19 May 2025 01:32:49 +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 2b8e67d7..e42777bb 100644 --- a/quicksettings/autohidepanels/metadata.json +++ b/quicksettings/autohidepanels/metadata.json @@ -9,6 +9,7 @@ "Name[ca@valencia]": "Micah Stanley", "Name[ca]": "Micah Stanley", "Name[es]": "Micah Stanley", + "Name[eu]": "Micah Stanley", "Name[fr]": "Micah Stanley", "Name[gl]": "Micah Stanley", "Name[he]": "מיקה סטנלי", @@ -28,6 +29,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[eu]": "Panelak automatikoki ezkutatu ezarpen azkarra Plasma Mugikorrerako", "Description[fr]": "Configuration rapide pour le masquage automatique des panneaux de Plasma Mobile", "Description[gl]": "Opción rápida de agochar paneis automaticamente para Plasma Mobile.", "Description[he]": "הגדרות הסתרת לוחות אוטומטית מהירות לפלזמה לניידים", @@ -48,6 +50,7 @@ "Name[ca@valencia]": "Oculta automàticament els quadros", "Name[ca]": "Oculta automàticament els plafons", "Name[es]": "Ocultar paneles automáticamente", + "Name[eu]": "Panelak automatikoki ezkutatu", "Name[fr]": "Masquer automatiquement les panneaux", "Name[gl]": "Agochar os paneis automaticamente", "Name[he]": "הסתרת לוחות אוטומטית",