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 2019-09-25 05:23:48 +02:00
parent 4a4a2a1b52
commit 59f13d9bcf
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

@ -176,6 +176,7 @@ X-KDE-Keywords[eu]=cbr, cbz, cbt, cb7, komiki-liburua
X-KDE-Keywords[fr]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[gl]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ko]=cbr, cbz, cbt, cb7, Comic Book, 만화책, 만화
X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal
X-KDE-Keywords[nn]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks

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

@ -167,6 +167,7 @@ X-KDE-Keywords[eu]=cbr, cbz, cbt, cb7, komiki-liburua
X-KDE-Keywords[fr]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[gl]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ko]=cbr, cbz, cbt, cb7, Comic Book, 만화책, 만화
X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal
X-KDE-Keywords[nn]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks