From fb190a3639db2de554400c4bd0c3bb7007b22c9e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 18 Jun 2020 08:32:28 +0200
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 +
 .../indicator/latte-packagestructure-indicator.desktop   | 1 +
 containment/metadata.desktop.cmake                       | 2 ++
 containment/package/metadata.desktop                     | 2 ++
 .../plasma-containmentactions-lattecontextmenu.desktop   | 2 ++
 indicators/default/metadata.desktop                      | 2 ++
 indicators/org.kde.latte.plasma/metadata.desktop         | 2 ++
 plasmoid/metadata.desktop.cmake                          | 2 ++
 plasmoid/package/metadata.desktop                        | 2 ++
 shell/metadata.desktop.cmake                             | 3 +++
 shell/package/metadata.desktop                           | 3 +++
 15 files changed, 36 insertions(+)

diff --git a/app/latte-indicators.knsrc b/app/latte-indicators.knsrc
index 22b7449bc..a0f24304c 100644
--- a/app/latte-indicators.knsrc
+++ b/app/latte-indicators.knsrc
@@ -21,6 +21,7 @@ Name[ru]=Индикаторы Latte
 Name[sk]=Indikátory Latte
 Name[sv]=Latte indikatorer
 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 b01c78843..4ed23d5c4 100644
--- a/app/latte-layouts.knsrc
+++ b/app/latte-layouts.knsrc
@@ -24,6 +24,7 @@ Name[ru]=Макеты Latte
 Name[sk]=Rozloženia Latte
 Name[sv]=Latte layouter
 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 a75f51e18..66e97c12c 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -25,6 +25,7 @@ Name[ru]=Latte Dock
 Name[sk]=Dok Latte
 Name[sv]=Latte dockningsfönster
 Name[uk]=Панель Латте
+Name[x-test]=xxLatte Dockxx
 Name[zh_CN]=Latte 停靠栏
 Name[zh_TW]=Latte Dock
 Comment=Latte Dock
@@ -53,6 +54,7 @@ Comment[ru]=Latte Dock
 Comment[sk]=Dok Latte
 Comment[sv]=Latte dockningsfönster
 Comment[uk]=Панель Латте
+Comment[x-test]=xxLatte Dockxx
 Comment[zh_CN]=Latte 停靠栏
 Comment[zh_TW]=Latte Dock
 IconName=latte-dock
@@ -81,6 +83,7 @@ Name[ru]=Успешно импортировано
 Name[sk]=Import úspešný
 Name[sv]=Import lyckades
 Name[uk]=Успішно імпортовано
+Name[x-test]=xxImported successfullyxx
 Name[zh_CN]=导入成功
 Name[zh_TW]=匯入成功
 Action=Popup
@@ -109,6 +112,7 @@ Name[ru]=Ошибка импорта
 Name[sk]=Import zlyhal
 Name[sv]=Misslyckades importera
 Name[uk]=Не вдалося імпортувати
+Name[x-test]=xxFailed to importxx
 Name[zh_CN]=无法导入
 Name[zh_TW]=無法匯入
 Action=Popup
@@ -137,6 +141,7 @@ Name[ru]=Успешно экспортировано
 Name[sk]=Export úspešný
 Name[sv]=Export lyckades
 Name[uk]=Успішно експортовано
+Name[x-test]=xxExported successfullyxx
 Name[zh_CN]=导出成功
 Name[zh_TW]=匯出成功
 Action=Popup
@@ -165,6 +170,7 @@ Name[ru]=Ошибка экспорта
 Name[sk]=Export zlyhal
 Name[sv]=Misslyckades exportera
 Name[uk]=Не вдалося експортувати
+Name[x-test]=xxFailed to exportxx
 Name[zh_CN]=无法导出
 Name[zh_TW]=無法匯出
 Action=Popup
@@ -193,6 +199,7 @@ Name[ru]=Успешно удалено
 Name[sk]=Odstránenie úspešné
 Name[sv]=Borttagning lyckades
 Name[uk]=Успішно вилучено
