mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-25 02:45:38 +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
802e8814aa
commit
d6775c6462
|
@ -212,6 +212,6 @@ X-KDE-Keywords[sv]=XPS
|
|||
X-KDE-Keywords[tr]=XPS
|
||||
X-KDE-Keywords[uk]=XPS
|
||||
X-KDE-Keywords[x-test]=xxXPSxx
|
||||
X-KDE-Keywords[zh_CN]=mXPS
|
||||
X-KDE-Keywords[zh_CN]=XPS
|
||||
X-KDE-Keywords[zh_TW]=XPS
|
||||
NoDisplay=true
|
||||
|
|
|
@ -205,5 +205,5 @@ X-KDE-Keywords[sv]=XPS
|
|||
X-KDE-Keywords[tr]=XPS
|
||||
X-KDE-Keywords[uk]=XPS
|
||||
X-KDE-Keywords[x-test]=xxXPSxx
|
||||
X-KDE-Keywords[zh_CN]=mXPS
|
||||
X-KDE-Keywords[zh_CN]=XPS
|
||||
X-KDE-Keywords[zh_TW]=XPS
|
||||
|
|
Loading…
Reference in a new issue