office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-07-16 10:17:04 +00:00
Code Issues Actions 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 2019-01-06 05:35:56 +01:00
parent 802e8814aa
commit d6775c6462
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generators/xps/okularApplication_xps.desktop
View file

@ -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

2
generators/xps/org.kde.mobile.okular_xps.desktop
View file

@ -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