From 7fa81fa9f49de28307f3943ecafb6a640caa0391 Mon Sep 17 00:00:00 2001
From: Shilyaev Egor <egor.shilyaev@gmail.com>
Date: Mon, 16 Apr 2018 21:45:22 +0500
Subject: [PATCH] version: Updated to 0.18.10 (16.04.2018)

---
 CHANGELOG             | 10 ++++++++++
 HISTORY_EN            | 14 ++++++++++++++
 HISTORY_RU            | 14 ++++++++++++++
 Info.plist            |  2 +-
 src/VersionNo.h       |  6 +++---
 src/optionsdialog.cpp | 22 +++++++++++-----------
 6 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index acd0cd142..3a253f45c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+Version 0.18.10 (16 Apr 2018)
+  * Added: Shortcut "Search Feed"
+  * Added: Page Up/Down in feeds tree
+  * Changed: SQLite 3.23.0
+  * Changed: Closing notification window when clicking on news header
+  * Fixed: Splash screen always displayed (Linux)
+  * Fixed: Parsing of some feeds (Accept-Language)
+  * Fixed: Displaying dialogs in mode "Stay On Top"
+  * Fixed: Go to next/previous unread news
+
 Version 0.18.9 (01 Dec 2017)
   * Changed: SQLite 3.21.0
   * Changed: Displaying news is no more than width of window
diff --git a/HISTORY_EN b/HISTORY_EN
index 4b99e74b0..ec131d4a9 100644
--- a/HISTORY_EN
+++ b/HISTORY_EN
@@ -2,6 +2,20 @@
 <STYLE>a { color: blue; text-decoration: none; }</STYLE>
 <BODY>
 <!---------------------------------------------------------------------------->
+<p><b>Version 0.18.10</b> (16 Apr 2018)
+<ul>
+<li>Added: Shortcut "Search Feed"</li>
+<li>Added: Page Up/Down in feeds tree</li>
+
+<li>Changed: SQLite 3.23.0</li>
+<li>Changed: Closing notification window when clicking on news header</li>
+
+<li>Fixed: Splash screen always displayed (Linux)</li>
+<li>Fixed: Parsing of some feeds (Accept-Language)</li>
+<li>Fixed: Displaying dialogs in mode "Stay On Top"</li>
+<li>Fixed: Go to next/previous unread news</li>
+</ul>
+<!---------------------------------------------------------------------------->
 <p><b>Version 0.18.9</b> (01 Dec 2017)
 <ul>
 <li>Changed: SQLite 3.21.0</li>
diff --git a/HISTORY_RU b/HISTORY_RU
index 531a58740..58036ffec 100644
--- a/HISTORY_RU
+++ b/HISTORY_RU
@@ -2,6 +2,20 @@
 <STYLE>a { color: blue; text-decoration: none; }</STYLE>
 <BODY>
 <!---------------------------------------------------------------------------->
+<p><b>Версия 0.18.10</b> (16 Апр 2018)
+<ul>
+<li>Добавлено: Горячая клавиша "Поиск ленты"</li>
+<li>Добавлено: Страничное перемещение в дереве лент (Page Up/Down)</li>
+
+<li>Изменено: Библиотека SQLite 3.23.0</li>
+<li>Изменено: Закрытие окна уведомления при клике по заголовку новости</li>
+
+<li>Исправлено: Всегда отображалась заставка (Linux)</li>
+<li>Исправлено: Некоторые ленты не обрабатывались (Accept-Language)</li>
+<li>Исправлено: Отображение диалогов в режиме "Поверх всех окон"</li>
+<li>Исправлено: Переход на следующую/предыдущую не прочитанную новость</li>
+</ul>
+<!---------------------------------------------------------------------------->
 <p><b>Версия 0.18.9</b> (01 Дек 2017)
 <ul>
 <li>Изменено: Библиотека SQLite 3.21.0</li>
