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

This commit is contained in:
Andrew Dolgov 2019-02-01 08:43:25 +03:00
commit 64bd45b51c
2 changed files with 3 additions and 3 deletions

View File

@ -81,7 +81,7 @@
*/ */
function get_translations() { function get_translations() {
$tr = array( $tr = array(
"auto" => "Detect automatically", "auto" => __("Detect automatically"),
"ar_SA" => "العربيّة (Arabic)", "ar_SA" => "العربيّة (Arabic)",
"bg_BG" => "Bulgarian", "bg_BG" => "Bulgarian",
"da_DA" => "Dansk", "da_DA" => "Dansk",
@ -105,7 +105,7 @@
"pt_PT" => "Portuguese/Portugal", "pt_PT" => "Portuguese/Portugal",
"zh_CN" => "Simplified Chinese", "zh_CN" => "Simplified Chinese",
"zh_TW" => "Traditional Chinese", "zh_TW" => "Traditional Chinese",
"uk_UA" => "Украинский", "uk_UA" => "Українська",
"sv_SE" => "Svenska", "sv_SE" => "Svenska",
"fi_FI" => "Suomi", "fi_FI" => "Suomi",
"tr_TR" => "Türkçe"); "tr_TR" => "Türkçe");

View File

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