From 27c8cda791423dbf340dec1b4ba9a935b5a90050 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 Feb 2020 09:48:41 +0100 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" --- plasmoid/metadata.desktop.cmake | 4 ++-- plasmoid/package/metadata.desktop | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake index 4013e254a..b777f1232 100644 --- a/plasmoid/metadata.desktop.cmake +++ b/plasmoid/metadata.desktop.cmake @@ -22,7 +22,7 @@ Name[sv]=Latte aktiviteter Name[uk]=Завдання Латте Name[x-test]=xxLatte Tasksxx Name[zh_CN]=Latte 任务管理器 -Name[zh_TW]=Latte 任務 +Name[zh_TW]=Latte 工作 Comment=Tasks plasmoid from Latte Dock Comment[ca]=Plasmoide de tasques del Latte Dock Comment[ca@valencia]=Plasmoide de tasques del Latte Dock @@ -46,7 +46,7 @@ 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 +Comment[zh_TW]=來自 Latte Dock 的工作 Plasmoid Type=Service Icon=latte-dock diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index eba804270..a8ce64de0 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -22,7 +22,7 @@ Name[sv]=Latte aktiviteter Name[uk]=Завдання Латте Name[x-test]=xxLatte Tasksxx Name[zh_CN]=Latte 任务管理器 -Name[zh_TW]=Latte 任務 +Name[zh_TW]=Latte 工作 Comment=Tasks plasmoid from Latte Dock Comment[ca]=Plasmoide de tasques del Latte Dock Comment[ca@valencia]=Plasmoide de tasques del Latte Dock @@ -46,7 +46,7 @@ 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 +Comment[zh_TW]=來自 Latte Dock 的工作 Plasmoid Type=Service Icon=latte-dock