From 32ca26c5fa84dee81a7c4d68c819abfb4cd53d62 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 22 Jul 2022 01:43:12 +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/mobileshell/kcm_mobileshell.json | 28 -------------- quicksettings/record/metadata.json | 2 +- .../screenshot/package/metadata.json | 2 +- shell/metadata.json | 38 ------------------- 4 files changed, 2 insertions(+), 68 deletions(-) diff --git a/kcms/mobileshell/kcm_mobileshell.json b/kcms/mobileshell/kcm_mobileshell.json index a5afd6b9..23fc1b60 100644 --- a/kcms/mobileshell/kcm_mobileshell.json +++ b/kcms/mobileshell/kcm_mobileshell.json @@ -8,34 +8,6 @@ ], "Category": "System Information", "Description": "Configure the system shell", - "Description[az]": "Sistem", - "Description[ca@valencia]": "Configura l'intèrpret d'ordres del sistema", - "Description[ca]": "Configura l'intèrpret d'ordres del sistema", - "Description[en_GB]": "Configure the system shell", - "Description[es]": "Configura el intérprete de órdenes del sistema", - "Description[eu]": "Konfiguratu sistemaren oskola", - "Description[fi]": "Aseta järjestelmän komentotulkki", - "Description[fr]": "Configurer le shell du système", - "Description[hi]": "तंत्र शेल विन्यस्त करें", - "Description[hu]": "A rendszerfelület beállítása", - "Description[ia]": "Configura le shell de systema", - "Description[it]": "Configura la shell di sistema", - "Description[ka]": "სისტემური გარსის მორგება", - "Description[ko]": "시스템 셸 설정", - "Description[nl]": "De systeem-shell configureren", - "Description[nn]": "Set opp systemskalet", - "Description[pa]": "ਸਿਸਟਮ ਸ਼ੈੱਲ ਦੀ ਸੰਰਚਨਾ", - "Description[pl]": "Ustawienia powłoki systemowej", - "Description[pt]": "Configurar a consola do sistema", - "Description[pt_BR]": "Configurar o shell do sistema", - "Description[ro]": "Configurează interpretorul sistemului", - "Description[sk]": "Nastaviť systémový shell", - "Description[sl]": "Nastavi sistemski shell", - "Description[sv]": "Anpassa systemskalet", - "Description[tr]": "Sistem kabuğunu yapılandır", - "Description[uk]": "Налаштувати командну оболонку системи", - "Description[x-test]": "xxConfigure the system shellxx", - "Description[zh_CN]": "配置系统外壳程序", "EnabledByDefault": true, "FormFactors": [ "desktop", diff --git a/quicksettings/record/metadata.json b/quicksettings/record/metadata.json index 1cf36c53..bfedd3b9 100644 --- a/quicksettings/record/metadata.json +++ b/quicksettings/record/metadata.json @@ -31,7 +31,7 @@ "Name[ro]": "Captură de ecran", "Name[sk]": "Snímka obrazovky", "Name[sl]": "Slika zaslona", - "Name[sv]": "Skärmbild", + "Name[sv]": " Skärmbild", "Name[tr]": "Ekran görüntüsü", "Name[uk]": "Знімок вікна", "Name[x-test]": "xxScreenshotxx", diff --git a/quicksettings/screenshot/package/metadata.json b/quicksettings/screenshot/package/metadata.json index f36c7efb..6967ace8 100644 --- a/quicksettings/screenshot/package/metadata.json +++ b/quicksettings/screenshot/package/metadata.json @@ -55,7 +55,7 @@ "Name[ro]": "Captură de ecran", "Name[sk]": "Snímka obrazovky", "Name[sl]": "Slika zaslona", - "Name[sv]": "Skärmbild", + "Name[sv]": " Skärmbild", "Name[tr]": "Ekran görüntüsü", "Name[uk]": "Знімок вікна", "Name[x-test]": "xxScreenshotxx", diff --git a/shell/metadata.json b/shell/metadata.json index 9ec4fab0..c9b432fd 100644 --- a/shell/metadata.json +++ b/shell/metadata.json @@ -8,44 +8,6 @@ ], "Category": "", "Description": "Plasma shell for phones", - "Description[ast]": "La shell de Plasma pa teléfonos", - "Description[az]": "Telefonlar üçün Plasma üz qabığı", - "Description[ca@valencia]": "Espai de treball Plasma per a telèfons", - "Description[ca]": "Espai de treball Plasma per a telèfons", - "Description[cs]": "Plasma Shell pro telefony", - "Description[da]": "Plasma-skal til telefoner", - "Description[de]": "Plasma-Shell für Telefone", - "Description[en_GB]": "Plasma shell for phones", - "Description[es]": "Intérprete de órdenes de Plasma para teléfonos", - "Description[et]": "Plasma kest telefonidele", - "Description[eu]": "Telefonoetarako Plasma oskola", - "Description[fi]": "Plasma-työtila puhelimiin", - "Description[fr]": "Terminal Plasma pour smartphones", - "Description[gl]": "Intérprete de ordes de Plasma para móbiles", - "Description[hi]": "फोन के लिए प्लाज्मा शेल", - "Description[hu]": "Plasma felület telefonokhoz", - "Description[ia]": "Shell de Plasma per telephonos", - "Description[id]": "Shell Plasma untuk ponsel", - "Description[it]": "Shell di Plasma per telefoni", - "Description[ka]": "Plasma გარსი ტელეფონისთვის", - "Description[ko]": "휴대폰용 Plasma 셸", - "Description[lt]": "Plasma apvalkalas, skirtas telefonams", - "Description[nl]": "Plasma-shell voor telefoons", - "Description[nn]": "Plasma-skal for telefonar", - "Description[pa]": "ਫ਼ੋਨਾਂ ਲਈ ਪਲਾਜ਼ਮਾ ਸ਼ੈਲ", - "Description[pl]": "Powłoka Plazmy dla telefonów", - "Description[pt]": "Área de trabalho Plasma para telemóveis", - "Description[pt_BR]": "Plasma Shell para celulares", - "Description[ro]": "Învelișul Plasma pentru telefoane", - "Description[ru]": "Оболочка Plasma для смартфонов", - "Description[sk]": "Plasma shell pre telefóny", - "Description[sl]": "Plasma shell za telefone", - "Description[sv]": "Plasma skal för telefoner", - "Description[tr]": "Akıllı telefonlar için Plasma kabuğu", - "Description[uk]": "Оболонка Плазми для телефонів", - "Description[x-test]": "xxPlasma shell for phonesxx", - "Description[zh_CN]": "适配手机的 Plasma 外壳程序", - "Description[zh_TW]": "適用於手機的 Plasma Shell", "Id": "org.kde.plasma.phoneshell", "License": "GPLv2+", "Name": "Phone",