office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 11:40:07 +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 2018-01-15 04:46:05 +01:00
parent 553d69dcef
commit daaa084476
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

@ -43,6 +43,7 @@
"Name[pt]": "Infra-Estrutura de Markdown",
"Name[ru]": "Модуль поддержки формата Markdown",
"Name[sk]": "Markdown backend",
"Name[sl]": "Zaledje za Markdown",
"Name[sr@ijekavian]": "Позадина за маркдаун",
"Name[sr@ijekavianlatin]": "Pozadina za Markdown",
"Name[sr@latin]": "Pozadina za Markdown",

1
generators/markdown/okularApplication_md.desktop
View file

@ -188,6 +188,7 @@ 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[sl]=Markdown
X-KDE-Keywords[sr]=Markdown,маркдаун
X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун
X-KDE-Keywords[sr@ijekavianlatin]=Markdown,Markdown

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

@ -177,6 +177,7 @@ 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[sl]=Markdown
X-KDE-Keywords[sr]=Markdown,маркдаун
X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун
X-KDE-Keywords[sr@ijekavianlatin]=Markdown,Markdown