From adf39b2ed6c085dfbffd044c7fea027418fcb911 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 6 Jan 2015 12:29:40 +0100 Subject: [PATCH 1/6] GIT_SILENT Update version for Applications 14.12.1 --- VERSION | 2 +- core/version.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 5a21f5f71..7178b0ba1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -okular v0.21.0 +okular v0.21.1 diff --git a/core/version.h b/core/version.h index 0947582b8..04ff21a83 100644 --- a/core/version.h +++ b/core/version.h @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.21.0" +#define OKULAR_VERSION_STRING "0.21.1" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 21 -#define OKULAR_VERSION_RELEASE 0 +#define OKULAR_VERSION_RELEASE 1 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ From eb0da16e45e38c4542743a0d460dacc4c135fbb2 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 7 Jan 2015 00:17:35 +0100 Subject: [PATCH 2/6] Set the proper title again after tab change BUGS: 342492 FIXED-IN: 14.12.1 --- part.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/part.cpp b/part.cpp index 50a1b2093..263f3ad0b 100644 --- a/part.cpp +++ b/part.cpp @@ -1635,6 +1635,8 @@ void Part::guiActivateEvent(KParts::GUIActivateEvent *event) updateViewActions(); KParts::ReadWritePart::guiActivateEvent(event); + + setWindowTitleFromDocument(); } void Part::close() From f264146e5926d572e20667f2c3c05eb2fa07a315 Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 15 Jan 2015 16:41:22 +0100 Subject: [PATCH 3/6] Fix crash when arguments().mimeType() is an invalid mimetype name. I have a JIRA bug report with a PDF attached, and mid-clicking the PDF in konqueror leads to opening an okularpart with mimetype="application/x-octet-stream" (the x- in there is very unusual, and unknown to shared-mime-info). Fixed with null pointer checks. REVIEW: 122074 --- part.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/part.cpp b/part.cpp index 263f3ad0b..36438af1c 100644 --- a/part.cpp +++ b/part.cpp @@ -1325,18 +1325,20 @@ bool Part::openFile() if ( !isstdin && !fileInfo.exists() ) return false; KMimeType::Ptr pathMime = KMimeType::findByPath( fileNameToOpen ); - if ( !arguments().mimeType().isEmpty() ) + const QString argMimeType = arguments().mimeType(); + + if ( !argMimeType.isEmpty() ) { - KMimeType::Ptr argMime = KMimeType::mimeType( arguments().mimeType() ); + KMimeType::Ptr argMime = KMimeType::mimeType( argMimeType ); // Select the "childmost" mimetype, if none of them // inherits the other trust more what pathMime says // but still do a second try if that one fails - if ( argMime->is( pathMime->name() ) ) + if ( argMime && argMime->is( pathMime->name() ) ) { mimes << argMime; } - else if ( pathMime->is( argMime->name() ) ) + else if ( !argMime || pathMime->is( argMime->name() ) ) { mimes << pathMime; } From 557b5447a5b783fb4675642b3cc552b89b508680 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 21 Jan 2015 03:53:40 +0000 Subject: [PATCH 4/6] SVN_SILENT made messages (.desktop file) --- generators/comicbook/active-documentviewer_comicbook.desktop | 2 +- generators/comicbook/okularApplication_comicbook.desktop | 2 +- generators/epub/active-documentviewer_epub.desktop | 2 +- generators/epub/okularApplication_epub.desktop | 2 +- generators/fictionbook/active-documentviewer_fb.desktop | 2 +- generators/fictionbook/okularApplication_fb.desktop | 2 +- generators/poppler/active-documentviewer_pdf.desktop | 2 +- generators/poppler/okularApplication_pdf.desktop | 2 +- generators/spectre/active-documentviewer_ghostview.desktop | 2 +- generators/spectre/okularApplication_ghostview.desktop | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/generators/comicbook/active-documentviewer_comicbook.desktop b/generators/comicbook/active-documentviewer_comicbook.desktop index fa13e3ae7..7c380abcb 100644 --- a/generators/comicbook/active-documentviewer_comicbook.desktop +++ b/generators/comicbook/active-documentviewer_comicbook.desktop @@ -196,6 +196,6 @@ 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]=xxcbr, cbz, cbt, Comic Bookxx +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 diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index df500d8d5..639444a60 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -176,6 +176,6 @@ 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]=xxcbr, cbz, cbt, Comic Bookxx +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 diff --git a/generators/epub/active-documentviewer_epub.desktop b/generators/epub/active-documentviewer_epub.desktop index b917fe75c..ed840107e 100644 --- a/generators/epub/active-documentviewer_epub.desktop +++ b/generators/epub/active-documentviewer_epub.desktop @@ -196,6 +196,6 @@ X-KDE-Keywords[sr@latin]=epub, e-book,EPUB,e‑knjiga X-KDE-Keywords[sv]=epub, e-bok X-KDE-Keywords[tr]=epub, e-book X-KDE-Keywords[uk]=epub,e-book,електронна,книга -X-KDE-Keywords[x-test]=xxepub, e-bookxx +X-KDE-Keywords[x-test]=xxepubxx,xx e-bookxx X-KDE-Keywords[zh_CN]=epub, e-book,电子书 X-KDE-Keywords[zh_TW]=epub, e-book diff --git a/generators/epub/okularApplication_epub.desktop b/generators/epub/okularApplication_epub.desktop index a3d560a10..00b071f7e 100755 --- a/generators/epub/okularApplication_epub.desktop +++ b/generators/epub/okularApplication_epub.desktop @@ -176,6 +176,6 @@ X-KDE-Keywords[sr@latin]=epub, e-book,EPUB,e‑knjiga X-KDE-Keywords[sv]=epub, e-bok X-KDE-Keywords[tr]=epub, e-book X-KDE-Keywords[uk]=epub,e-book,електронна,книга -X-KDE-Keywords[x-test]=xxepub, e-bookxx +X-KDE-Keywords[x-test]=xxepubxx,xx e-bookxx X-KDE-Keywords[zh_CN]=epub, e-book,电子书 X-KDE-Keywords[zh_TW]=epub, e-book diff --git a/generators/fictionbook/active-documentviewer_fb.desktop b/generators/fictionbook/active-documentviewer_fb.desktop index f3d146cbf..f3a469ce3 100644 --- a/generators/fictionbook/active-documentviewer_fb.desktop +++ b/generators/fictionbook/active-documentviewer_fb.desktop @@ -196,6 +196,6 @@ X-KDE-Keywords[sr@latin]=FictionBook, e-book, fb2,FictionBook,e‑knjiga X-KDE-Keywords[sv]=FictionBook, e-bok, fb2 X-KDE-Keywords[tr]=FictionBook, e-book, fb2 X-KDE-Keywords[uk]=FictionBook,fb2,електронна,книга -X-KDE-Keywords[x-test]=xxFictionBook, e-book, fb2xx +X-KDE-Keywords[x-test]=xxFictionBookxx,xx e-bookxx,xx fb2xx X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2,电子书,虚拟书籍 X-KDE-Keywords[zh_TW]=FictionBook, e-book, fb2 diff --git a/generators/fictionbook/okularApplication_fb.desktop b/generators/fictionbook/okularApplication_fb.desktop index 34f1033b0..8cbbf92e1 100755 --- a/generators/fictionbook/okularApplication_fb.desktop +++ b/generators/fictionbook/okularApplication_fb.desktop @@ -176,6 +176,6 @@ X-KDE-Keywords[sr@latin]=FictionBook, e-book, fb2,FictionBook,e‑knjiga X-KDE-Keywords[sv]=FictionBook, e-bok, fb2 X-KDE-Keywords[tr]=FictionBook, e-book, fb2 X-KDE-Keywords[uk]=FictionBook,fb2,електронна,книга -X-KDE-Keywords[x-test]=xxFictionBook, e-book, fb2xx +X-KDE-Keywords[x-test]=xxFictionBookxx,xx e-bookxx,xx fb2xx X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2,电子书,虚拟书籍 X-KDE-Keywords[zh_TW]=FictionBook, e-book, fb2 diff --git a/generators/poppler/active-documentviewer_pdf.desktop b/generators/poppler/active-documentviewer_pdf.desktop index 6b835d780..c0ba419ea 100644 --- a/generators/poppler/active-documentviewer_pdf.desktop +++ b/generators/poppler/active-documentviewer_pdf.desktop @@ -196,6 +196,6 @@ X-KDE-Keywords[sr@latin]=PDF, Portable Document Format,PDF X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф -X-KDE-Keywords[x-test]=xxPDF, Portable Document Formatxx +X-KDE-Keywords[x-test]=xxPDFxx,xx Portable Document Formatxx X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式 X-KDE-Keywords[zh_TW]=PDF, Portable Document Format diff --git a/generators/poppler/okularApplication_pdf.desktop b/generators/poppler/okularApplication_pdf.desktop index 06f0b67c6..c5d82914b 100755 --- a/generators/poppler/okularApplication_pdf.desktop +++ b/generators/poppler/okularApplication_pdf.desktop @@ -175,7 +175,7 @@ X-KDE-Keywords[sr@latin]=PDF, Portable Document Format,PDF X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф -X-KDE-Keywords[x-test]=xxPDF, Portable Document Formatxx +X-KDE-Keywords[x-test]=xxPDFxx,xx Portable Document Formatxx X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式 X-KDE-Keywords[zh_TW]=PDF, Portable Document Format NoDisplay=true diff --git a/generators/spectre/active-documentviewer_ghostview.desktop b/generators/spectre/active-documentviewer_ghostview.desktop index 2617338a6..6baf5be10 100644 --- a/generators/spectre/active-documentviewer_ghostview.desktop +++ b/generators/spectre/active-documentviewer_ghostview.desktop @@ -191,6 +191,6 @@ X-KDE-Keywords[sr@latin]=PS,PostScript,PostScript,PS X-KDE-Keywords[sv]=PS, Postscript X-KDE-Keywords[tr]=PS, PostScript X-KDE-Keywords[uk]=PS, PostScript -X-KDE-Keywords[x-test]=xxPS, PostScriptxx +X-KDE-Keywords[x-test]=xxPSxx,xx PostScriptxx X-KDE-Keywords[zh_CN]=PS, PostScript X-KDE-Keywords[zh_TW]=PS, PostScript diff --git a/generators/spectre/okularApplication_ghostview.desktop b/generators/spectre/okularApplication_ghostview.desktop index 4143273b7..4acb11701 100755 --- a/generators/spectre/okularApplication_ghostview.desktop +++ b/generators/spectre/okularApplication_ghostview.desktop @@ -170,7 +170,7 @@ X-KDE-Keywords[sr@latin]=PS,PostScript,PostScript,PS X-KDE-Keywords[sv]=PS, Postscript X-KDE-Keywords[tr]=PS, PostScript X-KDE-Keywords[uk]=PS, PostScript -X-KDE-Keywords[x-test]=xxPS, PostScriptxx +X-KDE-Keywords[x-test]=xxPSxx,xx PostScriptxx X-KDE-Keywords[zh_CN]=PS, PostScript X-KDE-Keywords[zh_TW]=PS, PostScript NoDisplay=true From 41e35d5fd93b4ff8da7c0a05de4805a5ab5e24ef Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 21 Jan 2015 06:56:32 +0000 Subject: [PATCH 5/6] SVN_SILENT made messages (.desktop file) --- generators/comicbook/active-documentviewer_comicbook.desktop | 2 +- generators/comicbook/okularApplication_comicbook.desktop | 2 +- generators/epub/active-documentviewer_epub.desktop | 2 +- generators/epub/okularApplication_epub.desktop | 2 +- generators/fictionbook/active-documentviewer_fb.desktop | 2 +- generators/fictionbook/okularApplication_fb.desktop | 2 +- generators/poppler/active-documentviewer_pdf.desktop | 2 +- generators/poppler/okularApplication_pdf.desktop | 2 +- generators/spectre/active-documentviewer_ghostview.desktop | 2 +- generators/spectre/okularApplication_ghostview.desktop | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/generators/comicbook/active-documentviewer_comicbook.desktop b/generators/comicbook/active-documentviewer_comicbook.desktop index fa13e3ae7..7c380abcb 100644 --- a/generators/comicbook/active-documentviewer_comicbook.desktop +++ b/generators/comicbook/active-documentviewer_comicbook.desktop @@ -196,6 +196,6 @@ 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]=xxcbr, cbz, cbt, Comic Bookxx +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 diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index df500d8d5..639444a60 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -176,6 +176,6 @@ 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]=xxcbr, cbz, cbt, Comic Bookxx +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 diff --git a/generators/epub/active-documentviewer_epub.desktop b/generators/epub/active-documentviewer_epub.desktop index b917fe75c..ed840107e 100644 --- a/generators/epub/active-documentviewer_epub.desktop +++ b/generators/epub/active-documentviewer_epub.desktop @@ -196,6 +196,6 @@ X-KDE-Keywords[sr@latin]=epub, e-book,EPUB,e‑knjiga X-KDE-Keywords[sv]=epub, e-bok X-KDE-Keywords[tr]=epub, e-book X-KDE-Keywords[uk]=epub,e-book,електронна,книга -X-KDE-Keywords[x-test]=xxepub, e-bookxx +X-KDE-Keywords[x-test]=xxepubxx,xx e-bookxx X-KDE-Keywords[zh_CN]=epub, e-book,电子书 X-KDE-Keywords[zh_TW]=epub, e-book diff --git a/generators/epub/okularApplication_epub.desktop b/generators/epub/okularApplication_epub.desktop index a3d560a10..00b071f7e 100755 --- a/generators/epub/okularApplication_epub.desktop +++ b/generators/epub/okularApplication_epub.desktop @@ -176,6 +176,6 @@ X-KDE-Keywords[sr@latin]=epub, e-book,EPUB,e‑knjiga X-KDE-Keywords[sv]=epub, e-bok X-KDE-Keywords[tr]=epub, e-book X-KDE-Keywords[uk]=epub,e-book,електронна,книга -X-KDE-Keywords[x-test]=xxepub, e-bookxx +X-KDE-Keywords[x-test]=xxepubxx,xx e-bookxx X-KDE-Keywords[zh_CN]=epub, e-book,电子书 X-KDE-Keywords[zh_TW]=epub, e-book diff --git a/generators/fictionbook/active-documentviewer_fb.desktop b/generators/fictionbook/active-documentviewer_fb.desktop index f3d146cbf..f3a469ce3 100644 --- a/generators/fictionbook/active-documentviewer_fb.desktop +++ b/generators/fictionbook/active-documentviewer_fb.desktop @@ -196,6 +196,6 @@ X-KDE-Keywords[sr@latin]=FictionBook, e-book, fb2,FictionBook,e‑knjiga X-KDE-Keywords[sv]=FictionBook, e-bok, fb2 X-KDE-Keywords[tr]=FictionBook, e-book, fb2 X-KDE-Keywords[uk]=FictionBook,fb2,електронна,книга -X-KDE-Keywords[x-test]=xxFictionBook, e-book, fb2xx +X-KDE-Keywords[x-test]=xxFictionBookxx,xx e-bookxx,xx fb2xx X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2,电子书,虚拟书籍 X-KDE-Keywords[zh_TW]=FictionBook, e-book, fb2 diff --git a/generators/fictionbook/okularApplication_fb.desktop b/generators/fictionbook/okularApplication_fb.desktop index 34f1033b0..8cbbf92e1 100755 --- a/generators/fictionbook/okularApplication_fb.desktop +++ b/generators/fictionbook/okularApplication_fb.desktop @@ -176,6 +176,6 @@ X-KDE-Keywords[sr@latin]=FictionBook, e-book, fb2,FictionBook,e‑knjiga X-KDE-Keywords[sv]=FictionBook, e-bok, fb2 X-KDE-Keywords[tr]=FictionBook, e-book, fb2 X-KDE-Keywords[uk]=FictionBook,fb2,електронна,книга -X-KDE-Keywords[x-test]=xxFictionBook, e-book, fb2xx +X-KDE-Keywords[x-test]=xxFictionBookxx,xx e-bookxx,xx fb2xx X-KDE-Keywords[zh_CN]=FictionBook, e-book, fb2,电子书,虚拟书籍 X-KDE-Keywords[zh_TW]=FictionBook, e-book, fb2 diff --git a/generators/poppler/active-documentviewer_pdf.desktop b/generators/poppler/active-documentviewer_pdf.desktop index 6b835d780..c0ba419ea 100644 --- a/generators/poppler/active-documentviewer_pdf.desktop +++ b/generators/poppler/active-documentviewer_pdf.desktop @@ -196,6 +196,6 @@ X-KDE-Keywords[sr@latin]=PDF, Portable Document Format,PDF X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф -X-KDE-Keywords[x-test]=xxPDF, Portable Document Formatxx +X-KDE-Keywords[x-test]=xxPDFxx,xx Portable Document Formatxx X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式 X-KDE-Keywords[zh_TW]=PDF, Portable Document Format diff --git a/generators/poppler/okularApplication_pdf.desktop b/generators/poppler/okularApplication_pdf.desktop index 06f0b67c6..c5d82914b 100755 --- a/generators/poppler/okularApplication_pdf.desktop +++ b/generators/poppler/okularApplication_pdf.desktop @@ -175,7 +175,7 @@ X-KDE-Keywords[sr@latin]=PDF, Portable Document Format,PDF X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф -X-KDE-Keywords[x-test]=xxPDF, Portable Document Formatxx +X-KDE-Keywords[x-test]=xxPDFxx,xx Portable Document Formatxx X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式 X-KDE-Keywords[zh_TW]=PDF, Portable Document Format NoDisplay=true diff --git a/generators/spectre/active-documentviewer_ghostview.desktop b/generators/spectre/active-documentviewer_ghostview.desktop index 2617338a6..6baf5be10 100644 --- a/generators/spectre/active-documentviewer_ghostview.desktop +++ b/generators/spectre/active-documentviewer_ghostview.desktop @@ -191,6 +191,6 @@ X-KDE-Keywords[sr@latin]=PS,PostScript,PostScript,PS X-KDE-Keywords[sv]=PS, Postscript X-KDE-Keywords[tr]=PS, PostScript X-KDE-Keywords[uk]=PS, PostScript -X-KDE-Keywords[x-test]=xxPS, PostScriptxx +X-KDE-Keywords[x-test]=xxPSxx,xx PostScriptxx X-KDE-Keywords[zh_CN]=PS, PostScript X-KDE-Keywords[zh_TW]=PS, PostScript diff --git a/generators/spectre/okularApplication_ghostview.desktop b/generators/spectre/okularApplication_ghostview.desktop index 4143273b7..4acb11701 100755 --- a/generators/spectre/okularApplication_ghostview.desktop +++ b/generators/spectre/okularApplication_ghostview.desktop @@ -170,7 +170,7 @@ X-KDE-Keywords[sr@latin]=PS,PostScript,PostScript,PS X-KDE-Keywords[sv]=PS, Postscript X-KDE-Keywords[tr]=PS, PostScript X-KDE-Keywords[uk]=PS, PostScript -X-KDE-Keywords[x-test]=xxPS, PostScriptxx +X-KDE-Keywords[x-test]=xxPSxx,xx PostScriptxx X-KDE-Keywords[zh_CN]=PS, PostScript X-KDE-Keywords[zh_TW]=PS, PostScript NoDisplay=true From 4ad7da97da882f7170395669471a9c38c54d3adf Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 29 Jan 2015 19:52:31 +0100 Subject: [PATCH 6/6] Prepare for 0.21.2 SVN_SILENT --- VERSION | 2 +- core/version.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 7178b0ba1..a26469e8a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -okular v0.21.1 +okular v0.21.2 diff --git a/core/version.h b/core/version.h index 04ff21a83..253b1cd0b 100644 --- a/core/version.h +++ b/core/version.h @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.21.1" +#define OKULAR_VERSION_STRING "0.21.2" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 21 -#define OKULAR_VERSION_RELEASE 1 +#define OKULAR_VERSION_RELEASE 2 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \