From b92ad3e1b214ee24af85445be2eab7564dd7ebb3 Mon Sep 17 00:00:00 2001
From: Shilyaev Egor <egor.shilyaev@gmail.com>
Date: Tue, 20 Jun 2017 20:01:00 +0500
Subject: [PATCH] version: Updated to 0.18.6 (20.06.2017)

---
 CHANGELOG             |  5 +++++
 HISTORY_EN            |  2 +-
 HISTORY_RU            |  2 +-
 Info.plist            |  2 +-
 src/VersionNo.h       |  6 +++---
 src/optionsdialog.cpp | 20 ++++++++++----------
 6 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 4d17a3863..ea6418d6b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 0.18.6 (20 Jun 2017)
+  * Changed: SQLite 3.19.3
+  * Fixed: Displaying dialogs in mode "Stay on top"
+  * Fixed: Mark displayed news as read when switching feeds
+
 Version 0.18.5 (15 Jun 2017)
   * Changed: SQLite 3.19.1
   * Changed: OpenSSL 1.1.0f (Windows)
diff --git a/HISTORY_EN b/HISTORY_EN
index 37209ce40..7fcf6c17b 100644
--- a/HISTORY_EN
+++ b/HISTORY_EN
@@ -2,7 +2,7 @@
 <STYLE>a { color: blue; text-decoration: none; }</STYLE>
 <BODY>
 <!---------------------------------------------------------------------------->
-<p><b>Version 0.18.5+</b> (xx Jun 2017)
+<p><b>Version 0.18.6</b> (20 Jun 2017)
 <ul>
 <li>Changed: SQLite 3.19.3</li>
 
diff --git a/HISTORY_RU b/HISTORY_RU
index 013d919be..b38e7d81c 100644
--- a/HISTORY_RU
+++ b/HISTORY_RU
@@ -2,7 +2,7 @@
 <STYLE>a { color: blue; text-decoration: none; }</STYLE>
 <BODY>
 <!---------------------------------------------------------------------------->
-<p><b>Версия 0.18.5+</b> (xx Июн 2017)
+<p><b>Версия 0.18.6</b> (20 Июн 2017)
 <ul>
 <li>Изменено: Библиотека SQLite 3.19.3</li>
 
diff --git a/Info.plist b/Info.plist
index 192e71c14..3c210a6c0 100644
--- a/Info.plist
+++ b/Info.plist
@@ -21,7 +21,7 @@
     <key>CFBundleDisplayName</key>
     <string>@EXECUTABLE@</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.18.5</string>
+    <string>0.18.6</string>
     <key>NSHumanReadableCopyright</key>
     <string>(C) 2011-2017 QuiteRSS Team</string>
     <key>NSPrincipalClass</key>
diff --git a/src/VersionNo.h b/src/VersionNo.h
index b2f8a8b8a..908dea772 100644
--- a/src/VersionNo.h
+++ b/src/VersionNo.h
@@ -1,9 +1,9 @@
 #include "VersionRev.h"
 
-#define STRDATE           "15.06.2017\0"
-#define STRPRODUCTVER     "0.18.5\0"
+#define STRDATE           "20.06.2017\0"
+#define STRPRODUCTVER     "0.18.6\0"
 
-#define VERSION           0,18,5
+#define VERSION           0,18,6
 #define PRODUCTVER        VERSION,0
 #define FILEVER           VERSION,VCS_REVISION
 
diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp
index ba7443d86..90333e9c1 100644
--- a/src/optionsdialog.cpp
+++ b/src/optionsdialog.cpp
@@ -1350,7 +1350,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "bg" << QString::fromUtf8("Български [BG]")
-           << "0.18.5"
+           << "0.18.6"
            << QString::fromUtf8("Nikolai Tsvetkov") << "koko@cybcom.net";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_BG"));
@@ -1358,7 +1358,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "cs" << QString::fromUtf8("Čeština [CS]")
-           << "0.18.5"
+           << "0.18.6"
            << QString::fromUtf8("Matej Szendi") << "matej.szendi@gmail.com";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_CZ"));
@@ -1390,7 +1390,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "fa" << QString::fromUtf8("فارسی [FA]")
-           << "0.18.5"
+           << "0.18.6"
            << "H.Mohamadi" << "";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_FA"));
@@ -1406,7 +1406,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "fr" << QString::fromUtf8("Français [FR]")
-           << "0.18.5"
+           << "0.18.6"
            << "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.5"
+           << "0.18.6"
            << "ZeroWis" << "lightflash@hotmail.it";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_IT"));
@@ -1470,7 +1470,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "nl" << QString::fromUtf8("Nederlands [NL]")
-           << "0.18.5"
+           << "0.18.6"
            << "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.5"
+           << "0.18.6"
            << 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.5"
+           << "0.18.6"
            << 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.5"
+           << "0.18.6"
            << 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.5"
+           << "0.18.6"
            << QString::fromUtf8("DAG Software (Ďanovský Ján)") << "dagsoftware@yahoo.com";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_SK"));
