office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 03:30:20 +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-09-12 04:52:10 +02:00
parent 193ecf7649
commit 9d4067059f
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
generators/markdown/libokularGenerator_md.json
View file

@ -29,6 +29,7 @@
"Name[ca]": "Dorsal de Markdown",
"Name[cs]": "Podpůrná vrstva Markdown",
"Name[es]": "Motor para Markdown",
"Name[fr]": "Moteur de markdown",
"Name[it]": "Backend Markdown",
"Name[nl]": "Markdown-backend",
"Name[nn]": "Markdown-motor",

1
generators/markdown/okularApplication_md.desktop
View file

@ -171,6 +171,7 @@ X-KDE-Keywords[ca]=Markdown
X-KDE-Keywords[ca@valencia]=Markdown
X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[fr]=Markdown
X-KDE-Keywords[it]=Markdown
X-KDE-Keywords[nl]=Markdown
X-KDE-Keywords[nn]=Markdown

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

@ -160,6 +160,7 @@ X-KDE-Keywords[ca]=Markdown
X-KDE-Keywords[ca@valencia]=Markdown
X-KDE-Keywords[cs]=Markdown
X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[fr]=Markdown
X-KDE-Keywords[it]=Markdown
X-KDE-Keywords[nl]=Markdown
X-KDE-Keywords[nn]=Markdown