mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-27 11:40:07 +00:00
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"
This commit is contained in:
parent
553d69dcef
commit
daaa084476
|
@ -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",
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue