From c5072f98dec3c4cb6b813eb9e4781343121131fc Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 17 Jun 2020 14:12:38 +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 --
 indicators/org.kde.latte.plasmatabstyle/metadata.desktop | 2 --
 plasmoid/metadata.desktop.cmake                          | 2 --
 plasmoid/package/metadata.desktop                        | 2 --
 shell/metadata.desktop.cmake                             | 3 ---
 shell/package/metadata.desktop                           | 3 ---
 16 files changed, 38 deletions(-)

diff --git a/app/latte-indicators.knsrc b/app/latte-indicators.knsrc
index 01f36935d..e6efefe1c 100644
--- a/app/latte-indicators.knsrc
+++ b/app/latte-indicators.knsrc
@@ -24,7 +24,6 @@ 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 e2f53c8ac..f843ac2a2 100644
--- a/app/latte-layouts.knsrc
+++ b/app/latte-layouts.knsrc
@@ -26,7 +26,6 @@ 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 ca1c32aa4..ba8f76fee 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -27,7 +27,6 @@ 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
@@ -58,7 +57,6 @@ 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
@@ -90,7 +88,6 @@ 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
@@ -122,7 +119,6 @@ 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
@@ -154,7 +150,6 @@ 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
@@ -186,7 +181,6 @@ 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
@@ -218,7 +212,6 @@ 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
@@ -251,7 +244,6 @@ 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
@@ -284,7 +276,6 @@ 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 0d60cc371..3c0f54408 100644
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@@ -26,7 +26,6 @@ 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
@@ -56,7 +55,6 @@ 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
@@ -87,7 +85,6 @@ 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 82a580a3c..a687b3bf5 100644
--- a/app/packageplugins/indicator/latte-indicator.desktop
+++ b/app/packageplugins/indicator/latte-indicator.desktop
@@ -26,7 +26,6 @@ Comment[pt_BR]=Indicador do Latte
 Comment[ru]=Индикатор 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 a7c6c036e..9e0e725b8 100644
--- a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
+++ b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
@@ -24,7 +24,6 @@ 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 d8ce99f82..a62eaedb9 100644
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@@ -27,7 +27,6 @@ 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
@@ -55,7 +54,6 @@ Comment[pt_BR]=Contêiner fornecido pelo Latte Dock
 Comment[ru]=Контейнер Latte Dock
 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 b89480a31..7feb1bc8e 100644
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@@ -27,7 +27,6 @@ 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
@@ -55,7 +54,6 @@ Comment[pt_BR]=Contêiner fornecido pelo Latte Dock
 Comment[ru]=Контейнер Latte Dock
 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 467be1cc8..b53a4ee66 100644
--- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
+++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
@@ -25,7 +25,6 @@ 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
@@ -53,7 +52,6 @@ Comment[pt_BR]=O menu do Latte que normalmente aparece ao clicar com o botão di
 Comment[ru]=Меню latte, которое обычно открывается правой кнопкой мыши
 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 c5b9b435c..fcc4fd357 100644
--- a/indicators/default/metadata.desktop
+++ b/indicators/default/metadata.desktop
@@ -26,7 +26,6 @@ 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
@@ -54,7 +53,6 @@ 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 154f6e367..f28678559 100644
--- a/indicators/org.kde.latte.plasma/metadata.desktop
+++ b/indicators/org.kde.latte.plasma/metadata.desktop
@@ -26,7 +26,6 @@ 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
@@ -53,7 +52,6 @@ Comment[pt_BR]=Indicador de estilo do Plasma no Latte
 Comment[ru]=Индикатор Latte в стиле 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/indicators/org.kde.latte.plasmatabstyle/metadata.desktop b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
index 439693c1b..482c06204 100644
--- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
+++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
@@ -17,7 +17,6 @@ Name[pt]=Estilo de Páginas do Plasma
 Name[pt_BR]=Estilo de abas do Plasma
 Name[sv]=Plasma flikstil
 Name[uk]=Стиль вкладок Плазми
-Name[x-test]=xxPlasma Tab Stylexx
 Name[zh_TW]=Plasma 分頁樣式
 Comment=Plasma Tab style indicator for Latte
 Comment[ca]=Indicador a l'estil pestanya del Plasma per al Latte
@@ -37,7 +36,6 @@ Comment[pt]=Indicador do estilo de Páginas do Plasma para o Latte
 Comment[pt_BR]=Indicador de estilo de abas do Plasma para o Latte
 Comment[sv]=Plasma flikstilsindikator för Latte
 Comment[uk]=Індикатор стилю вкладок Плазми для Латте
-Comment[x-test]=xxPlasma Tab style indicator for Lattexx
 Comment[zh_TW]=適用於 Latte 的 Plasma 分頁樣式指示器
 
 Encoding=UTF-8
diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake
index 41189c12f..3098ee036 100644
--- a/plasmoid/metadata.desktop.cmake
+++ b/plasmoid/metadata.desktop.cmake
@@ -24,7 +24,6 @@ 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
@@ -51,7 +50,6 @@ Comment[pt_BR]=Plasmoide de tarefas do Latte Dock
 Comment[ru]=Виджет процессов из Latte Dock
 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 b08e9f45c..ea64b7d58 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -24,7 +24,6 @@ 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
@@ -51,7 +50,6 @@ Comment[pt_BR]=Plasmoide de tarefas do Latte Dock
 Comment[ru]=Виджет процессов из Latte Dock
 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 012f527e3..2e8bcaa23 100644
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@@ -26,7 +26,6 @@ Name[pt_BR]=Latte Shell
 Name[ru]=Оболочка 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
@@ -54,7 +53,6 @@ Comment[pt_BR]=Shell fornecido pelo Latte Dock
 Comment[ru]=Оболочка для Latte Dock
 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
 
@@ -86,7 +84,6 @@ 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 85e4f1bd0..514c7f893 100644
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@@ -26,7 +26,6 @@ Name[pt_BR]=Latte Shell
 Name[ru]=Оболочка 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
@@ -54,7 +53,6 @@ Comment[pt_BR]=Shell fornecido pelo Latte Dock
 Comment[ru]=Оболочка для Latte Dock
 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
 
@@ -86,7 +84,6 @@ Keywords[ru]=оболочка
 Keywords[sk]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка
-Keywords[x-test]=xxshellxx
 Keywords[zh_CN]=shell
 Keywords[zh_TW]=shell
 Type=Service