office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-07-05 00:58:46 +00:00
Code Issues 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 2021-12-06 02:44:04 +00:00
parent 63ec63efa9
commit 0439961dce
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/comicbook/okularApplication_comicbook.desktop
View File

@ -184,7 +184,7 @@ 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[de]=Comic-Book
X-KDE-Keywords[el]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic

2
generators/comicbook/org.kde.mobile.okular_comicbook.desktop
View File

@ -175,7 +175,7 @@ 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[de]=Comic-Book
X-KDE-Keywords[el]=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