From b3e941e73604f6dbd106ae9fe25368b24be5cbbf Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 27 Sep 2017 09:08:25 +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" --- generators/markdown/libokularGenerator_md.json | 1 + generators/markdown/okularApplication_md.desktop | 1 + generators/markdown/org.kde.mobile.okular_md.desktop | 1 + 3 files changed, 3 insertions(+) diff --git a/generators/markdown/libokularGenerator_md.json b/generators/markdown/libokularGenerator_md.json index bfb1f81e9..738c3835d 100644 --- a/generators/markdown/libokularGenerator_md.json +++ b/generators/markdown/libokularGenerator_md.json @@ -46,6 +46,7 @@ "Name[uk]": "Модуль Markdown", "Name[x-test]": "xxMarkdown Backendxx", "Name[zh_CN]": "Markdown 后端", + "Name[zh_TW]": "Markdown 後端介面", "ServiceTypes": [ "okular/Generator" ], diff --git a/generators/markdown/okularApplication_md.desktop b/generators/markdown/okularApplication_md.desktop index 6e122ec16..10f7dc806 100644 --- a/generators/markdown/okularApplication_md.desktop +++ b/generators/markdown/okularApplication_md.desktop @@ -188,3 +188,4 @@ X-KDE-Keywords[sv]=Markdown X-KDE-Keywords[uk]=Markdown X-KDE-Keywords[x-test]=xxMarkdownxx X-KDE-Keywords[zh_CN]=Markdown +X-KDE-Keywords[zh_TW]=Markdown diff --git a/generators/markdown/org.kde.mobile.okular_md.desktop b/generators/markdown/org.kde.mobile.okular_md.desktop index 9c9ca3371..2bca92be8 100644 --- a/generators/markdown/org.kde.mobile.okular_md.desktop +++ b/generators/markdown/org.kde.mobile.okular_md.desktop @@ -177,3 +177,4 @@ X-KDE-Keywords[sv]=Markdown X-KDE-Keywords[uk]=Markdown X-KDE-Keywords[x-test]=xxMarkdownxx X-KDE-Keywords[zh_CN]=Markdown +X-KDE-Keywords[zh_TW]=Markdown -- GitLab