From 2daff2a344b41e8cf4adbdcdf85f50dda6bb8530 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 11 Jan 2018 06:26:36 +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 fc43dd8a5..a46994c55 100644 --- a/generators/markdown/okularApplication_md.desktop +++ b/generators/markdown/okularApplication_md.desktop @@ -170,6 +170,7 @@ X-KDE-Keywords=Markdown X-KDE-Keywords[ca]=Markdown X-KDE-Keywords[ca@valencia]=Markdown X-KDE-Keywords[cs]=Markdown +X-KDE-Keywords[da]=Markdown X-KDE-Keywords[de]=Markdown X-KDE-Keywords[el]=Markdown X-KDE-Keywords[en_GB]=Markdown diff --git a/generators/markdown/org.kde.mobile.okular_md.desktop b/generators/markdown/org.kde.mobile.okular_md.desktop index a8ef6016b..dad5dc4ce 100644 --- a/generators/markdown/org.kde.mobile.okular_md.desktop +++ b/generators/markdown/org.kde.mobile.okular_md.desktop @@ -159,6 +159,7 @@ X-KDE-Keywords=Markdown X-KDE-Keywords[ca]=Markdown X-KDE-Keywords[ca@valencia]=Markdown X-KDE-Keywords[cs]=Markdown +X-KDE-Keywords[da]=Markdown X-KDE-Keywords[de]=Markdown X-KDE-Keywords[el]=Markdown X-KDE-Keywords[en_GB]=Markdown