From d6775c6462fda2ef86d548c216122ae6dc85e120 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 6 Jan 2019 05:35:56 +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" --- generators/xps/okularApplication_xps.desktop | 2 +- generators/xps/org.kde.mobile.okular_xps.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/xps/okularApplication_xps.desktop b/generators/xps/okularApplication_xps.desktop index 531ea6c19..ba578dea3 100755 --- a/generators/xps/okularApplication_xps.desktop +++ b/generators/xps/okularApplication_xps.desktop @@ -212,6 +212,6 @@ X-KDE-Keywords[sv]=XPS X-KDE-Keywords[tr]=XPS X-KDE-Keywords[uk]=XPS X-KDE-Keywords[x-test]=xxXPSxx -X-KDE-Keywords[zh_CN]=mXPS +X-KDE-Keywords[zh_CN]=XPS X-KDE-Keywords[zh_TW]=XPS NoDisplay=true diff --git a/generators/xps/org.kde.mobile.okular_xps.desktop b/generators/xps/org.kde.mobile.okular_xps.desktop index 050477a79..0aa48bf04 100644 --- a/generators/xps/org.kde.mobile.okular_xps.desktop +++ b/generators/xps/org.kde.mobile.okular_xps.desktop @@ -205,5 +205,5 @@ X-KDE-Keywords[sv]=XPS X-KDE-Keywords[tr]=XPS X-KDE-Keywords[uk]=XPS X-KDE-Keywords[x-test]=xxXPSxx -X-KDE-Keywords[zh_CN]=mXPS +X-KDE-Keywords[zh_CN]=XPS X-KDE-Keywords[zh_TW]=XPS