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 · 11ac28b99c
parent cd9e0ae575
commit 11ac28b99c
13 changed files with 39 additions and 0 deletions
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@ -9,6 +9,7 @@ Name[pt]=Área Acoplável do Latte
 Name[sv]=Latte dockningsfönster
 Name[uk]=Панель Латте
 Name[x-test]=xxLatte Dockxx
+Name[zh_TW]=Latte Dock
 Comment=Latte Dock
 Comment[ca]=Acoblable del Latte
 Comment[ca@valencia]=Acoblable del Latte
@ -19,6 +20,7 @@ Comment[pt]=Área Acoplável do Latte
 Comment[sv]=Latte dockningsfönster
 Comment[uk]=Панель Латте
 Comment[x-test]=xxLatte Dockxx
+Comment[zh_TW]=Latte Dock
 IconName=latte-dock

 [Event/import-done]
@ -32,6 +34,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_TW]=設定匯入成功
 Action=Popup

 [Event/import-fail]
@ -45,6 +48,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_TW]=匯入設定失敗
 Action=Popup

 [Event/export-done]
@ -58,6 +62,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_TW]=設定匯出成功
 Action=Popup

 [Event/export-fail]
@ -71,6 +76,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_TW]=匯出設定失敗
 Action=Popup

 [Event/switch-layout]
@ -84,4 +90,5 @@ Name[pt]=Mudar para a disposição
 Name[sv]=Byt till layout
 Name[uk]=Перемкнутися на компонування
 Name[x-test]=xxSwitch to layoutxx
+Name[zh_TW]=切換至佈局
 Action=Popup
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@ -9,6 +9,7 @@ Name[pt]=Latte
 Name[sv]=Latte
 Name[uk]=Латте
 Name[x-test]=xxLattexx
+Name[zh_TW]=Latte
 Comment=Dock for the masses
 Comment[ca]=Acoblador per a les masses
 Comment[ca@valencia]=Acoblador per a les masses
@ -19,6 +20,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_TW]=給大眾使用的 Dock
 GenericName=Dock
 GenericName[ca]=Acobla
 GenericName[ca@valencia]=Acobla
@ -31,6 +33,7 @@ GenericName[sv]=Dockningsfönster
 GenericName[uk]=Панель
 GenericName[x-test]=xxDockxx
 GenericName[zh_CN]=停靠部件
+GenericName[zh_TW]=Dock
 Icon=latte-dock
 Categories=Utility;X-SuSE-DesktopUtility;
 Exec=latte-dock %u
--- a/applets/separator/metadata.desktop.cmake
+++ b/applets/separator/metadata.desktop.cmake
@ -12,6 +12,7 @@ Name[sv]=Avskiljare
 Name[uk]=Роздільник
 Name[x-test]=xxSeparatorxx
 Name[zh_CN]=分隔符
+Name[zh_TW]=分隔符號
 Comment=For all your separation tasks
 Comment[ca]=Per a totes les tasques de separació
 Comment[ca@valencia]=Per a totes les tasques de separació
@ -22,6 +23,7 @@ Comment[pt]=Para todas as suas tarefas de separação
 Comment[sv]=För alla dina separationsuppgifter
 Comment[uk]=Для відокремлення усіх ваших завдань
 Comment[x-test]=xxFor all your separation tasksxx
+Comment[zh_TW]=為您所有分開的工作

 Encoding=UTF-8
 Icon=filename-divider
@ -37,6 +39,7 @@ Keywords[sv]=avskiljare
 Keywords[uk]=Роздільник
 Keywords[x-test]=xxseparatorxx
 Keywords[zh_CN]=分隔符
+Keywords[zh_TW]=分隔器
 Type=Service

 X-Plasma-API=declarativeappletscript
--- a/applets/separator/package/metadata.desktop
+++ b/applets/separator/package/metadata.desktop
@ -12,6 +12,7 @@ Name[sv]=Avskiljare
 Name[uk]=Роздільник
 Name[x-test]=xxSeparatorxx
 Name[zh_CN]=分隔符
+Name[zh_TW]=分隔符號
 Comment=For all your separation tasks
 Comment[ca]=Per a totes les tasques de separació
 Comment[ca@valencia]=Per a totes les tasques de separació
@ -22,6 +23,7 @@ Comment[pt]=Para todas as suas tarefas de separação
 Comment[sv]=För alla dina separationsuppgifter
 Comment[uk]=Для відокремлення усіх ваших завдань
 Comment[x-test]=xxFor all your separation tasksxx
+Comment[zh_TW]=為您所有分開的工作

 Encoding=UTF-8
 Icon=filename-divider
