diff options
| author | Andrew Dolgov <[email protected]> | 2019-02-01 08:43:25 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2019-02-01 08:43:25 +0300 |
| commit | 64bd45b51c0de8317cec5ad4f6c0473b2665edc6 (patch) | |
| tree | 3ff6e1f51937670f2bd71f6095dacdb4effaaf9b | |
| parent | 413a73da390436f7ea6820e59a8a2c228b3137b1 (diff) | |
| parent | dbab03bd4cdd50d7cba48683a574363f921e36c1 (diff) | |
Merge branch 'master' of git.fakecake.org:tt-rss
| -rwxr-xr-x | include/functions.php | 4 | ||||
| -rwxr-xr-x | js/FeedTree.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/functions.php b/include/functions.php index 0661becd7..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", @@ -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"); 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); |