+Name[x-test]=xxRemoved successfullyxx
 Name[zh_CN]=移除成功
 Name[zh_TW]=移除成功
 Action=Popup
@@ -221,6 +228,7 @@ Name[ru]=Ошибка удаления
 Name[sk]=Odstránenie zlyhalo
 Name[sv]=Misslyckades ta bort
 Name[uk]=Не вдалося вилучити
+Name[x-test]=xxFailed to removexx
 Name[zh_CN]=无法移除
 Name[zh_TW]=無法移除
 Action=Popup
@@ -251,6 +259,7 @@ Name[ru]=Использовать макет
 Name[sk]=Prepnúť na rozloženie
 Name[sv]=Byt till layout
 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 9d57fe7b3..b312f95fa 100644
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@@ -25,6 +25,7 @@ Name[ru]=Latte
 Name[sk]=Latte
 Name[sv]=Latte
 Name[uk]=Латте
+Name[x-test]=xxLattexx
 Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Dock for the masses
@@ -52,6 +53,7 @@ Comment[ru]=Док для всех
 Comment[sk]=Dok pre davy ľudí
 Comment[sv]=Dockningsfönster för alla
 Comment[uk]=Панель для усіх
+Comment[x-test]=xxDock for the massesxx
 Comment[zh_CN]=给大众使用的停靠栏
 Comment[zh_TW]=給大眾使用的 Dock
 GenericName=Dock
@@ -79,6 +81,7 @@ GenericName[ru]=Док
 GenericName[sk]=Dok
 GenericName[sv]=Dockningsfönster
 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 32ba48a56..f602adafc 100644
--- a/app/packageplugins/indicator/latte-indicator.desktop
+++ b/app/packageplugins/indicator/latte-indicator.desktop
@@ -24,6 +24,7 @@ Comment[ru]=Индикатор Latte
 Comment[sk]=Indikátor Latte
 Comment[sv]=Latte indikator
 Comment[uk]=Індикатор Латте
+Comment[x-test]=xxLatte indicatorxx
 Comment[zh_CN]=Latte 任务指示器
 Comment[zh_TW]=Latte 指示器
 
diff --git a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
index a343801f0..d1cf89aa1 100644
--- a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
+++ b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
@@ -21,6 +21,7 @@ Name[ru]=Индикатор
 Name[sk]=Indikátor
 Name[sv]=Indikator
 Name[uk]=Індикатор
+Name[x-test]=xxIndicatorxx
 Name[zh_CN]=任务指示器
 Name[zh_TW]=指示器
 Type=Service
diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake
index b92a91b2d..351579ee1 100644
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@@ -26,6 +26,7 @@ Name[ru]=Latte
 Name[sk]=Latte
 Name[sv]=Latte
 Name[uk]=Латте
+Name[x-test]=xxLattexx
 Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
@@ -52,6 +53,7 @@ Comment[ru]=Контейнер Latte Dock
 Comment[sk]=Politika poskytovaná pre dok Latte
 Comment[sv]=Omgivning tillhandahållen för Latte dockningsfönster
 Comment[uk]=Контейнер панелі Латте
+Comment[x-test]=xxContainment provided for the Latte Dockxx
 Comment[zh_CN]=用于 Latte 停靠栏的容器
 Comment[zh_TW]=提供 Latte Dock 使用的容器
 
diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop
index 1f23b3f4c..c1f57d147 100644
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@@ -26,6 +26,7 @@ Name[ru]=Latte
 Name[sk]=Latte
 Name[sv]=Latte
 Name[uk]=Латте
+Name[x-test]=xxLattexx
 Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
@@ -52,6 +53,7 @@ Comment[ru]=Контейнер Latte Dock
 Comment[sk]=Politika poskytovaná pre dok Latte
 Comment[sv]=Omgivning tillhandahållen för Latte dockningsfönster
 Comment[uk]=Контейнер панелі Латте
+Comment[x-test]=xxContainment provided for the Latte Dockxx
 Comment[zh_CN]=用于 Latte 停靠栏的容器
 Comment[zh_TW]=提供 Latte Dock 使用的容器
 
diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
index 0a2169209..66822e2cf 100644
--- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
+++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
@@ -23,6 +23,7 @@ Name[ru]=Стандартное меню Latte
 Name[sk]=Obvyklá ponuka Latte
 Name[sv]=Latte standardmeny
 Name[uk]=Стандартне меню Латте
+Name[x-test]=xxStandard Latte Menuxx
 Name[zh_CN]=标准 Latte 菜单
 Name[zh_TW]=標準的 Latte 選單
 Comment=The latte menu that normally shows on right-click
@@ -49,6 +50,7 @@ Comment[ru]=Меню latte, которое обычно открывается 
 Comment[sk]=Ponuka Latte, ktorá sa normálne zobrazí pri pravom kliknutí
 Comment[sv]=Menyn i Latte som normalt visas vid högerklick
 Comment[uk]=Меню Латте, яке буде показано у відповідь на клацання правою кнопкою миші
+Comment[x-test]=xxThe latte menu that normally shows on right-clickxx
 Comment[zh_CN]=通常在右键点击时显示的 latte 菜单
 Comment[zh_TW]=這個 Latte 選單通常在按下右鍵時顯示
 
diff --git a/indicators/default/metadata.desktop b/indicators/default/metadata.desktop
index d8e4d3d5e..fc843cb0b 100644
--- a/indicators/default/metadata.desktop
+++ b/indicators/default/metadata.desktop
@@ -25,6 +25,7 @@ Name[ru]=Latte
 Name[sk]=Latte
 Name[sv]=Latte
 Name[uk]=Латте
+Name[x-test]=xxLattexx
 Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Latte default indicator
@@ -49,6 +50,7 @@ Comment[ru]=Индикатор Latte умолчанию
 Comment[sk]=Predvolený indikátor pre Latte
 Comment[sv]=Latte standardindikator
 Comment[uk]=Типовий індикатор Латте
+Comment[x-test]=xxLatte default indicatorxx
 Comment[zh_CN]=Latte 默认任务指示器
 Comment[zh_TW]=Latte 預設指示器
 
diff --git a/indicators/org.kde.latte.plasma/metadata.desktop b/indicators/org.kde.latte.plasma/metadata.desktop
index f1a0cd778..cc54f4480 100644
--- a/indicators/org.kde.latte.plasma/metadata.desktop
+++ b/indicators/org.kde.latte.plasma/metadata.desktop
@@ -22,6 +22,7 @@ Name[ru]=Plasma
 Name[sk]=Plasma
 Name[sv]=Plasma
 Name[uk]=Плазма
+Name[x-test]=xxPlasmaxx
 Name[zh_CN]=Plasma
 Name[zh_TW]=Plasma
 Comment=Latte Plasma style indicator
@@ -46,6 +47,7 @@ Comment[ru]=Индикатор Latte в стиле Plasma
 Comment[sk]=Indikátor Latte v štýle Plasma
 Comment[sv]=Latte Plasmastilindikator
 Comment[uk]=Індикатор стилю Плазми Латте
+Comment[x-test]=xxLatte Plasma style indicatorxx
 Comment[zh_CN]=Latte Plasma 样式指示器
 Comment[zh_TW]=Latte Plasma 樣式指示器
 
diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake
index 51cd90440..15e0a28aa 100644
--- a/plasmoid/metadata.desktop.cmake
+++ b/plasmoid/metadata.desktop.cmake
@@ -21,6 +21,7 @@ Name[ru]=Процессы Latte
 Name[sk]=Úlohy pre Latte
 Name[sv]=Latte aktiviteter
 Name[uk]=Завдання Латте
+Name[x-test]=xxLatte Tasksxx
 Name[zh_CN]=Latte 任务管理器
 Name[zh_TW]=Latte 工作
 Comment=Tasks plasmoid from Latte Dock
