office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-02 06:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2017-11-27 05:02:58 +01:00
parent 3cbcc9b521
commit 863ae954a7
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
generators/markdown/okularApplication_md.desktop
View file

@ -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

1
generators/markdown/org.kde.mobile.okular_md.desktop
View file

@ -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