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-08-18 05:05:25 +02:00
parent 241e807bca
commit 87f80c3418
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

@ -179,6 +179,7 @@ X-KDE-Keywords[nn]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks
X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[sk]=cbr, cbz, cbt, cb7, Kniha komiksov
X-KDE-Keywords[sv]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,комікс
X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx

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

@ -170,6 +170,7 @@ X-KDE-Keywords[nn]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks
X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[sk]=cbr, cbz, cbt, cb7, Kniha komiksov
X-KDE-Keywords[sv]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,комікс
X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx