Browse Source

Merge branch 'master' of git.fakecake.org:tt-rss

Andrew Dolgov 1 year ago
parent
commit
64bd45b51c
2 changed files with 3 additions and 3 deletions
  1. 2 2
      include/functions.php
  2. 1 1
      js/FeedTree.js

+ 2 - 2
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",
@@ -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");

+ 1 - 1
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);