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"
6 years ago · 1bec03ec8a
parent f449e22943
commit 1bec03ec8a
7 changed files with 9 additions and 0 deletions
--- a/app/latte-indicators.knsrc
+++ b/app/latte-indicators.knsrc
@ -18,6 +18,7 @@ Name[ru]=Индикаторы Latte
 Name[sv]=Latte indikatorer
 Name[uk]=Індикатори Латте
 Name[x-test]=xxLatte Indicatorsxx
+Name[zh_CN]=Latte 指示器
 Name[zh_TW]=Latte 指示器

 ProvidersUrl=https://download.kde.org/ocs/providers.xml
--- a/app/packageplugins/indicator/latte-indicator.desktop
+++ b/app/packageplugins/indicator/latte-indicator.desktop
@ -21,6 +21,7 @@ Comment[ru]=Индикатор Latte
 Comment[sv]=Latte indikator
 Comment[uk]=Індикатор Латте
 Comment[x-test]=xxLatte indicatorxx
+Comment[zh_CN]=Latte 任务指示器
 Comment[zh_TW]=Latte 指示器

 [PropertyDef::X-Latte-API]
--- a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
+++ b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
@ -18,6 +18,7 @@ Name[ru]=Индикатор
 Name[sv]=Indikator
 Name[uk]=Індикатор
 Name[x-test]=xxIndicatorxx
+Name[zh_CN]=任务指示器
 Name[zh_TW]=指示器
 Type=Service
 X-KDE-ServiceTypes=KPackage/PackageStructure
--- a/indicators/default/metadata.desktop
+++ b/indicators/default/metadata.desktop
@ -45,6 +45,7 @@ Comment[ru]=Индикатор Latte умолчанию
 Comment[sv]=Latte standardindikator
 Comment[uk]=Типовий індикатор Латте
 Comment[x-test]=xxLatte default indicatorxx
+Comment[zh_CN]=Latte 默认任务指示器
 Comment[zh_TW]=Latte 預設指示器

 Encoding=UTF-8
--- a/indicators/org.kde.latte.plasma/metadata.desktop
+++ b/indicators/org.kde.latte.plasma/metadata.desktop
@ -42,6 +42,7 @@ 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 樣式指示器

 Encoding=UTF-8
--- a/plasmoid/metadata.desktop.cmake
+++ b/plasmoid/metadata.desktop.cmake
@ -18,6 +18,7 @@ Name[ru]=Процессы 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
 Comment[ca]=Plasmoide de tasques del Latte Dock
@ -38,6 +39,7 @@ 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

 Type=Service
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@ -18,6 +18,7 @@ Name[ru]=Процессы 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
 Comment[ca]=Plasmoide de tasques del Latte Dock
@ -38,6 +39,7 @@ 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

 Type=Service