@@ -45,6 +46,7 @@ Comment[ru]=Виджет процессов из Latte Dock
 Comment[sk]=Plazmoid úloh z doku Latte
 Comment[sv]=Aktivitetsplasmoid för Latte dockningsfönster
 Comment[uk]=Плазмоїд завдань з панелі Латте
+Comment[x-test]=xxTasks plasmoid from Latte Dockxx
 Comment[zh_CN]=Latte 停靠栏的任务管理 Plasma 部件
 Comment[zh_TW]=來自 Latte Dock 的工作 Plasmoid
 
diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index 8c0a843ec..a7c544518 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -21,6 +21,7 @@ Name[ru]=Процессы Latte
 Name[sk]=Úlohy pre Latte
 Name[sv]=Latte aktiviteter
 Name[uk]=Завдання Латте
+Name[x-test]=xxLatte Tasksxx
 Name[zh_CN]=Latte 任务管理器
 Name[zh_TW]=Latte 工作
 Comment=Tasks plasmoid from Latte Dock
@@ -45,6 +46,7 @@ Comment[ru]=Виджет процессов из Latte Dock
 Comment[sk]=Plazmoid úloh z doku Latte
 Comment[sv]=Aktivitetsplasmoid för Latte dockningsfönster
 Comment[uk]=Плазмоїд завдань з панелі Латте
+Comment[x-test]=xxTasks plasmoid from Latte Dockxx
 Comment[zh_CN]=Latte 停靠栏的任务管理 Plasma 部件
 Comment[zh_TW]=來自 Latte Dock 的工作 Plasmoid
 
diff --git a/shell/metadata.desktop.cmake b/shell/metadata.desktop.cmake
index f07d093b5..a74bb5bdb 100644
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@@ -25,6 +25,7 @@ Name[ru]=Оболочка Latte
 Name[sk]=Shell Latte
 Name[sv]=Latte skal
 Name[uk]=Оболонка Латте
+Name[x-test]=xxLatte Shellxx
 Name[zh_CN]=Latte Shell
 Name[zh_TW]=Latte Shell
 Comment=Shell provided for the Latte Dock
@@ -51,6 +52,7 @@ Comment[ru]=Оболочка для Latte Dock
 Comment[sk]=Shell poskytnutý pre dok Latte
 Comment[sv]=Skal tillhandahållet för Latte dockningsfönster
 Comment[uk]=Оболонка панелі Латте
+Comment[x-test]=xxShell provided for the Latte Dockxx
 Comment[zh_CN]=用于 Latte 停靠栏的 Shell
 Comment[zh_TW]=由 Latte Dock 提供的 Shell
 
@@ -79,6 +81,7 @@ Keywords[ru]=оболочка
 Keywords[sk]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка
+Keywords[x-test]=xxshellxx
 Keywords[zh_CN]=shell
 Keywords[zh_TW]=shell
 Type=Service
diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop
index 0ad1b45f8..fb1b442bf 100644
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@@ -25,6 +25,7 @@ Name[ru]=Оболочка Latte
 Name[sk]=Shell Latte
 Name[sv]=Latte skal
 Name[uk]=Оболонка Латте
+Name[x-test]=xxLatte Shellxx
 Name[zh_CN]=Latte Shell
 Name[zh_TW]=Latte Shell
 Comment=Shell provided for the Latte Dock
@@ -51,6 +52,7 @@ Comment[ru]=Оболочка для Latte Dock
 Comment[sk]=Shell poskytnutý pre dok Latte
 Comment[sv]=Skal tillhandahållet för Latte dockningsfönster
 Comment[uk]=Оболонка панелі Латте
+Comment[x-test]=xxShell provided for the Latte Dockxx
 Comment[zh_CN]=用于 Latte 停靠栏的 Shell
 Comment[zh_TW]=由 Latte Dock 提供的 Shell
 
@@ -79,6 +81,7 @@ Keywords[ru]=оболочка
 Keywords[sk]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка
+Keywords[x-test]=xxshellxx
 Keywords[zh_CN]=shell
 Keywords[zh_TW]=shell
 Type=Service