@ -37,6 +39,7 @@ Keywords[sv]=avskiljare
 Keywords[uk]=Роздільник
 Keywords[x-test]=xxseparatorxx
 Keywords[zh_CN]=分隔符
+Keywords[zh_TW]=分隔器
 Type=Service

 X-Plasma-API=declarativeappletscript
--- a/applets/spacer/metadata.desktop.cmake
+++ b/applets/spacer/metadata.desktop.cmake
@ -9,6 +9,7 @@ Name[pt]=Espaço da Área Acoplável do Latte
 Name[sv]=Avskiljare för Latte dockningsfönster
 Name[uk]=Розпірка панелі Латте
 Name[x-test]=xxLatte Dock Spacerxx
+Name[zh_TW]=Latte Dock 間隔器
 Comment=Reserve empty spaces within the dock.
 Comment[ca]=Reserva espais buits dins de l'acoblador.
 Comment[ca@valencia]=Reserva espais buits dins de l'acoblador.
@ -19,6 +20,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_TW]=在 dock 中保留空間。

 Encoding=UTF-8
 Type=Service
@ -32,6 +34,7 @@ Keywords[pt]=espaço
 Keywords[sv]=mellanrum
 Keywords[uk]=розпірка
 Keywords[x-test]=xxspacerxx
+Keywords[zh_TW]=空白
 NoDisplay=true


--- a/applets/spacer/package/metadata.desktop
+++ b/applets/spacer/package/metadata.desktop
@ -9,6 +9,7 @@ Name[pt]=Espaço da Área Acoplável do Latte
 Name[sv]=Avskiljare för Latte dockningsfönster
 Name[uk]=Розпірка панелі Латте
 Name[x-test]=xxLatte Dock Spacerxx
+Name[zh_TW]=Latte Dock 間隔器
 Comment=Reserve empty spaces within the dock.
 Comment[ca]=Reserva espais buits dins de l'acoblador.
 Comment[ca@valencia]=Reserva espais buits dins de l'acoblador.
@ -19,6 +20,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_TW]=在 dock 中保留空間。

 Encoding=UTF-8
 Type=Service
@ -32,6 +34,7 @@ Keywords[pt]=espaço
 Keywords[sv]=mellanrum
 Keywords[uk]=розпірка
 Keywords[x-test]=xxspacerxx
+Keywords[zh_TW]=空白
 NoDisplay=true


--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@ -10,6 +10,7 @@ Name[pt]=Latte
 Name[sv]=Latte
 Name[uk]=Латте
 Name[x-test]=xxLattexx
+Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[ca@valencia]=Intèrpret d'ordes proporcionat pel Latte Dock
@ -20,6 +21,7 @@ Comment[pt]=Contentor oferecido para a área acoplável do Latte
 Comment[sv]=Omgivning tillhandahållen för Latte dockningsfönster
 Comment[uk]=Контейнер панелі Латте
 Comment[x-test]=xxContainment provided for the Latte Dockxx
+Comment[zh_TW]=提供 Latte Dock 使用的容器

 Type=Service
 NoDisplay=true
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@ -10,6 +10,7 @@ Name[pt]=Latte
 Name[sv]=Latte
 Name[uk]=Латте
 Name[x-test]=xxLattexx
+Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[ca@valencia]=Intèrpret d'ordes proporcionat pel Latte Dock
@ -20,6 +21,7 @@ Comment[pt]=Contentor oferecido para a área acoplável do Latte
 Comment[sv]=Omgivning tillhandahållen för Latte dockningsfönster
 Comment[uk]=Контейнер панелі Латте
 Comment[x-test]=xxContainment provided for the Latte Dockxx
+Comment[zh_TW]=提供 Latte Dock 使用的容器

 Type=Service
 NoDisplay=true
--- a/plasmoid/metadata.desktop.cmake
+++ b/plasmoid/metadata.desktop.cmake
@ -9,6 +9,7 @@ Name[pt]=Plasmóide do Latte
 Name[sv]=Latte Plasmoid
 Name[uk]=Плазмоїд Латте
 Name[x-test]=xxLatte Plasmoidxx
+Name[zh_TW]=Latte Plasmoid
 Comment=Plasmoid from the Latte Dock
 Comment[ca]=Plasmoide del Latte Dock
 Comment[ca@valencia]=Plasmoide del Latte Dock
@ -19,6 +20,7 @@ Comment[pt]=Plasmóide da Área Acoplável do Latte
 Comment[sv]=Plasmoid för Latte dockningsfönster
 Comment[uk]=Плазмоїд для панелі Латте
 Comment[x-test]=xxPlasmoid from the Latte Dockxx