diff --git a/Info.plist b/Info.plist
index e6389dbf9..34323e155 100644
--- a/Info.plist
+++ b/Info.plist
@@ -21,7 +21,7 @@
     <key>CFBundleDisplayName</key>
     <string>@EXECUTABLE@</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.18.9</string>
+    <string>0.18.10</string>
     <key>NSHumanReadableCopyright</key>
     <string>(C) 2011-2018 QuiteRSS Team</string>
     <key>NSPrincipalClass</key>
diff --git a/src/VersionNo.h b/src/VersionNo.h
index 56456cbf0..8c979fe40 100644
--- a/src/VersionNo.h
+++ b/src/VersionNo.h
@@ -1,9 +1,9 @@
 #include "VersionRev.h"
 
-#define STRDATE           "01.12.2017\0"
-#define STRPRODUCTVER     "0.18.9\0"
+#define STRDATE           "16.04.2018\0"
+#define STRPRODUCTVER     "0.18.10\0"
 
-#define VERSION           0,18,9
+#define VERSION           0,18,10
 #define PRODUCTVER        VERSION,0
 #define FILEVER           VERSION,VCS_REVISION
 
diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp
index e4bda706a..95a34b277 100644
--- a/src/optionsdialog.cpp
+++ b/src/optionsdialog.cpp
@@ -1390,7 +1390,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "fa" << QString::fromUtf8("فارسی [FA]")
-           << "0.18.9"
+           << "0.18.10"
            << "H.Mohamadi" << "";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_FA"));
@@ -1398,7 +1398,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "fi" << QString::fromUtf8("Suomi [FI]")
-           << "0.14.3"
+           << "0.18.10"
            << "J. S. Tuomisto" << "jstuomisto@gmail.com";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_FI"));
@@ -1406,7 +1406,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "fr" << QString::fromUtf8("Français [FR]")
-           << "0.18.9"
+           << "0.18.10"
            << "Glad Deschrijver" << "glad.deschrijver@gmail.com";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_FR"));
@@ -1438,7 +1438,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "it" << QString::fromUtf8("Italiano [IT]")
-           << "0.18.9"
+           << "0.18.10"
            << "ZeroWis" << "lightflash@hotmail.it";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_IT"));
@@ -1446,7 +1446,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "ja" << QString::fromUtf8("日本語 [JA]")
-           << "0.16.0"
+           << "0.18.10"
            << "Masato Hashimoto" << "cabezon.hashimoto@gmail.com";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_JA"));
@@ -1470,7 +1470,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "nl" << QString::fromUtf8("Nederlands [NL]")
-           << "0.18.9"
+           << "0.18.10"
            << "TeLLie" << "elbert.pol@gmail.com";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_NL"));
@@ -1478,7 +1478,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "pl" << QString::fromUtf8("Polski [PL]")
-           << "0.18.9"
+           << "0.18.10"
            << QString::fromUtf8("Piotr Pecka") << "piotr.pecka@outlook.com";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_PL"));
@@ -1486,7 +1486,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "pt_BR" << QString::fromUtf8("Português (Brazil) [pt_BR]")
-           << "0.18.9"
+           << "0.18.10"
            << QString::fromUtf8("Marcos M. Ribeiro") << "";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_BR"));
@@ -1502,7 +1502,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "ro_RO" << QString::fromUtf8("Limba română [ro_RO]")
-           << "0.18.9"
+           << "0.18.10"
            << QString::fromUtf8("Jaff (Oprea Nicolae)") << "Jaff2002@yahoo.com";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_RO"));
@@ -1518,7 +1518,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "sk" << QString::fromUtf8("Slovenčina [SK]")
-           << "0.18.9"
+           << "0.18.10"
            << QString::fromUtf8("DAG Software (Ďanovský Ján)") << "dagsoftware@yahoo.com";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_SK"));
@@ -1574,7 +1574,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "zh_CN" << QString::fromUtf8("中文 (China) [zh_CN]")
-           << "0.18.6"
+           << "0.18.10"
            << QString::fromUtf8("wwj402") << "";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_CN"));
