From 863ae954a7be6eef4875a041b3d428c2249fa62e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 27 Nov 2017 05:02:58 +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/markdown/okularApplication_md.desktop | 1 + generators/markdown/org.kde.mobile.okular_md.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/generators/markdown/okularApplication_md.desktop b/generators/markdown/okularApplication_md.desktop index 23bd59f38..1f43ef7e3 100644 --- a/generators/markdown/okularApplication_md.desktop +++ b/generators/markdown/okularApplication_md.desktop @@ -172,6 +172,7 @@ X-KDE-Keywords[ca@valencia]=Markdown X-KDE-Keywords[cs]=Markdown X-KDE-Keywords[de]=Markdown X-KDE-Keywords[el]=Markdown +X-KDE-Keywords[en_GB]=Markdown X-KDE-Keywords[es]=Markdown X-KDE-Keywords[fr]=Markdown X-KDE-Keywords[ia]=Markdown diff --git a/generators/markdown/org.kde.mobile.okular_md.desktop b/generators/markdown/org.kde.mobile.okular_md.desktop index a9fb6c635..2d5e4d54a 100644 --- a/generators/markdown/org.kde.mobile.okular_md.desktop +++ b/generators/markdown/org.kde.mobile.okular_md.desktop @@ -161,6 +161,7 @@ X-KDE-Keywords[ca@valencia]=Markdown X-KDE-Keywords[cs]=Markdown X-KDE-Keywords[de]=Markdown X-KDE-Keywords[el]=Markdown +X-KDE-Keywords[en_GB]=Markdown X-KDE-Keywords[es]=Markdown X-KDE-Keywords[fr]=Markdown X-KDE-Keywords[ia]=Markdown