+Comment[zh_TW]=從 Latte Dock 而來的 Plasmoid

 Type=Service
 Icon=latte-dock
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@ -9,6 +9,7 @@ Name[pt]=Plasmóide do Latte
 Name[sv]=Latte Plasmoid
 Name[uk]=Плазмоїд Латте
 Name[x-test]=xxLatte Plasmoidxx
+Name[zh_TW]=Latte Plasmoid
 Comment=Plasmoid from the Latte Dock
 Comment[ca]=Plasmoide del Latte Dock
 Comment[ca@valencia]=Plasmoide del Latte Dock
@ -19,6 +20,7 @@ Comment[pt]=Plasmóide da Área Acoplável do Latte
 Comment[sv]=Plasmoid för Latte dockningsfönster
 Comment[uk]=Плазмоїд для панелі Латте
 Comment[x-test]=xxPlasmoid from the Latte Dockxx
+Comment[zh_TW]=從 Latte Dock 而來的 Plasmoid

 Type=Service
 Icon=latte-dock
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@ -10,6 +10,7 @@ Name[pt]=Consola do Latte
 Name[sv]=Latte skal
 Name[uk]=Оболонка Латте
 Name[x-test]=xxLatte Shellxx
+Name[zh_TW]=Latte Shell
 Comment=Shell provided for the Latte Dock
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[ca@valencia]=Intèrpret d'ordes proporcionat pel Latte Dock
@ -20,6 +21,7 @@ Comment[pt]=Consola oferecida para a área acoplável do Latte
 Comment[sv]=Skal tillhandahållet för Latte dockningsfönster
 Comment[uk]=Оболонка панелі Латте
 Comment[x-test]=xxShell provided for the Latte Dockxx
+Comment[zh_TW]=由 Latte Dock 提供的 Shell

 Keywords=shell
 Keywords[ca]=intèrpret d'ordres
@ -32,6 +34,7 @@ Keywords[sk]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка
 Keywords[x-test]=xxshellxx
+Keywords[zh_TW]=shell
 Type=Service

 X-KDE-ServiceTypes=Plasma/Shell
--- a/shell/package/contents/controls/latte-separator.desktop
+++ b/shell/package/contents/controls/latte-separator.desktop
@ -9,6 +9,7 @@ Name[pt]=Separador do Latte
 Name[sv]=Latte avskiljare
 Name[uk]=Роздільник Латте
 Name[x-test]=xxLatte Separatorxx
+Name[zh_TW]=Latte 分隔器
 Comment=Latte Ghost Separator (Ghost file)
 Comment[ca]=Separador del Latte Ghost (fitxer Ghost)
 Comment[ca@valencia]=Separador del Latte Ghost (fitxer Ghost)
@ -18,6 +19,7 @@ Comment[pt]=Separador Ghost do Latte (ficheiro Ghost)
 Comment[sv]=Latte spökavskiljare (spökfil)
 Comment[uk]=Роздільник-привид Латте (файл-привид)
 Comment[x-test]=xxLatte Ghost Separator (Ghost file)xx
+Comment[zh_TW]=Latte 鬼分隔器（鬼檔案）
 GenericName=Dock
 GenericName[ca]=Acobla
 GenericName[ca@valencia]=Acobla
@ -30,6 +32,7 @@ GenericName[sv]=Dockningsfönster
 GenericName[uk]=Панель
 GenericName[x-test]=xxDockxx
 GenericName[zh_CN]=停靠部件
+GenericName[zh_TW]=Dock
 Version=0.1
 Categories=Utility;
 Exec=latte-dock %u
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@ -10,6 +10,7 @@ Name[pt]=Consola do Latte
 Name[sv]=Latte skal
 Name[uk]=Оболонка Латте
 Name[x-test]=xxLatte Shellxx
+Name[zh_TW]=Latte Shell
 Comment=Shell provided for the Latte Dock
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[ca@valencia]=Intèrpret d'ordes proporcionat pel Latte Dock
@ -20,6 +21,7 @@ Comment[pt]=Consola oferecida para a área acoplável do Latte
 Comment[sv]=Skal tillhandahållet för Latte dockningsfönster
 Comment[uk]=Оболонка панелі Латте
 Comment[x-test]=xxShell provided for the Latte Dockxx
+Comment[zh_TW]=由 Latte Dock 提供的 Shell

 Keywords=shell
 Keywords[ca]=intèrpret d'ordres
@ -32,6 +34,7 @@ Keywords[sk]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка
 Keywords[x-test]=xxshellxx
+Keywords[zh_TW]=shell
 Type=Service

 X-KDE-ServiceTypes=Plasma/Shell