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"
8 years ago · 863ae954a7
parent 3cbcc9b521
commit 863ae954a7
2 changed files with 2 additions and 0 deletions
--- 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
--- 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