From 3ae0436da1403346c40e57feea10c128d3ece3df Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 21 Aug 2025 01:36:27 +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" --- kcms/info/kcm_mobile_info.json | 3 ++- .../kscreenosd/package/metadata.json | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/kcms/info/kcm_mobile_info.json b/kcms/info/kcm_mobile_info.json index 247d8d3e..16335fa1 100644 --- a/kcms/info/kcm_mobile_info.json +++ b/kcms/info/kcm_mobile_info.json @@ -39,7 +39,8 @@ "Description[zh_CN]": "软件版本", "Description[zh_TW]": "軟體版本", "FormFactors": [ - "handset", "tablet" + "handset", + "tablet" ], "Icon": "dialog-information", "Name": "Information", diff --git a/quicksettings/kscreenosd/package/metadata.json b/quicksettings/kscreenosd/package/metadata.json index 5ba77827..7a69a17f 100644 --- a/quicksettings/kscreenosd/package/metadata.json +++ b/quicksettings/kscreenosd/package/metadata.json @@ -5,15 +5,42 @@ { "Email": "sebas@kde.org", "Name": "Sebastian Kügler", + "Name[ca]": "Sebastian Kügler", + "Name[es]": "Sebastian Kügler", + "Name[he]": "סבסטיאן קיגלר", + "Name[ka]": "სებასტიან კუგლერი", + "Name[nl]": "Sebastian Kügler", + "Name[sl]": "Sebastian Kügler", + "Name[sv]": "Sebastian Kügler", + "Name[tr]": "Sebastian Kügler", + "Name[uk]": "Sebastian Kügler", "Name[x-test]": "xxSebastian Küglerxx" } ], "Description": "Screen setup OSD quick setting for Plasma Mobile", + "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[he]": "חיווי על גבי המסך להגדרה מהירה של התצוגה לפלזמה לניידים", + "Description[ka]": "ეკრანის OSD სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის", + "Description[nl]": "Snelle instelling van OSD opzet van scherm voor Plasma Mobile", + "Description[sl]": "Hitra nastavitev zaslona na zaslonu za Plasma Mobile", + "Description[sv]": "Snabbinställning av meddelanden på bildskärm för Plasma mobil", + "Description[tr]": "Plasma Cep ekran ayarları için tez ayar", + "Description[uk]": "Параметри швидкого налаштовування екрана за допомогою панелі для Мобільної Плазми", "Description[x-test]": "xxScreen setup OSD quick setting for Plasma Mobilexx", "Icon": "osd-duplicate", "Id": "org.kde.plasma.quicksetting.kscreenosd", "License": "GPL-2.0+", "Name": "Screen OSD", + "Name[ca]": "OSD de la pantalla", + "Name[es]": "OSD de pantalla", + "Name[he]": "חיווי על גבי המסך", + "Name[ka]": "ეკრანის OSD", + "Name[nl]": "OSD van scherm", + "Name[sl]": "Zaslon na zaslonu", + "Name[sv]": "Meddelanden på bildskärm", + "Name[tr]": "Ekran EÜG’si", + "Name[uk]": "Екранна панель", "Name[x-test]": "xxScreen OSDxx", "Website": "https://kde.org" }