From f4ca3b96c755dcdd1fc813d9255cba69118297ba Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 28 Feb 2022 01:41:06 +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" --- bin/plasma-mobile.desktop.cmake | 2 ++ kcms/mobileshell/package/metadata.desktop | 3 +++ plasma_phone_components.notifyrc | 3 +++ quicksettings/airplanemode/metadata.desktop | 1 + quicksettings/caffeine/metadata.desktop | 1 + quicksettings/keyboardtoggle/metadata.desktop | 1 + quicksettings/nightcolor/package/metadata.desktop | 1 + quicksettings/powermenu/package/metadata.desktop | 1 + shell/metadata.desktop | 1 + 9 files changed, 14 insertions(+) diff --git a/bin/plasma-mobile.desktop.cmake b/bin/plasma-mobile.desktop.cmake index 5b4cbaf0..419cfb54 100644 --- a/bin/plasma-mobile.desktop.cmake +++ b/bin/plasma-mobile.desktop.cmake @@ -38,6 +38,7 @@ Name[ru]=Plasma Mobile Name[sk]=Plasma Mobile Name[sl]=Plasma Mobile Name[sv]=Plasma mobil +Name[tr]=Plasma Mobil Name[uk]=Мобільна Плазма Name[x-test]=xxPlasma Mobilexx Name[zh_CN]=Plasma Mobile @@ -75,6 +76,7 @@ Comment[ru]=KDE Plasma Mobile Comment[sk]=Plasma Mobile od KDE Comment[sl]=Plasma Mobile od KDE Comment[sv]=Plasma mobil av KDE +Comment[tr]=KDE tarafından yapılan Plasma Mobil Comment[uk]=Мобільна Плазма від KDE Comment[x-test]=xxPlasma Mobile by KDExx Comment[zh_CN]=KDE Plasma Mobile diff --git a/kcms/mobileshell/package/metadata.desktop b/kcms/mobileshell/package/metadata.desktop index b37e1352..51407303 100644 --- a/kcms/mobileshell/package/metadata.desktop +++ b/kcms/mobileshell/package/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Skal Name[ro]=Interpretor Name[sl]=Shell Name[sv]=Skal +Name[tr]=Kabuk Name[uk]=Оболонка Name[x-test]=xxShellxx Name[zh_CN]=外壳程序 @@ -35,6 +36,7 @@ Comment[nn]=Set opp systemskalet Comment[ro]=Configurează interpretorul sistemului Comment[sl]=Nastavi sistemski shell Comment[sv]=Anpassa systemskalet +Comment[tr]=Sistem kabuğunu yapılandır Comment[uk]=Налаштувати командну оболонку системи Comment[x-test]=xxConfigure the system shellxx Comment[zh_CN]=配置系统外壳程序 @@ -69,6 +71,7 @@ X-KDE-Keywords[nn]=system,skal,shell,panel X-KDE-Keywords[ro]=sistem,interpretor,panou X-KDE-Keywords[sl]=sistem,shell,kontrolna plošča X-KDE-Keywords[sv]=system,skal,panel +X-KDE-Keywords[tr]=sistem,kabuk,panel X-KDE-Keywords[uk]=system,shell,panel,система,оболонка,панель X-KDE-Keywords[x-test]=xxsystemxx,xxshellxx,xxpanelxx X-KDE-Keywords[zh_CN]=system,shell,panel,系统,外壳,系统外壳,外壳程序,系统外壳程序,面板, diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc index ee363af3..0ff0b2b9 100644 --- a/plasma_phone_components.notifyrc +++ b/plasma_phone_components.notifyrc @@ -32,6 +32,7 @@ Name[ru]=Plasma Name[sk]=Plasma Name[sl]=Plasma Name[sv]=Plasma +Name[tr]=Plasma Name[uk]=Плазма Name[x-test]=xxPlasmaxx Name[zh_CN]=Plasma @@ -64,6 +65,7 @@ Name[ro]=Capturat Name[sk]=Zachytené Name[sl]=Zajeto Name[sv]=Lagrad +Name[tr]=Yakalanan Name[uk]=Захоплено Name[x-test]=xxCapturedxx Name[zh_CN]=已捕获 @@ -94,6 +96,7 @@ Comment[ro]=Capturat Comment[sk]=Zachytené Comment[sl]=Zajeto Comment[sv]=Lagrad +Comment[tr]=Yakalanan Comment[uk]=Захоплено Comment[x-test]=xxCapturedxx Comment[zh_CN]=已捕获 diff --git a/quicksettings/airplanemode/metadata.desktop b/quicksettings/airplanemode/metadata.desktop index 8e7e36f8..e45724dd 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -29,6 +29,7 @@ Name[ro]=Regim de avion Name[ru]=Режим полёта Name[sl]=Letalski način Name[sv]=Flygplansläge +Name[tr]=Uçak Kipi Name[uk]=Режим польоту Name[x-test]=xxAirplane Modexx Name[zh_CN]=飞行模式 diff --git a/quicksettings/caffeine/metadata.desktop b/quicksettings/caffeine/metadata.desktop index 14af2bba..f141d734 100644 --- a/quicksettings/caffeine/metadata.desktop +++ b/quicksettings/caffeine/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Caffeine Name[ro]=Cafeină Name[sl]=Caffeine Name[sv]=Koffein +Name[tr]=Caffeine Name[uk]=Кофеїн Name[x-test]=xxCaffeinexx Name[zh_CN]=Caffeine diff --git a/quicksettings/keyboardtoggle/metadata.desktop b/quicksettings/keyboardtoggle/metadata.desktop index 3cff9a29..0b473117 100644 --- a/quicksettings/keyboardtoggle/metadata.desktop +++ b/quicksettings/keyboardtoggle/metadata.desktop @@ -14,6 +14,7 @@ Name[ko]=가상 키보드 전환 Name[nl]=Omschakeling van virtueel toetsenbord Name[sl]=Preklop navidezne tipkovnice Name[sv]=Visa eller dölj virtuellt tangentbord +Name[tr]=Sanal Klavye Geçişi Name[uk]=Перемикання віртуальної клавіатури Name[x-test]=xxVirtual Keyboard Togglexx Name[zh_CN]=虚拟键盘开关 diff --git a/quicksettings/nightcolor/package/metadata.desktop b/quicksettings/nightcolor/package/metadata.desktop index 27e6df59..7760e32f 100644 --- a/quicksettings/nightcolor/package/metadata.desktop +++ b/quicksettings/nightcolor/package/metadata.desktop @@ -30,6 +30,7 @@ Name[ru]=Ночная цветовая схема Name[sk]=Nočná farba Name[sl]=Nočna barva Name[sv]=Nattfärg +Name[tr]=Gece Rengi Name[uk]=Нічні кольори Name[x-test]=xxNight Colorxx Name[zh_CN]=夜间颜色 diff --git a/quicksettings/powermenu/package/metadata.desktop b/quicksettings/powermenu/package/metadata.desktop index e186b96a..bfe05471 100644 --- a/quicksettings/powermenu/package/metadata.desktop +++ b/quicksettings/powermenu/package/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Kraftmeny Name[ro]=Meniu avansat Name[sl]=Meni energije Name[sv]=Strömmeny +Name[tr]=Güç Menüsü Name[uk]=Меню живлення Name[x-test]=xxPower Menuxx Name[zh_CN]=电源菜单 diff --git a/shell/metadata.desktop b/shell/metadata.desktop index 12a9450b..e641ace7 100644 --- a/shell/metadata.desktop +++ b/shell/metadata.desktop @@ -75,6 +75,7 @@ Comment[ru]=Оболочка Plasma для смартфонов Comment[sk]=Plasma shell pre telefóny Comment[sl]=Plasma shell za telefone Comment[sv]=Plasma skal för telefoner +Comment[tr]=Akıllı telefonlar için Plasma kabuğu Comment[uk]=Оболонка Плазми для телефонів Comment[x-test]=xxPlasma shell for phonesxx Comment[zh_CN]=适配手机的 Plasma 外壳程序