From 237ec8c4bf4c1e54a24c654c06f2a54cb9459f2d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 Nov 2023 11:56:25 +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" --- app/latte-indicators.knsrc | 1 - app/latte-layouts.knsrc | 1 - app/lattedock.notifyrc | 9 --------- app/org.kde.latte-dock.desktop.cmake | 3 --- app/packageplugins/indicator/latte-indicator.desktop | 1 - containment/package/metadata.json | 3 --- .../plasma-containmentactions-lattecontextmenu.json | 3 --- indicators/default/metadata.json | 3 --- indicators/org.kde.latte.plasma/metadata.json | 3 --- indicators/org.kde.latte.plasmatabstyle/metadata.json | 3 --- plasmoid/package/metadata.json | 3 --- shell/package/metadata.json | 3 --- 12 files changed, 36 deletions(-) diff --git a/app/latte-indicators.knsrc b/app/latte-indicators.knsrc index cf51953ae..c13eb68cc 100644 --- a/app/latte-indicators.knsrc +++ b/app/latte-indicators.knsrc @@ -32,7 +32,6 @@ Name[sl]=Kazalniki Latte Name[sv]=Latte indikatorer Name[tr]=Latte Göstergeleri Name[uk]=Індикатори Латте -Name[x-test]=xxLatte Indicatorsxx Name[zh_CN]=Latte 指示器 Name[zh_TW]=Latte 指示器 diff --git a/app/latte-layouts.knsrc b/app/latte-layouts.knsrc index c9acee6e5..695cb8ec3 100644 --- a/app/latte-layouts.knsrc +++ b/app/latte-layouts.knsrc @@ -33,7 +33,6 @@ Name[sl]=Postavitve Latte Name[sv]=Latte layouter Name[tr]=Latte Yerleşimleri Name[uk]=Компонування Латте -Name[x-test]=xxLatte Layoutsxx Name[zh_CN]=Latte 布局 Name[zh_TW]=Latte 版面 diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc index c6d7dc155..9b679dcad 100644 --- a/app/lattedock.notifyrc +++ b/app/lattedock.notifyrc @@ -32,7 +32,6 @@ Name[sl]=Latte Dock Name[sv]=Latte dockningsfönster Name[tr]=Latte Rıhtım Name[uk]=Панель Латте -Name[x-test]=xxLatte Dockxx Name[zh_CN]=Latte 停靠栏 Name[zh_TW]=Latte Dock Comment=Latte Dock @@ -68,7 +67,6 @@ Comment[sl]=Latte Dock Comment[sv]=Latte dockningsfönster Comment[tr]=Latte Rıhtım Comment[uk]=Панель Латте -Comment[x-test]=xxLatte Dockxx Comment[zh_CN]=Latte 停靠栏 Comment[zh_TW]=Latte Dock IconName=latte-dock @@ -108,7 +106,6 @@ Name[sl]=Uspešno uvoženo Name[sv]=Import lyckades Name[tr]=Başarıyla içe aktarıldı Name[uk]=Успішно імпортовано -Name[x-test]=xxImported successfullyxx Name[zh_CN]=导入成功 Name[zh_TW]=匯入成功 Action=Popup @@ -148,7 +145,6 @@ Name[sl]=Uvoz ni uspel Name[sv]=Misslyckades importera Name[tr]=İçe aktarılamadı Name[uk]=Не вдалося імпортувати -Name[x-test]=xxFailed to importxx Name[zh_CN]=无法导入 Name[zh_TW]=無法匯入 Action=Popup @@ -188,7 +184,6 @@ Name[sl]=Uspešno izvoženo Name[sv]=Export lyckades Name[tr]=Başarıyla dışa aktarıldı Name[uk]=Успішно експортовано -Name[x-test]=xxExported successfullyxx Name[zh_CN]=导出成功 Name[zh_TW]=匯出成功 Action=Popup @@ -229,7 +224,6 @@ Name[sl]=Izvoz ni uspel Name[sv]=Misslyckades exportera Name[tr]=Dışa aktarılamadı Name[uk]=Не вдалося експортувати -Name[x-test]=xxFailed to exportxx Name[zh_CN]=无法导出 Name[zh_TW]=無法匯出 Action=Popup @@ -269,7 +263,6 @@ Name[sl]=Uspešno odstranjeno Name[sv]=Borttagning lyckades Name[tr]=Başarıyla kaldırıldı Name[uk]=Успішно вилучено -Name[x-test]=xxRemoved successfullyxx Name[zh_CN]=移除成功 Name[zh_TW]=移除成功 Action=Popup @@ -310,7 +303,6 @@ Name[sl]=Odstranitev ni uspela Name[sv]=Misslyckades ta bort Name[tr]=Kaldırılamadı Name[uk]=Не вдалося вилучити -Name[x-test]=xxFailed to removexx Name[zh_CN]=无法移除 Name[zh_TW]=無法移除 Action=Popup @@ -351,7 +343,6 @@ Name[sl]=Preklop na postavitev Name[sv]=Byt till layout Name[tr]=Yerleşime geç Name[uk]=Перемкнутися на компонування -Name[x-test]=xxSwitch to layoutxx Name[zh_CN]=切换布局 Name[zh_TW]=切換至佈局 Action=Popup diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake index cc75a96b0..5157a2cbc 100644 --- a/app/org.kde.latte-dock.desktop.cmake +++ b/app/org.kde.latte-dock.desktop.cmake @@ -32,7 +32,6 @@ Name[sl]=Latte Dock Name[sv]=Latte dockningsfönster Name[tr]=Latte Rıhtım Name[uk]=Панель Латте -Name[x-test]=xxLatte Dockxx Name[zh_CN]=Latte 停靠栏 Name[zh_TW]=Latte Dock Comment=Dock for the masses @@ -69,7 +68,6 @@ Comment[sl]=Dok za množice Comment[sv]=Dockningsfönster för alla Comment[tr]=Kitleler için rıhtım Comment[uk]=Панель для усіх -Comment[x-test]=xxDock for the massesxx Comment[zh_CN]=给大众使用的停靠栏 Comment[zh_TW]=給大眾使用的 Dock GenericName=Dock @@ -108,7 +106,6 @@ GenericName[sl]=Dok GenericName[sv]=Dockningsfönster GenericName[tr]=Rıhtım GenericName[uk]=Панель -GenericName[x-test]=xxDockxx GenericName[zh_CN]=停靠栏 GenericName[zh_TW]=Dock Icon=latte-dock diff --git a/app/packageplugins/indicator/latte-indicator.desktop b/app/packageplugins/indicator/latte-indicator.desktop index b0eab5d9c..9a2e9b0f2 100644 --- a/app/packageplugins/indicator/latte-indicator.desktop +++ b/app/packageplugins/indicator/latte-indicator.desktop @@ -34,7 +34,6 @@ Comment[sl]=Kazalnik Latte Comment[sv]=Latte indikator Comment[tr]=Latte göstergesi Comment[uk]=Індикатор Латте -Comment[x-test]=xxLatte indicatorxx Comment[zh_CN]=Latte 任务指示器 Comment[zh_TW]=Latte 指示器 diff --git a/containment/package/metadata.json b/containment/package/metadata.json index d0149e035..2a67a71c1 100644 --- a/containment/package/metadata.json +++ b/containment/package/metadata.json @@ -27,7 +27,6 @@ "Name[sv]": "Michail Vourlakos, Smith Ar", "Name[tr]": "Michail Vourlakos, Smith Ar", "Name[uk]": "Михаїл Ворлакос (Michail Vourlakos), Сміт Ар (Smith Ar)", - "Name[x-test]": "xxMichail Vourlakos, Smith Arxx", "Name[zh_CN]": "Michail Vourlakos, Smith Ar" } ], @@ -56,7 +55,6 @@ "Description[sv]": "Omgivning tillhandahållen för Latte dockningsfönster", "Description[tr]": "Latte Rıhtım tarafından sağlanan kapsama", "Description[uk]": "Контейнер панелі Латте", - "Description[x-test]": "xxContainment provided for the Latte Dockxx", "Description[zh_CN]": "用于 Latte 停靠栏的容器", "EnabledByDefault": true, "Id": "org.kde.latte.containment", @@ -87,7 +85,6 @@ "Name[sv]": "Latte-omgivning", "Name[tr]": "Latte Kapsama", "Name[uk]": "контейнер Латте", - "Name[x-test]": "xxLatte Containmentxx", "Name[zh_CN]": "Latte 容器", "Name[zh_TW]": "Latte Containment", "ServiceTypes": [ diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json index 9170d2ff7..8f1386212 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json +++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json @@ -27,7 +27,6 @@ "Name[sv]": "Michail Vourlakos", "Name[tr]": "Michail Vourlakos", "Name[uk]": "Михаїл Ворлакос (Michail Vourlakos)", - "Name[x-test]": "xxMichail Vourlakosxx", "Name[zh_CN]": "Michail Vourlakos" } ], @@ -55,7 +54,6 @@ "Description[sv]": "Menyn i Latte som normalt visas vid högerklick", "Description[tr]": "Normalde sağ tıklama ile gösterilen Latte menüsü", "Description[uk]": "Меню Латте, яке буде показано у відповідь на клацання правою кнопкою миші", - "Description[x-test]": "xxThe latte menu that normally shows on right-clickxx", "Description[zh_CN]": "通常在右键点击时显示的 latte 菜单", "EnabledByDefault": true, "Icon": "help-contextual", @@ -94,7 +92,6 @@ "Name[sv]": "Latte standardmeny", "Name[tr]": "Standart Latte Menüsü", "Name[uk]": "Стандартне меню Латте", - "Name[x-test]": "xxStandard Latte Menuxx", "Name[zh_CN]": "标准 Latte 菜单", "Name[zh_TW]": "標準的 Latte 選單", "ServiceTypes": [ diff --git a/indicators/default/metadata.json b/indicators/default/metadata.json index 57dd45bf1..ac1e4f7ac 100644 --- a/indicators/default/metadata.json +++ b/indicators/default/metadata.json @@ -27,7 +27,6 @@ "Name[sv]": "Michail Vourlakos", "Name[tr]": "Michail Vourlakos", "Name[uk]": "Михаїл Ворлакос (Michail Vourlakos)", - "Name[x-test]": "xxMichail Vourlakosxx", "Name[zh_CN]": "Michail Vourlakos" } ], @@ -55,7 +54,6 @@ "Description[sv]": "Latte standardindikator", "Description[tr]": "Latte öntanımlı göstergesi", "Description[uk]": "Типовий індикатор Латте", - "Description[x-test]": "xxLatte default indicatorxx", "Description[zh_CN]": "Latte 默认指示器", "EnabledByDefault": true, "Icon": "latte-dock", @@ -96,7 +94,6 @@ "Name[sv]": "Latte", "Name[tr]": "Latte", "Name[uk]": "Латте", - "Name[x-test]": "xxLattexx", "Name[zh_CN]": "Latte", "Name[zh_TW]": "Latte", "ServiceTypes": [ diff --git a/indicators/org.kde.latte.plasma/metadata.json b/indicators/org.kde.latte.plasma/metadata.json index 4864f88bf..1296dd73d 100644 --- a/indicators/org.kde.latte.plasma/metadata.json +++ b/indicators/org.kde.latte.plasma/metadata.json @@ -27,7 +27,6 @@ "Name[sv]": "Michail Vourlakos", "Name[tr]": "Michail Vourlakos", "Name[uk]": "Михаїл Ворлакос (Michail Vourlakos)", - "Name[x-test]": "xxMichail Vourlakosxx", "Name[zh_CN]": "Michail Vourlakos" } ], @@ -55,7 +54,6 @@ "Description[sv]": "Latte Plasmastilindikator", "Description[tr]": "Latte Plasma biçemli gösterge", "Description[uk]": "Індикатор стилю Плазми Латте", - "Description[x-test]": "xxLatte Plasma style indicatorxx", "Description[zh_CN]": "Latte Plasma 风格指示器", "EnabledByDefault": true, "Icon": "latte-dock", @@ -94,7 +92,6 @@ "Name[sv]": "Plasma", "Name[tr]": "Plasma", "Name[uk]": "Плазма", - "Name[x-test]": "xxPlasmaxx", "Name[zh_CN]": "Plasma", "Name[zh_TW]": "Plasma", "ServiceTypes": [ diff --git a/indicators/org.kde.latte.plasmatabstyle/metadata.json b/indicators/org.kde.latte.plasmatabstyle/metadata.json index 8e73d076f..bb8aff1bd 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.json +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.json @@ -27,7 +27,6 @@ "Name[sv]": "Michail Vourlakos", "Name[tr]": "Michail Vourlakos", "Name[uk]": "Михаїл Ворлакос (Michail Vourlakos)", - "Name[x-test]": "xxMichail Vourlakosxx", "Name[zh_CN]": "Michail Vourlakos" } ], @@ -55,7 +54,6 @@ "Description[sv]": "Plasma flikstilsindikator för Latte", "Description[tr]": "Latte için Plasma sekme biçemi göstergesi", "Description[uk]": "Індикатор стилю вкладок Плазми для Латте", - "Description[x-test]": "xxPlasma Tab style indicator for Lattexx", "Description[zh_CN]": "Latte 的 Plasma 标签页风格指示器", "EnabledByDefault": true, "Icon": "latte-dock", @@ -89,7 +87,6 @@ "Name[sv]": "Plasma flikstil", "Name[tr]": "Plasma Sekme Biçemi", "Name[uk]": "Стиль вкладок Плазми", - "Name[x-test]": "xxPlasma Tab Stylexx", "Name[zh_CN]": "Plasma 标签页风格", "Name[zh_TW]": "Plasma 分頁樣式", "ServiceTypes": [ diff --git a/plasmoid/package/metadata.json b/plasmoid/package/metadata.json index 20097a840..f576e7153 100644 --- a/plasmoid/package/metadata.json +++ b/plasmoid/package/metadata.json @@ -27,7 +27,6 @@ "Name[sv]": "Michail Vourlakos, Smith Ar", "Name[tr]": "Michail Vourlakos, Smith Ar", "Name[uk]": "Михаїл Ворлакос (Michail Vourlakos), Сміт Ар (Smith Ar)", - "Name[x-test]": "xxMichail Vourlakos, Smith Arxx", "Name[zh_CN]": "Michail Vourlakos, Smith Ar" } ], @@ -55,7 +54,6 @@ "Description[sv]": "Aktivitetsplasmoid för Latte dockningsfönster", "Description[tr]": "Latte Rıhtım'dan görevler Plasmoid'i", "Description[uk]": "Плазмоїд завдань з панелі Латте", - "Description[x-test]": "xxTasks plasmoid from Latte Dockxx", "Description[zh_CN]": "Latte 停靠栏的任务管理 Plasma 小程序", "EnabledByDefault": true, "Icon": "latte-dock", @@ -92,7 +90,6 @@ "Name[sv]": "Latte aktiviteter", "Name[tr]": "Latte Görevler", "Name[uk]": "Завдання Латте", - "Name[x-test]": "xxLatte Tasksxx", "Name[zh_CN]": "Latte 任务管理器", "Name[zh_TW]": "Latte 工作", "ServiceTypes": [ diff --git a/shell/package/metadata.json b/shell/package/metadata.json index 7758cecff..b3ae85024 100644 --- a/shell/package/metadata.json +++ b/shell/package/metadata.json @@ -27,7 +27,6 @@ "Name[sv]": "Michail Vourlakos, Smith Ar", "Name[tr]": "Michail Vourlakos, Smith Ar", "Name[uk]": "Михаїл Ворлакос (Michail Vourlakos), Сміт Ар (Smith Ar)", - "Name[x-test]": "xxMichail Vourlakos, Smith Arxx", "Name[zh_CN]": "Michail Vourlakos, Smith Ar" } ], @@ -54,7 +53,6 @@ "Description[sv]": "Skal tillhandahållet för Latte dockningsfönster", "Description[tr]": "Latte Rıhtım için sağlanan kabuk", "Description[uk]": "Оболонка панелі Латте", - "Description[x-test]": "xxShell provided for the Latte Dockxx", "Description[zh_CN]": "用于 Latte 停靠栏的 Shell", "Id": "org.kde.latte.shell", "License": "GPLv3+", @@ -91,7 +89,6 @@ "Name[sv]": "Latte skal", "Name[tr]": "Latte Kabuk", "Name[uk]": "Оболонка Латте", - "Name[x-test]": "xxLatte Shellxx", "Name[zh_CN]": "Latte Shell", "Name[zh_TW]": "Latte Shell", "ServiceTypes": [