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"
7 years ago · 1b4052e6dc
parent 1137f85f6a
commit 1b4052e6dc
8 changed files with 15 additions and 0 deletions
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@ -49,6 +49,7 @@ Name[pt]=A configuração foi importada com sucesso
 Name[sv]=Inställning importerad med lyckat resultat
 Name[uk]=Налаштування успішно імпортовано
 Name[x-test]=xxConfiguration imported successfullyxx
+Name[zh_CN]=配置成功导入
 Name[zh_TW]=設定匯入成功
 Action=Popup

@ -68,6 +69,7 @@ Name[pt]=Não foi possível importar a configuração
 Name[sv]=Misslyckades importera inställning
 Name[uk]=Не вдалося імпортувати налаштування
 Name[x-test]=xxFailed to import configurationxx
+Name[zh_CN]=配置导入失败
 Name[zh_TW]=匯入設定失敗
 Action=Popup

@ -87,6 +89,7 @@ Name[pt]=A configuração foi exportada com sucesso
 Name[sv]=Inställning exporterad med lyckat resultat
 Name[uk]=Налаштування успішно експортовано
 Name[x-test]=xxConfiguration exported successfullyxx
+Name[zh_CN]=配置成功导出
 Name[zh_TW]=設定匯出成功
 Action=Popup

@ -106,6 +109,7 @@ Name[pt]=Não foi possível exportar a configuração
 Name[sv]=Misslyckades exportera inställning
 Name[uk]=Не вдалося експортувати налаштування
 Name[x-test]=xxFailed to export configurationxx
+Name[zh_CN]=配置导出失败
 Name[zh_TW]=匯出設定失敗
 Action=Popup

@ -125,5 +129,6 @@ Name[pt]=Mudar para a disposição
 Name[sv]=Byt till layout
 Name[uk]=Перемкнутися на компонування
 Name[x-test]=xxSwitch to layoutxx
+Name[zh_CN]=切换布局
 Name[zh_TW]=切換至佈局
 Action=Popup
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@ -15,6 +15,7 @@ Name[pt]=Latte
 Name[sv]=Latte
 Name[uk]=Латте
 Name[x-test]=xxLattexx
+Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Dock for the masses
 Comment[ca]=Acoblador per a les masses
@ -31,6 +32,7 @@ Comment[pt]=Área acoplável para as massas
 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
 GenericName[ca]=Acobla
--- a/applets/spacer/metadata.desktop.cmake
+++ b/applets/spacer/metadata.desktop.cmake
@ -30,6 +30,7 @@ Comment[pt]=Reservar espaços em branco dentro da área acoplável.
 Comment[sv]=Reservera tomt utrymme inne i dockningsfönstret.
 Comment[uk]=Створює прогалини на панелі.
 Comment[x-test]=xxReserve empty spaces within the dock.xx
+Comment[zh_CN]=在停靠栏中保留空间。
 Comment[zh_TW]=在 dock 中保留空間。

 Encoding=UTF-8
@ -49,6 +50,7 @@ Keywords[pt]=espaço
 Keywords[sv]=mellanrum
 Keywords[uk]=розпірка
 Keywords[x-test]=xxspacerxx
+Keywords[zh_CN]=spacer，空白，留空，分隔
 Keywords[zh_TW]=空白
 NoDisplay=true

--- a/applets/spacer/package/metadata.desktop
+++ b/applets/spacer/package/metadata.desktop
@ -30,6 +30,7 @@ Comment[pt]=Reservar espaços em branco dentro da área acoplável.
 Comment[sv]=Reservera tomt utrymme inne i dockningsfönstret.
 Comment[uk]=Створює прогалини на панелі.
 Comment[x-test]=xxReserve empty spaces within the dock.xx
+Comment[zh_CN]=在停靠栏中保留空间。
 Comment[zh_TW]=在 dock 中保留空間。

 Encoding=UTF-8
@ -49,6 +50,7 @@ Keywords[pt]=espaço
 Keywords[sv]=mellanrum
 Keywords[uk]=розпірка
 Keywords[x-test]=xxspacerxx
+Keywords[zh_CN]=spacer，空白，留空，分隔
 Keywords[zh_TW]=空白
 NoDisplay=true

--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@ -16,6 +16,7 @@ Name[pt]=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
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@ -16,6 +16,7 @@ Name[pt]=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
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@ -15,6 +15,7 @@ Name[pt]=Consola do 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
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@ -15,6 +15,7 @@ Name[pt]=Consola do 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
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock