From 05ba3b7aa9e960f94cb0f2dcedfcb33ad971ad9f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 22 Aug 2025 01:35:33 +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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/quicksettings/kscreenosd/package/metadata.json b/quicksettings/kscreenosd/package/metadata.json index 7a69a17f..2c7aa700 100644 --- a/quicksettings/kscreenosd/package/metadata.json +++ b/quicksettings/kscreenosd/package/metadata.json @@ -5,8 +5,10 @@ { "Email": "sebas@kde.org", "Name": "Sebastian Kügler", + "Name[ar]": "سيباستيان كوغلر", "Name[ca]": "Sebastian Kügler", "Name[es]": "Sebastian Kügler", + "Name[eu]": "Sebastian Kügler", "Name[he]": "סבסטיאן קיגלר", "Name[ka]": "სებასტიან კუგლერი", "Name[nl]": "Sebastian Kügler", @@ -18,8 +20,10 @@ } ], "Description": "Screen setup OSD quick setting for Plasma Mobile", + "Description[ar]": "إعداد سريع العرض على الشاشة لبلازما الجوال", "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[he]": "חיווי על גבי המסך להגדרה מהירה של התצוגה לפלזמה לניידים", "Description[ka]": "ეკრანის OSD სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის", "Description[nl]": "Snelle instelling van OSD opzet van scherm voor Plasma Mobile", @@ -32,8 +36,10 @@ "Id": "org.kde.plasma.quicksetting.kscreenosd", "License": "GPL-2.0+", "Name": "Screen OSD", + "Name[ar]": "العرض على الشاشة", "Name[ca]": "OSD de la pantalla", "Name[es]": "OSD de pantalla", + "Name[eu]": "Pantailako OSD", "Name[he]": "חיווי על גבי המסך", "Name[ka]": "ეკრანის OSD", "Name[nl]": "OSD van scherm",