From 645e82725fd95241d48c8909bb0b764927f947e5 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 7 Jul 2020 08:42:13 +0200 Subject: [PATCH 1/4] ZH CN translation update ot the blackout addon THX steve jobs --- blackout/lang/zh-cn/messages.po | 66 +++++++++++++++++++++++++++++++++ blackout/lang/zh-cn/strings.php | 20 ++++++++-- 2 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 blackout/lang/zh-cn/messages.po diff --git a/blackout/lang/zh-cn/messages.po b/blackout/lang/zh-cn/messages.po new file mode 100644 index 00000000..f91d56f5 --- /dev/null +++ b/blackout/lang/zh-cn/messages.po @@ -0,0 +1,66 @@ +# ADDON blackout +# Copyright (C) +# This file is distributed under the same license as the Friendica blackout addon package. +# +# +# Translators: +# steve jobs , 2020 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-03-12 09:26+0100\n" +"PO-Revision-Date: 2020-07-06 19:48+0000\n" +"Last-Translator: steve jobs \n" +"Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: blackout.php:101 +msgid "" +"The end-date is prior to the start-date of the blackout, you should fix this" +msgstr "结束日期早于开始日期，您应该修复此问题" + +#: blackout.php:103 +#, php-format +msgid "" +"Please double check that the current settings for the blackout. Begin will " +"be %s and it will end %s." +msgstr "请仔细检查一下当前的维护设置。将从%s开始结束于%s。" + +#: blackout.php:106 +msgid "Save Settings" +msgstr "保存设置" + +#: blackout.php:107 +msgid "Redirect URL" +msgstr "重定向URL" + +#: blackout.php:107 +msgid "all your visitors from the web will be redirected to this URL" +msgstr "所有来自web的访问者都将重定向到此URL" + +#: blackout.php:108 +msgid "Begin of the Blackout" +msgstr "开始维护" + +#: blackout.php:108 +msgid "" +"Format is YYYY-MM-DD hh:mm; YYYY year, MM month, " +"DD day, hh hour and mm minute." +msgstr "格式为YYYY-MM-DD HH：MM；YYYY年、MM月、DD日、HH小时和MM分钟" + +#: blackout.php:109 +msgid "End of the Blackout" +msgstr "结束维护" + +#: blackout.php:111 +msgid "" +"Note: The redirect will be active from the moment you press" +" the submit button. Users currently logged in will not be " +"thrown out but can't login again after logging out should the blackout is " +"still in place." +msgstr "注意：从您按下提交按钮的那一刻起，重定向将处于活动状态。当前登录的用户不会被驱逐，但如果仍处于维护状态，则在注销后不能再次登录。" diff --git a/blackout/lang/zh-cn/strings.php b/blackout/lang/zh-cn/strings.php index d6d8e7d2..8027bc0b 100644 --- a/blackout/lang/zh-cn/strings.php +++ b/blackout/lang/zh-cn/strings.php @@ -1,3 +1,17 @@ -strings["Submit"] = "提交"; +strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "结束日期早于开始日期，您应该修复此问题"; +$a->strings["Please double check that the current settings for the blackout. Begin will be %s and it will end %s."] = "请仔细检查一下当前的维护设置。将从%s开始结束于%s。"; +$a->strings["Save Settings"] = "保存设置"; +$a->strings["Redirect URL"] = "重定向URL"; +$a->strings["all your visitors from the web will be redirected to this URL"] = "所有来自web的访问者都将重定向到此URL"; +$a->strings["Begin of the Blackout"] = "开始维护"; +$a->strings["Format is YYYY-MM-DD hh:mm; YYYY year, MM month, DD day, hh hour and mm minute."] = "格式为YYYY-MM-DD HH：MM；YYYY年、MM月、DD日、HH小时和MM分钟"; +$a->strings["End of the Blackout"] = "结束维护"; +$a->strings["Note: The redirect will be active from the moment you press the submit button. Users currently logged in will not be thrown out but can't login again after logging out should the blackout is still in place."] = "注意：从您按下提交按钮的那一刻起，重定向将处于活动状态。当前登录的用户不会被驱逐，但如果仍处于维护状态，则在注销后不能再次登录。"; -- 2.43.5 From 75b6a0d315e203400f305a05acfe846b31d1a1de Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 7 Jul 2020 18:51:42 +0000 Subject: [PATCH 2/4] Blockbot: Updated bots - again --- blockbot/blockbot.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php index 785c5f25..778358b5 100644 --- a/blockbot/blockbot.php +++ b/blockbot/blockbot.php @@ -75,7 +75,8 @@ function blockbot_init_1(App $a) { 'Cliqzbot/', 'YaK/', 'Mediatoolkitbot', 'Snacktory', 'FunWebProducts', 'oBot/', '7Siters/', 'KOCMOHABT', 'Google-SearchByImage', 'FemtosearchBot/', 'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio', 'AwarioSmartBot/', - 'SummalyBot/', 'DNSResearchBot/', 'PetalBot;']; + 'SummalyBot/', 'DNSResearchBot/', 'PetalBot;', 'Nmap Scripting Engine;', + 'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;']; if (!DI::config()->get('blockbot', 'good_crawlers')) { $agents = array_merge($agents, $good_agents); @@ -115,7 +116,7 @@ function blockbot_init_1(App $a) { 'Faraday v', 'okhttp', 'UniversalFeedParser', 'PixelFedBot', 'python-requests', 'WordPress/', 'http.rb/', 'Apache-HttpClient/', 'WordPress.com;', 'Pleroma', 'Dispatch/', 'Ruby', 'Java/', 'libwww-perl/', 'Mastodon/', - 'lua-resty-http/', 'Tiny Tiny RSS/']; + 'lua-resty-http/', 'Tiny Tiny RSS/', 'Wget/', 'PostmanRuntime/']; if (DI::config()->get('blockbot', 'good_crawlers')) { $agents = array_merge($agents, $good_agents); -- 2.43.5 From 49b4a2ee7b4ed49eca8abd38c3e58716492d1a86 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 8 Jul 2020 19:24:00 +0000 Subject: [PATCH 3/4] Some more bot agents added --- blockbot/blockbot.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php index 778358b5..9e6ce82c 100644 --- a/blockbot/blockbot.php +++ b/blockbot/blockbot.php @@ -76,7 +76,7 @@ function blockbot_init_1(App $a) { '7Siters/', 'KOCMOHABT', 'Google-SearchByImage', 'FemtosearchBot/', 'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio', 'AwarioSmartBot/', 'SummalyBot/', 'DNSResearchBot/', 'PetalBot;', 'Nmap Scripting Engine;', - 'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;']; + 'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;', 'AHC/']; if (!DI::config()->get('blockbot', 'good_crawlers')) { $agents = array_merge($agents, $good_agents); @@ -116,7 +116,8 @@ function blockbot_init_1(App $a) { 'Faraday v', 'okhttp', 'UniversalFeedParser', 'PixelFedBot', 'python-requests', 'WordPress/', 'http.rb/', 'Apache-HttpClient/', 'WordPress.com;', 'Pleroma', 'Dispatch/', 'Ruby', 'Java/', 'libwww-perl/', 'Mastodon/', - 'lua-resty-http/', 'Tiny Tiny RSS/', 'Wget/', 'PostmanRuntime/']; + 'lua-resty-http/', 'Tiny Tiny RSS/', 'Wget/', 'PostmanRuntime/', + 'W3C_Validator/', 'NetNewsWire']; if (DI::config()->get('blockbot', 'good_crawlers')) { $agents = array_merge($agents, $good_agents); -- 2.43.5 From 0a794d416befcf10b95ae5a6efaa4d329b073150 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 9 Jul 2020 15:08:41 +0000 Subject: [PATCH 4/4] Another bot added --- blockbot/blockbot.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php index 9e6ce82c..c79f7d32 100644 --- a/blockbot/blockbot.php +++ b/blockbot/blockbot.php @@ -76,7 +76,8 @@ function blockbot_init_1(App $a) { '7Siters/', 'KOCMOHABT', 'Google-SearchByImage', 'FemtosearchBot/', 'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio', 'AwarioSmartBot/', 'SummalyBot/', 'DNSResearchBot/', 'PetalBot;', 'Nmap Scripting Engine;', - 'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;', 'AHC/']; + 'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;', 'AHC/', + 'SkypeUriPreview Preview/']; if (!DI::config()->get('blockbot', 'good_crawlers')) { $agents = array_merge($agents, $good_agents); -- 2.43.5