office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-13 13:11:41 +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-12-04 06:13:21 +01:00
parent f8cf8acd7c
commit ad559c5d93
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

@ -35,6 +35,7 @@
"Name[fr]": "Moteur de markdown",
"Name[ia]": "Retro-Administration Markdown",
"Name[it]": "Backend Markdown",
"Name[ko]": "Markdown 백엔드",
"Name[nl]": "Markdown-backend",
"Name[nn]": "Markdown-motor",
"Name[pl]": "Silnik Markdown",

1
generators/markdown/okularApplication_md.desktop
View file

@ -177,6 +177,7 @@ X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[fr]=Markdown
X-KDE-Keywords[ia]=Markdown
X-KDE-Keywords[it]=Markdown
X-KDE-Keywords[ko]=Markdown
X-KDE-Keywords[nl]=Markdown
X-KDE-Keywords[nn]=Markdown
X-KDE-Keywords[pl]=Markdown

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

@ -166,6 +166,7 @@ X-KDE-Keywords[es]=Markdown
X-KDE-Keywords[fr]=Markdown
X-KDE-Keywords[ia]=Markdown
X-KDE-Keywords[it]=Markdown
X-KDE-Keywords[ko]=Markdown
X-KDE-Keywords[nl]=Markdown
X-KDE-Keywords[nn]=Markdown
X-KDE-Keywords[pl]=Markdown