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 c7432cdae6
commit 0fbe40dfb4
2 changed files with 10 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      generators/comicbook/okularApplication_comicbook.desktop
  2. 5
      generators/comicbook/org.kde.mobile.okular_comicbook.desktop

5
generators/comicbook/okularApplication_comicbook.desktop
Unescape View File

@ -167,10 +167,15 @@ Categories=Qt;KDE;Graphics;Viewer;
NoDisplay=true NoDisplay=true
X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ca]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[ca]=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 X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic
X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal
X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks
X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[sv]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[sv]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,комікс X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,комікс
X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx
X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, cb7, Comic Book, 漫畫, 漫畫書

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

@ -158,10 +158,15 @@ InitialPreference=2
NoDisplay=true NoDisplay=true
X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ca]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[ca]=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 X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic
X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal
X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks
X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[sv]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[sv]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,комікс X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,комікс
X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx
X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, cb7, Comic Book, 漫畫, 漫畫書

Write Preview
Loading…
Cancel
Save