From 7bc2080697c4ccfd0c7bbd6160cc222dd4e114c3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 26 Mar 2018 05:10:31 +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" --- plasma-mobile.desktop.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plasma-mobile.desktop.cmake b/plasma-mobile.desktop.cmake index c97d6a74..2cfdf3bc 100644 --- a/plasma-mobile.desktop.cmake +++ b/plasma-mobile.desktop.cmake @@ -17,6 +17,7 @@ Name[pt]=Plasma Mobile Name[sv]=Plasma mobil Name[uk]=Мобільна Плазма Name[x-test]=xxPlasma Mobilexx +Name[zh_TW]=Plasma 行動 Comment=Plasma Mobile by KDE Comment[ast]=Plasma Mobile por KDE Comment[ca]=Plasma Mòbil, creat per la comunitat KDE @@ -31,3 +32,4 @@ Comment[pt]=Plasma Mobile do KDE Comment[sv]=Plasma mobil av KDE Comment[uk]=Мобільна Плазма від KDE Comment[x-test]=xxPlasma Mobile by KDExx +Comment[zh_TW]=來自 KDE 的 Plasma 行動作業系統