From 1bce7d92a5e3248e11a519982f94a024bfc3b34c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 19 Mar 2023 02:23:28 +0000 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" --- bin/plasma-mobile-dev.desktop.cmake | 1 + plasma_phone_components.notifyrc | 1 + 2 files changed, 2 insertions(+) diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake index dd1473e9..c19d7b0c 100644 --- a/bin/plasma-mobile-dev.desktop.cmake +++ b/bin/plasma-mobile-dev.desktop.cmake @@ -31,6 +31,7 @@ Name[tr]=Plasma Mobile (Geliştirme) Name[uk]=Мобільна Плазма (версія у розробці) Name[x-test]=xxPlasma Mobile (Development)xx Name[zh_CN]=Plasma Mobile (开发) +Name[zh_TW]=Plasma 行動(開發) Comment=Plasma Mobile by KDE Comment[az]=KDE Plasma Mobil Comment[ca]=Plasma Mobile, creat per la comunitat KDE diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc index 749eccf8..c94a46c0 100644 --- a/plasma_phone_components.notifyrc +++ b/plasma_phone_components.notifyrc @@ -37,6 +37,7 @@ Name[tr]=Plasma Name[uk]=Плазма Name[x-test]=xxPlasmaxx Name[zh_CN]=Plasma +Name[zh_TW]=Plasma [Event/captured] Name=Captured