office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-24 18:35:37 +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 2020-02-14 05:55:12 +01:00
parent 5c6a297feb
commit f2274e8992
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
generators/comicbook/okularApplication_comicbook.desktop
View file

@ -170,6 +170,7 @@ X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ca]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[cs]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[da]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[de]=cbr, cbz, cbt, cb7, Comic-Book
X-KDE-Keywords[el]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book

1
generators/comicbook/org.kde.mobile.okular_comicbook.desktop
View file

@ -160,6 +160,7 @@ X-KDE-Keywords=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ca]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[cs]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[da]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[de]=cbr, cbz, cbt, Comic-Book
X-KDE-Keywords[en_GB]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[es]=cbr, cbz, cbt, libro de cómic