From 42650e4f273caa8d4937a37461450e97d6087c12 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 28 Nov 2017 05:07:33 +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 1f43ef7e3..0b990f2a7 100644 --- a/generators/markdown/okularApplication_md.desktop +++ b/generators/markdown/okularApplication_md.desktop @@ -181,6 +181,7 @@ X-KDE-Keywords[nl]=Markdown X-KDE-Keywords[nn]=Markdown X-KDE-Keywords[pl]=Markdown X-KDE-Keywords[pt]=Markdown +X-KDE-Keywords[pt_BR]=Markdown X-KDE-Keywords[ru]=Markdown X-KDE-Keywords[sk]=Zrážka X-KDE-Keywords[sr]=Markdown,маркдаун diff --git a/generators/markdown/org.kde.mobile.okular_md.desktop b/generators/markdown/org.kde.mobile.okular_md.desktop index 2d5e4d54a..ab08f7b54 100644 --- a/generators/markdown/org.kde.mobile.okular_md.desktop +++ b/generators/markdown/org.kde.mobile.okular_md.desktop @@ -170,6 +170,7 @@ X-KDE-Keywords[nl]=Markdown X-KDE-Keywords[nn]=Markdown X-KDE-Keywords[pl]=Markdown X-KDE-Keywords[pt]=Markdown +X-KDE-Keywords[pt_BR]=Markdown X-KDE-Keywords[ru]=Markdown X-KDE-Keywords[sk]=Zrážka X-KDE-Keywords[sr]=Markdown,маркдаун