From b4adf1f40caf18fb884e44665c38f724e12fa5ac Mon Sep 17 00:00:00 2001
From: Shilyaev Egor <egor.shilyaev@gmail.com>
Date: Mon, 2 Jul 2018 00:02:45 +0500
Subject: [PATCH] version: Updated to 0.18.12 (02.07.2018)

---
 CHANGELOG             |  7 +++++++
 HISTORY_EN            | 11 +++++++++++
 HISTORY_RU            | 11 +++++++++++
 Info.plist            |  2 +-
 src/VersionNo.h       |  6 +++---
 src/optionsdialog.cpp | 10 +++++-----
 6 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index d90d597fc..77af89b07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+Version 0.18.12 (02 Jul 2018)
+  * Added: Share. Hacker News
+  * Changed: Support for Qt 5.11 (Linux)
+  * Changed: High DPI support
+  * Changed: SQLite 3.24.0
+  * Fixed: Downloading feeds' icons for some feeds
+
 Version 0.18.11 (31 May 2018)
   * Added: Notifications. Option "Close notification after opening news"
   * Added: Support for Youtube feeds
diff --git a/HISTORY_EN b/HISTORY_EN
index c95bb2374..51e08b32b 100644
--- a/HISTORY_EN
+++ b/HISTORY_EN
@@ -2,6 +2,17 @@
 <STYLE>a { color: blue; text-decoration: none; }</STYLE>
 <BODY>
 <!---------------------------------------------------------------------------->
+<p><b>Version 0.18.12</b> (02 Jul 2018)
+<ul>
+<li>Added: Share. Hacker News</li>
+
+<li>Changed: Support for Qt 5.11 (Linux)</li>
+<li>Changed: High DPI support</li>
+<li>Changed: SQLite 3.24.0</li>
+
+<li>Fixed: Downloading feeds' icons for some feeds</li>
+</ul>
+<!---------------------------------------------------------------------------->
 <p><b>Version 0.18.11</b> (31 May 2018)
 <ul>
 <li>Added: Notifications. Option "Close notification after opening news"</li>
diff --git a/HISTORY_RU b/HISTORY_RU
index 90b5c7c66..e216fb9f5 100644
--- a/HISTORY_RU
+++ b/HISTORY_RU
@@ -2,6 +2,17 @@
 <STYLE>a { color: blue; text-decoration: none; }</STYLE>
 <BODY>
 <!---------------------------------------------------------------------------->
+<p><b>Версия 0.18.12</b> (02 Июл 2018)
+<ul>
+<li>Добавлено: Поделиться. Hacker News</li>
+
+<li>Изменено: Поддержка Qt 5.11 (Linux)</li>
+<li>Изменено: Поддержка High DPI</li>
+<li>Изменено: Библиотека SQLite 3.24.0</li>
+
+<li>Исправлено: Загрузка иконки ленты для некоторых лент</li>
+</ul>
+<!---------------------------------------------------------------------------->
 <p><b>Версия 0.18.11</b> (31 Май 2018)
 <ul>
 <li>Добавлено: Уведомления. Опция "Закрыть уведомление после открытия новости"</li>
diff --git a/Info.plist b/Info.plist
index 326e44896..0eb843979 100644
--- a/Info.plist
+++ b/Info.plist
@@ -21,7 +21,7 @@
     <key>CFBundleDisplayName</key>
     <string>@EXECUTABLE@</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.18.11</string>
+    <string>0.18.12</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 276bdc521..6396cb190 100644
--- a/src/VersionNo.h
+++ b/src/VersionNo.h
@@ -1,9 +1,9 @@
 #include "VersionRev.h"
 
-#define STRDATE           "31.05.2018\0"
-#define STRPRODUCTVER     "0.18.11\0"
+#define STRDATE           "02.07.2018\0"
+#define STRPRODUCTVER     "0.18.12\0"
 
-#define VERSION           0,18,11
+#define VERSION           0,18,12
 #define PRODUCTVER        VERSION,0
 #define FILEVER           VERSION,VCS_REVISION
 
diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp
index 73136decb..13b18ab00 100644
--- a/src/optionsdialog.cpp
+++ b/src/optionsdialog.cpp
@@ -1409,7 +1409,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "fr" << QString::fromUtf8("Français [FR]")
-           << "0.18.10"
+           << "0.18.12"
            << "Glad Deschrijver" << "glad.deschrijver@gmail.com";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_FR"));
@@ -1441,7 +1441,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "it" << QString::fromUtf8("Italiano [IT]")
-           << "0.18.10"
+           << "0.18.12"
            << "ZeroWis" << "lightflash@hotmail.it";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_IT"));
@@ -1473,7 +1473,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "nl" << QString::fromUtf8("Nederlands [NL]")
-           << "0.18.10"
+           << "0.18.12"
            << "TeLLie" << "elbert.pol@gmail.com";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_NL"));
@@ -1521,7 +1521,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "sk" << QString::fromUtf8("Slovenčina [SK]")
-           << "0.18.10"
+           << "0.18.12"
            << QString::fromUtf8("DAG Software (Ďanovský Ján)") << "dagsoftware@yahoo.com";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_SK"));
@@ -1553,7 +1553,7 @@ void OptionsDialog::createLanguageWidget()
 
   treeItem.clear();
   treeItem << "tr" << QString::fromUtf8("Türkçe [TR]")
-           << "0.13.3"
+           << "0.18.12"
            << QString::fromUtf8("Mert Başaranoğlu") << "mertbasaranoglu@gmail.com";
   languageItem = new QTreeWidgetItem(treeItem);
   languageItem->setIcon(1, QIcon(":/flags/flag_TR"));
