From 57c3322088c1cf47cef82b90c83bec558224e5db Mon Sep 17 00:00:00 2001
From: Andrii Zhuk <Andrii_Zhuk@epam.com>
Date: Wed, 30 Jan 2019 16:14:07 +0200
Subject: [PATCH 1/5] Changed language name for Ukrainian

---
 include/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/functions.php b/include/functions.php
index 0661becd7..d35debd8a 100755
--- a/include/functions.php
+++ b/include/functions.php
@@ -105,7 +105,7 @@
 					"pt_PT" => "Portuguese/Portugal",
 					"zh_CN" => "Simplified Chinese",
 					"zh_TW" => "Traditional Chinese",
-					"uk_UA" => "Украинский",
+					"uk_UA" => "Українська",
 					"sv_SE" => "Svenska",
 					"fi_FI" => "Suomi",
 					"tr_TR" => "Türkçe");

From f1f2b81a902ce654096143bd4f54e0b5685a7dda Mon Sep 17 00:00:00 2001
From: Andrii Zhuk <Andrii_Zhuk@epam.com>
Date: Wed, 30 Jan 2019 16:57:28 +0200
Subject: [PATCH 2/5] Add i18n for auto mode:wq

---
 include/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/functions.php b/include/functions.php
index d35debd8a..af52b480c 100755
--- a/include/functions.php
+++ b/include/functions.php
@@ -81,7 +81,7 @@
 	 */
 	function get_translations() {
 		$tr = array(
-					"auto"  => "Detect automatically",
+					"auto"  => __("Detect automatically"),
 					"ar_SA" => "العربيّة (Arabic)",
 					"bg_BG" => "Bulgarian",
 					"da_DA" => "Dansk",

From a4aadd4d776ff5595e2eb27d8d15d60f8d1656f5 Mon Sep 17 00:00:00 2001
From: Andrii Zhuk <Andrii_Zhuk@epam.com>
Date: Wed, 30 Jan 2019 17:03:31 +0200
Subject: [PATCH 3/5] Added Ukrainian to the list of languches (using in FTS)

---
 classes/pref/feeds.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 71379a12b..8a0a363f6 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1,7 +1,7 @@
 <?php
 class Pref_Feeds extends Handler_Protected {
 	public static $feed_languages = array("English", "Danish", "Dutch", "Finnish", "French", "German", "Hungarian", "Italian", "Norwegian",
-		"Portuguese", "Russian", "Spanish", "Swedish", "Turkish", "Simple");
+		"Portuguese", "Russian", "Spanish", "Swedish", "Turkish", "Ukrainian", "Simple");
 
 	function csrf_ignore($method) {
 		$csrf_ignored = array("index", "getfeedtree", "add", "editcats", "editfeed",

From 98d98cade0b4629f65208a27f477c379e3d6c47a Mon Sep 17 00:00:00 2001
From: AZ <zhouck@gmail.com>
Date: Thu, 31 Jan 2019 00:10:11 +0200
Subject: [PATCH 4/5] 'Revert'

---
 classes/pref/feeds.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 8a0a363f6..71379a12b 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1,7 +1,7 @@
 <?php
 class Pref_Feeds extends Handler_Protected {
 	public static $feed_languages = array("English", "Danish", "Dutch", "Finnish", "French", "German", "Hungarian", "Italian", "Norwegian",
-		"Portuguese", "Russian", "Spanish", "Swedish", "Turkish", "Ukrainian", "Simple");
+		"Portuguese", "Russian", "Spanish", "Swedish", "Turkish", "Simple");
 
 	function csrf_ignore($method) {
 		$csrf_ignored = array("index", "getfeedtree", "add", "editcats", "editfeed",

From dbab03bd4cdd50d7cba48683a574363f921e36c1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 31 Jan 2019 12:16:56 +0300
Subject: [PATCH 5/5] Feeds.catchupAllFeeds() should be Feeds.catchupAll()

---
 js/FeedTree.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/FeedTree.js b/js/FeedTree.js
index f89486332..b8e50872a 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -110,7 +110,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
 				menu.addChild(new dijit.MenuItem({
 					label: __("Mark all feeds as read"),
 					onClick: function() {
-						Feeds.catchupAllFeeds();
+						Feeds.catchupAll();
 					}}));
 
 				menu.bindDomNode(tnode.domNode);