From 66a0c38d2cc601647bda18f6e3aedd439f5a1010 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 28 Aug 2025 01:36:44 +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/kscreenosd/package/metadata.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/quicksettings/kscreenosd/package/metadata.json b/quicksettings/kscreenosd/package/metadata.json index 858ade86..902ac7ed 100644 --- a/quicksettings/kscreenosd/package/metadata.json +++ b/quicksettings/kscreenosd/package/metadata.json @@ -9,6 +9,7 @@ "Name[ca]": "Sebastian Kügler", "Name[es]": "Sebastian Kügler", "Name[eu]": "Sebastian Kügler", + "Name[fr]": "Sebastian Kügler", "Name[he]": "סבסטיאן קיגלר", "Name[it]": "Sebastian Kügler", "Name[ka]": "სებასტიან კუგლერი", @@ -28,6 +29,7 @@ "Description[ca]": "Configuració ràpida de l'OSD de la pantalla per al Plasma Mobile", "Description[es]": "Ajuste rápido del OSD de configuración de pantalla para Plasma Mobile", "Description[eu]": "Pantaila ezarpena OSD ezarpen azkarra Plasma Mugikorrerako", + "Description[fr]": "Configuration rapide de l'incrustation vidéo sur écran (OSD) pour Plasma Mobile", "Description[he]": "חיווי על גבי המסך להגדרה מהירה של התצוגה לפלזמה לניידים", "Description[it]": "Configurazione rapida dell'OSD per Plasma Mobile", "Description[ka]": "ეკრანის OSD სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის", @@ -48,6 +50,7 @@ "Name[ca]": "OSD de la pantalla", "Name[es]": "OSD de pantalla", "Name[eu]": "Pantailako OSD", + "Name[fr]": "Incrustation vidéo sur écran (OSD)", "Name[he]": "חיווי על גבי המסך", "Name[it]": "OSD schermo", "Name[ka]": "ეკრანის OSD",