From 79eb420b56a4ff5cb3789e3f191b341fda37a8db Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 23 Apr 2025 01:31:21 +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 | 35 +++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/quicksettings/autohidepanels/metadata.json b/quicksettings/autohidepanels/metadata.json index 1579dc93..12a5d4fc 100644 --- a/quicksettings/autohidepanels/metadata.json +++ b/quicksettings/autohidepanels/metadata.json @@ -4,14 +4,47 @@ "Authors": [ { "Email": "stanleymicah@proton.me", - "Name": "Micah Stanley" + "Name": "Micah Stanley", + "Name[ca@valencia]": "Micah Stanley", + "Name[ca]": "Micah Stanley", + "Name[es]": "Micah Stanley", + "Name[he]": "מיקה סטנלי", + "Name[ia]": "Micah Stanley", + "Name[ka]": "Micah Stanley", + "Name[nl]": "Micah Stanley", + "Name[sl]": "Micah Stanley", + "Name[tr]": "Micah Stanley", + "Name[uk]": "Micah Stanley", + "Name[x-test]": "xxMicah Stanleyxx" } ], "Description": "Auto Hide Panels quick setting for Plasma Mobile", + "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[he]": "הגדרות הסתרת לוחות אוטומטית מהירות לפלזמה לניידים", + "Description[ia]": "Auto Cela Pannellos Preferentia rapide per Plasma Mobile", + "Description[ka]": "პანელების ავტოდამალვის სწრაფად დაყენება Plasma Mobile-სთვის", + "Description[nl]": "Snelle instelling van automatisch panelen verbergen voor Plasma Mobile", + "Description[sl]": "Hitre nastavitve samodejnega skrivanja plošč za Plasma Mobile", + "Description[tr]": "Plasma Cep panelleri kendiliğinden gizleme tez ayarı", + "Description[uk]": "Пункт швидкого приховування панелей для Мобільної Плазми", + "Description[x-test]": "xxAuto Hide Panels quick setting for Plasma Mobilexx", "Icon": "view-fullscreen", "Id": "org.kde.plasma.quicksetting.autohidepanels", "License": "GPL-2.0+", "Name": "Auto Hide Panels", + "Name[ca@valencia]": "Oculta automàticament els quadros", + "Name[ca]": "Oculta automàticament els plafons", + "Name[es]": "Ocultar paneles automáticamente", + "Name[he]": "הסתרת לוחות אוטומטית", + "Name[ia]": "Auto-Cela Pannellos", + "Name[ka]": "პანელების ავტომატური დამალვა", + "Name[nl]": "Panelen automatisch verbergen", + "Name[sl]": "Samodejno skrij plošče", + "Name[tr]": "Panelleri Kendiliğinden Gizle", + "Name[uk]": "Автоматично ховати панелі", + "Name[x-test]": "xxAuto Hide Panelsxx", "Website": "https://kde.org" } }