office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 19:50:27 +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-10-15 06:24:28 +02:00
parent 76a4ad6323
commit e7702e0a8c
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/epub/okularApplication_epub.desktop
View file

@ -183,7 +183,7 @@ X-KDE-Keywords[et]=epub, e-book, e-raamat
X-KDE-Keywords[fi]=epub, e-book, e-kirja, sähkökirja
X-KDE-Keywords[fr]=epub, e-book
X-KDE-Keywords[ga]=epub, ríomhleabhar, r-leabhar
X-KDE-Keywords[gl]=epub, e-book,libro dixital
X-KDE-Keywords[gl]=epub, e-book, libro dixital
X-KDE-Keywords[hu]=epub, e-book
X-KDE-Keywords[ia]=epub, e-book
X-KDE-Keywords[is]=epub, e-book, rafbók

2
generators/epub/org.kde.mobile.okular_epub.desktop
View file

@ -173,7 +173,7 @@ X-KDE-Keywords[et]=epub, e-book, e-raamat
X-KDE-Keywords[fi]=epub, e-book, e-kirja, sähkökirja
X-KDE-Keywords[fr]=epub, e-book
X-KDE-Keywords[ga]=epub, ríomhleabhar, r-leabhar
X-KDE-Keywords[gl]=epub, e-book,libro dixital
X-KDE-Keywords[gl]=epub, e-book, libro dixital
X-KDE-Keywords[hu]=epub, e-book
X-KDE-Keywords[ia]=epub, e-book
X-KDE-Keywords[is]=epub, e-book, rafbók