wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests 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"
remotes/origin/more-conventional-sidebar
l10n daemon script 7 years ago
parent b659b06ec7
commit 96b9fa1ef4
2 changed files with 0 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      generators/comicbook/okularApplication_comicbook.desktop
  2. 50
      generators/comicbook/org.kde.mobile.okular_comicbook.desktop

50
generators/comicbook/okularApplication_comicbook.desktop
Unescape View File

@ -166,53 +166,3 @@ InitialPreference=7
Categories=Qt;KDE;Graphics;Viewer;
NoDisplay=true
X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ar]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[bg]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[bs]=cbr, cbz, cbt, Comic Book,stripovi
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[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
X-KDE-Keywords[et]=cbr, cbz, cbt, Comic Book, koomiks
X-KDE-Keywords[eu]=cbr, cbz, cbt, komiki-liburua
X-KDE-Keywords[fi]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ga]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[gl]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[hu]=cbr, cbz, cbt, Képregény
X-KDE-Keywords[ia]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[is]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ja]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[kk]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[km]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ko]=cbr, cbz, cbt, Comic Book,만화책
X-KDE-Keywords[lt]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[lv]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[mr]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie
X-KDE-Keywords[nds]=cbr, cbz, cbt, Comicbook
X-KDE-Keywords[nl]=cbr, cbz, cbt, Stripverhaal
X-KDE-Keywords[nn]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[pa]=cbr, cbz, cbt, ਕਾਮਿਕ ਬੁੱਕ
X-KDE-Keywords[pl]=cbr, cbz, cbt, Komiks
X-KDE-Keywords[pt]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ro]=cbr, cbz, cbt, benzi desenate, comic
X-KDE-Keywords[ru]=cbr, cbz, cbt, Comic Book, комикс
X-KDE-Keywords[sk]=cbr, cbz, cbt, Comic Book, Kniha komiksov
X-KDE-Keywords[sl]=cbr, cbz, cbt, strip
X-KDE-Keywords[sr]=cbr, cbz, cbt, Comic Book,комикбук
X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, Comic Book,комикбук
X-KDE-Keywords[sr@ijekavianlatin]=cbr, cbz, cbt, Comic Book,ComicBook
X-KDE-Keywords[sr@latin]=cbr, cbz, cbt, Comic Book,ComicBook
X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[tr]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[uk]=cbr,cbz,cbt,Comic Book,комікс
X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx Comic Bookxx
X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book,漫画书,漫画,连环画
X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book

50
generators/comicbook/org.kde.mobile.okular_comicbook.desktop
Unescape View File

@ -157,53 +157,3 @@ Categories=Qt;KDE;Graphics;Office;Viewer;
InitialPreference=2
NoDisplay=true
X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ar]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[bg]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[bs]=cbr, cbz, cbt, Comic Book,stripovi
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[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
X-KDE-Keywords[et]=cbr, cbz, cbt, Comic Book, koomiks
X-KDE-Keywords[eu]=cbr, cbz, cbt, komiki-liburua
X-KDE-Keywords[fi]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ga]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[gl]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[hu]=cbr, cbz, cbt, Képregény
X-KDE-Keywords[ia]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[is]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ja]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[kk]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[km]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ko]=cbr, cbz, cbt, Comic Book,만화책
X-KDE-Keywords[lt]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[lv]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[mr]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie
X-KDE-Keywords[nds]=cbr, cbz, cbt, Comicbook
X-KDE-Keywords[nl]=cbr, cbz, cbt, Stripverhaal
X-KDE-Keywords[nn]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[pa]=cbr, cbz, cbt, ਕਾਮਿਕ ਬੁੱਕ
X-KDE-Keywords[pl]=cbr, cbz, cbt, Komiks
X-KDE-Keywords[pt]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ro]=cbr, cbz, cbt, benzi desenate, comic
X-KDE-Keywords[ru]=cbr, cbz, cbt, Comic Book, комикс
X-KDE-Keywords[sk]=cbr, cbz, cbt, Comic Book, Kniha komiksov
X-KDE-Keywords[sl]=cbr, cbz, cbt, strip
X-KDE-Keywords[sr]=cbr, cbz, cbt, Comic Book,комикбук
X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, Comic Book,комикбук
X-KDE-Keywords[sr@ijekavianlatin]=cbr, cbz, cbt, Comic Book,ComicBook
X-KDE-Keywords[sr@latin]=cbr, cbz, cbt, Comic Book,ComicBook
X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[tr]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[uk]=cbr,cbz,cbt,Comic Book,комікс
X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx Comic Bookxx
X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book,漫画书,漫画,连环画
X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book

Write Preview
Loading…
Cancel
Save