diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php index 8c6560c0..785c5f25 100644 --- a/blockbot/blockbot.php +++ b/blockbot/blockbot.php @@ -74,7 +74,8 @@ function blockbot_init_1(App $a) { 'Scrapy/', 'github-camo', 'MJ12bot/', 'DotBot/', 'Pinterestbot/', 'Jooblebot/', 'Cliqzbot/', 'YaK/', 'Mediatoolkitbot', 'Snacktory', 'FunWebProducts', 'oBot/', '7Siters/', 'KOCMOHABT', 'Google-SearchByImage', 'FemtosearchBot/', - 'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio']; + 'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio', 'AwarioSmartBot/', + 'SummalyBot/', 'DNSResearchBot/', 'PetalBot;']; if (!DI::config()->get('blockbot', 'good_crawlers')) { $agents = array_merge($agents, $good_agents); @@ -114,7 +115,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/']; + 'lua-resty-http/', 'Tiny Tiny RSS/']; if (DI::config()->get('blockbot', 'good_crawlers')) { $agents = array_merge($agents, $good_agents); diff --git a/diaspora/lang/en-gb/messages.po b/diaspora/lang/en-gb/messages.po index 798e3b2d..ce3dd2f9 100644 --- a/diaspora/lang/en-gb/messages.po +++ b/diaspora/lang/en-gb/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# Andy H3 , 2018,2020 +# Andy H3 , 2018 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-07 00:15-0400\n" -"PO-Revision-Date: 2020-06-23 16:10+0000\n" +"POT-Creation-Date: 2014-06-22 13:18+0200\n" +"PO-Revision-Date: 2018-03-22 08:36+0000\n" "Last-Translator: Andy H3 \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -19,96 +19,44 @@ msgstr "" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: diaspora.php:53 +#: diaspora.php:37 msgid "Post to Diaspora" msgstr "Post to Diaspora" -#: diaspora.php:78 -#, php-format +#: diaspora.php:142 msgid "" -"Please remember: You can always be reached from Diaspora with your Friendica" -" handle %s. " -msgstr "Please remember: You can always be reached from Diaspora with your Friendica handle %s. " +"Can't login to your Diaspora account. Please check username and password and" +" ensure you used the complete address (including http...)" +msgstr "Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)" -#: diaspora.php:79 -msgid "" -"This connector is only meant if you still want to use your old Diaspora " -"account for some time. " -msgstr "This connector is only meant if you still want to use your old Diaspora account for some time. " - -#: diaspora.php:80 -#, php-format -msgid "" -"However, it is preferred that you tell your Diaspora contacts the new handle" -" %s instead." -msgstr "It's preferrable that you tell your Diaspora contacts the new handle %s instead." - -#: diaspora.php:90 -msgid "All aspects" -msgstr "All aspects" - -#: diaspora.php:91 -msgid "Public" -msgstr "Public" - -#: diaspora.php:97 -msgid "Post to aspect:" -msgstr "Post to aspect:" - -#: diaspora.php:98 -#, php-format -msgid "Connected with your Diaspora account %s" -msgstr "Connected with your Diaspora account %s" - -#: diaspora.php:101 -msgid "" -"Can't login to your Diaspora account. Please check handle (in the format " -"user@domain.tld) and password." -msgstr "Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password." - -#: diaspora.php:109 +#: diaspora.php:149 diaspora.php:153 msgid "Diaspora Export" msgstr "Diaspora Export" -#: diaspora.php:110 -msgid "Information" -msgstr "Information" - -#: diaspora.php:111 -msgid "Error" -msgstr "Error" - -#: diaspora.php:112 -msgid "Save Settings" -msgstr "Save settings" - -#: diaspora.php:116 +#: diaspora.php:163 msgid "Enable Diaspora Post Addon" msgstr "Enable Diaspora export" -#: diaspora.php:117 -msgid "Diaspora handle" -msgstr "Diaspora handle" +#: diaspora.php:168 +msgid "Diaspora username" +msgstr "Diaspora username" -#: diaspora.php:118 +#: diaspora.php:173 msgid "Diaspora password" msgstr "Diaspora password" -#: diaspora.php:118 -msgid "" -"Privacy notice: Your Diaspora password will be stored unencrypted to " -"authenticate you with your Diaspora pod. This means your Friendica node " -"administrator can have access to it." -msgstr "Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it." +#: diaspora.php:178 +msgid "Diaspora site URL" +msgstr "Diaspora site URL" -#: diaspora.php:120 +#: diaspora.php:183 msgid "Post to Diaspora by default" msgstr "Post to Diaspora by default" -#: diaspora.php:138 -msgid "Diaspora settings updated." -msgstr "Diaspora settings updated." +#: diaspora.php:189 +msgid "Save Settings" +msgstr "Save settings" -#: diaspora.php:141 -msgid "Diaspora connector disabled." -msgstr "Diaspora connector disabled." +#: diaspora.php:324 +msgid "Diaspora post failed. Queued for retry." +msgstr "Diaspora post failed. Queued for retry." diff --git a/diaspora/lang/en-gb/strings.php b/diaspora/lang/en-gb/strings.php index 7a84ef4c..5e375913 100644 --- a/diaspora/lang/en-gb/strings.php +++ b/diaspora/lang/en-gb/strings.php @@ -2,27 +2,16 @@ if(! function_exists("string_plural_select_en_gb")) { function string_plural_select_en_gb($n){ - $n = intval($n); return ($n != 1);; }} ; $a->strings["Post to Diaspora"] = "Post to Diaspora"; -$a->strings["Please remember: You can always be reached from Diaspora with your Friendica handle %s. "] = "Please remember: You can always be reached from Diaspora with your Friendica handle %s. "; -$a->strings["This connector is only meant if you still want to use your old Diaspora account for some time. "] = "This connector is only meant if you still want to use your old Diaspora account for some time. "; -$a->strings["However, it is preferred that you tell your Diaspora contacts the new handle %s instead."] = "It's preferrable that you tell your Diaspora contacts the new handle %s instead."; -$a->strings["All aspects"] = "All aspects"; -$a->strings["Public"] = "Public"; -$a->strings["Post to aspect:"] = "Post to aspect:"; -$a->strings["Connected with your Diaspora account %s"] = "Connected with your Diaspora account %s"; -$a->strings["Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."] = "Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."; +$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"; $a->strings["Diaspora Export"] = "Diaspora Export"; -$a->strings["Information"] = "Information"; -$a->strings["Error"] = "Error"; -$a->strings["Save Settings"] = "Save settings"; $a->strings["Enable Diaspora Post Addon"] = "Enable Diaspora export"; -$a->strings["Diaspora handle"] = "Diaspora handle"; +$a->strings["Diaspora username"] = "Diaspora username"; $a->strings["Diaspora password"] = "Diaspora password"; -$a->strings["Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it."] = "Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it."; +$a->strings["Diaspora site URL"] = "Diaspora site URL"; $a->strings["Post to Diaspora by default"] = "Post to Diaspora by default"; -$a->strings["Diaspora settings updated."] = "Diaspora settings updated."; -$a->strings["Diaspora connector disabled."] = "Diaspora connector disabled."; +$a->strings["Save Settings"] = "Save settings"; +$a->strings["Diaspora post failed. Queued for retry."] = "Diaspora post failed. Queued for retry."; diff --git a/diaspora/lang/pl/messages.po b/diaspora/lang/pl/messages.po index 18c21efd..b315858f 100644 --- a/diaspora/lang/pl/messages.po +++ b/diaspora/lang/pl/messages.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-07 00:15-0400\n" -"PO-Revision-Date: 2020-06-17 19:25+0000\n" +"PO-Revision-Date: 2020-06-02 14:07+0000\n" "Last-Translator: Waldemar Stoczkowski\n" "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n" "MIME-Version: 1.0\n" @@ -58,7 +58,7 @@ msgstr "" #: diaspora.php:98 #, php-format msgid "Connected with your Diaspora account %s" -msgstr "Połączony ze swoim kontem Diaspora %s" +msgstr "" #: diaspora.php:101 msgid "" @@ -72,7 +72,7 @@ msgstr "Eksportuj do Diaspory" #: diaspora.php:110 msgid "Information" -msgstr "Informacja" +msgstr "" #: diaspora.php:111 msgid "Error" @@ -99,7 +99,7 @@ msgid "" "Privacy notice: Your Diaspora password will be stored unencrypted to " "authenticate you with your Diaspora pod. This means your Friendica node " "administrator can have access to it." -msgstr "Informacja o ochronie prywatności: Twoje hasło Diaspora będzie przechowywane w postaci niezaszyfrowanej w celu uwierzytelnienia użytkownika za pomocą Diaspora. Oznacza to, że administrator węzła Friendica może mieć do niego dostęp." +msgstr "" #: diaspora.php:120 msgid "Post to Diaspora by default" @@ -107,8 +107,8 @@ msgstr "Wyślij domyślnie do Diaspory" #: diaspora.php:138 msgid "Diaspora settings updated." -msgstr "Zaktualizowano ustawienia Diaspora." +msgstr "" #: diaspora.php:141 msgid "Diaspora connector disabled." -msgstr "Połączenie z Diaspora wyłączone." +msgstr "" diff --git a/diaspora/lang/pl/strings.php b/diaspora/lang/pl/strings.php index fc026326..8efa58b0 100644 --- a/diaspora/lang/pl/strings.php +++ b/diaspora/lang/pl/strings.php @@ -13,16 +13,16 @@ $a->strings["However, it is preferred that you tell your Diaspora contacts the n $a->strings["All aspects"] = "Wszystkie aspekty"; $a->strings["Public"] = "Publiczny"; $a->strings["Post to aspect:"] = ""; -$a->strings["Connected with your Diaspora account %s"] = "Połączony ze swoim kontem Diaspora %s"; +$a->strings["Connected with your Diaspora account %s"] = ""; $a->strings["Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."] = ""; $a->strings["Diaspora Export"] = "Eksportuj do Diaspory"; -$a->strings["Information"] = "Informacja"; +$a->strings["Information"] = ""; $a->strings["Error"] = "Błąd"; $a->strings["Save Settings"] = "Zapisz ustawienia"; $a->strings["Enable Diaspora Post Addon"] = "Włącz dodatek Diaspora"; $a->strings["Diaspora handle"] = ""; $a->strings["Diaspora password"] = "Hasło Diaspora"; -$a->strings["Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it."] = "Informacja o ochronie prywatności: Twoje hasło Diaspora będzie przechowywane w postaci niezaszyfrowanej w celu uwierzytelnienia użytkownika za pomocą Diaspora. Oznacza to, że administrator węzła Friendica może mieć do niego dostęp."; +$a->strings["Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it."] = ""; $a->strings["Post to Diaspora by default"] = "Wyślij domyślnie do Diaspory"; -$a->strings["Diaspora settings updated."] = "Zaktualizowano ustawienia Diaspora."; -$a->strings["Diaspora connector disabled."] = "Połączenie z Diaspora wyłączone."; +$a->strings["Diaspora settings updated."] = ""; +$a->strings["Diaspora connector disabled."] = ""; diff --git a/markdown/lang/en-gb/messages.po b/markdown/lang/en-gb/messages.po deleted file mode 100644 index c55f509e..00000000 --- a/markdown/lang/en-gb/messages.po +++ /dev/null @@ -1,40 +0,0 @@ -# ADDON markdown -# Copyright (C) -# This file is distributed under the same license as the Friendica markdown addon package. -# -# -# Translators: -# Andy H3 , 2020 -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-26 10:04+0000\n" -"PO-Revision-Date: 2019-12-27 06:41+0000\n" -"Last-Translator: Andy H3 , 2020\n" -"Language-Team: English (United Kingdom) (https://www.transifex.com/Friendica/teams/12172/en_GB/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: markdown.php:32 -msgid "Markdown" -msgstr "Markdown" - -#: markdown.php:33 -msgid "Enable Markdown parsing" -msgstr "Enable Markdown parsing" - -#: markdown.php:33 -msgid "" -"If enabled, self created items will additionally be parsed via Markdown." -msgstr "" -"If enabled, self created items will additionally be parsed via Markdown." - -#: markdown.php:34 -msgid "Save Settings" -msgstr "Save Settings" diff --git a/markdown/lang/en-gb/strings.php b/markdown/lang/en-gb/strings.php deleted file mode 100644 index 1834ba01..00000000 --- a/markdown/lang/en-gb/strings.php +++ /dev/null @@ -1,12 +0,0 @@ -strings["Markdown"] = "Markdown"; -$a->strings["Enable Markdown parsing"] = "Enable Markdown parsing"; -$a->strings["If enabled, self created items will additionally be parsed via Markdown."] = "If enabled, self created items will additionally be parsed via Markdown."; -$a->strings["Save Settings"] = "Save Settings"; diff --git a/morepokes/lang/en-gb/messages.po b/morepokes/lang/en-gb/messages.po deleted file mode 100644 index 18248a42..00000000 --- a/morepokes/lang/en-gb/messages.po +++ /dev/null @@ -1,167 +0,0 @@ -# ADDON morepokes -# Copyright (C) -# This file is distributed under the same license as the Friendica morepokes addon package. -# -# -# Translators: -# Andy H3 , 2020 -msgid "" -msgstr "" -"Project-Id-Version: friendica\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-27 05:01-0500\n" -"PO-Revision-Date: 2020-06-23 16:16+0000\n" -"Last-Translator: Andy H3 \n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: morepokes.php:19 -msgid "bitchslap" -msgstr "bitch-slap" - -#: morepokes.php:19 -msgid "bitchslapped" -msgstr "bitch-slapped" - -#: morepokes.php:20 -msgid "shag" -msgstr "shag" - -#: morepokes.php:20 -msgid "shagged" -msgstr "shagged" - -#: morepokes.php:21 -msgid "do something obscenely biological to" -msgstr "do something obscenely biological to" - -#: morepokes.php:21 -msgid "did something obscenely biological to" -msgstr "did something obscenely biological to" - -#: morepokes.php:22 -msgid "point out the poke feature to" -msgstr "point out the poke feature to" - -#: morepokes.php:22 -msgid "pointed out the poke feature to" -msgstr "pointed out the poke feature to" - -#: morepokes.php:23 -msgid "declare undying love for" -msgstr "declare undying love for" - -#: morepokes.php:23 -msgid "declared undying love for" -msgstr "declared undying love for" - -#: morepokes.php:24 -msgid "patent" -msgstr "patent" - -#: morepokes.php:24 -msgid "patented" -msgstr "patented" - -#: morepokes.php:25 -msgid "stroke beard" -msgstr "stroke beard" - -#: morepokes.php:25 -msgid "stroked their beard at" -msgstr "stroked their beard at" - -#: morepokes.php:26 -msgid "" -"bemoan the declining standards of modern secondary and tertiary education to" -msgstr "bemoan the declining standards of modern secondary and tertiary education to" - -#: morepokes.php:26 -msgid "" -"bemoans the declining standards of modern secondary and tertiary education " -"to" -msgstr "bemoans the declining standards of modern secondary and tertiary education to" - -#: morepokes.php:27 -msgid "hug" -msgstr "hug" - -#: morepokes.php:27 -msgid "hugged" -msgstr "hugged" - -#: morepokes.php:28 -msgid "kiss" -msgstr "kiss" - -#: morepokes.php:28 -msgid "kissed" -msgstr "kissed" - -#: morepokes.php:29 -msgid "raise eyebrows at" -msgstr "raise eyebrows at" - -#: morepokes.php:29 -msgid "raised their eyebrows at" -msgstr "raised their eyebrows at" - -#: morepokes.php:30 -msgid "insult" -msgstr "insult" - -#: morepokes.php:30 -msgid "insulted" -msgstr "insulted" - -#: morepokes.php:31 -msgid "praise" -msgstr "praise" - -#: morepokes.php:31 -msgid "praised" -msgstr "praised" - -#: morepokes.php:32 -msgid "be dubious of" -msgstr "be dubious of" - -#: morepokes.php:32 -msgid "was dubious of" -msgstr "is dubious of" - -#: morepokes.php:33 -msgid "eat" -msgstr "eat" - -#: morepokes.php:33 -msgid "ate" -msgstr "ate" - -#: morepokes.php:34 -msgid "giggle and fawn at" -msgstr "giggle and fawn at" - -#: morepokes.php:34 -msgid "giggled and fawned at" -msgstr "giggled and fawned at" - -#: morepokes.php:35 -msgid "doubt" -msgstr "doubt" - -#: morepokes.php:35 -msgid "doubted" -msgstr "doubted" - -#: morepokes.php:36 -msgid "glare" -msgstr "glare" - -#: morepokes.php:36 -msgid "glared at" -msgstr "glared at" diff --git a/morepokes/lang/en-gb/strings.php b/morepokes/lang/en-gb/strings.php deleted file mode 100644 index d4724ee1..00000000 --- a/morepokes/lang/en-gb/strings.php +++ /dev/null @@ -1,44 +0,0 @@ -strings["bitchslap"] = "bitch-slap"; -$a->strings["bitchslapped"] = "bitch-slapped"; -$a->strings["shag"] = "shag"; -$a->strings["shagged"] = "shagged"; -$a->strings["do something obscenely biological to"] = "do something obscenely biological to"; -$a->strings["did something obscenely biological to"] = "did something obscenely biological to"; -$a->strings["point out the poke feature to"] = "point out the poke feature to"; -$a->strings["pointed out the poke feature to"] = "pointed out the poke feature to"; -$a->strings["declare undying love for"] = "declare undying love for"; -$a->strings["declared undying love for"] = "declared undying love for"; -$a->strings["patent"] = "patent"; -$a->strings["patented"] = "patented"; -$a->strings["stroke beard"] = "stroke beard"; -$a->strings["stroked their beard at"] = "stroked their beard at"; -$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "bemoan the declining standards of modern secondary and tertiary education to"; -$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "bemoans the declining standards of modern secondary and tertiary education to"; -$a->strings["hug"] = "hug"; -$a->strings["hugged"] = "hugged"; -$a->strings["kiss"] = "kiss"; -$a->strings["kissed"] = "kissed"; -$a->strings["raise eyebrows at"] = "raise eyebrows at"; -$a->strings["raised their eyebrows at"] = "raised their eyebrows at"; -$a->strings["insult"] = "insult"; -$a->strings["insulted"] = "insulted"; -$a->strings["praise"] = "praise"; -$a->strings["praised"] = "praised"; -$a->strings["be dubious of"] = "be dubious of"; -$a->strings["was dubious of"] = "is dubious of"; -$a->strings["eat"] = "eat"; -$a->strings["ate"] = "ate"; -$a->strings["giggle and fawn at"] = "giggle and fawn at"; -$a->strings["giggled and fawned at"] = "giggled and fawned at"; -$a->strings["doubt"] = "doubt"; -$a->strings["doubted"] = "doubted"; -$a->strings["glare"] = "glare"; -$a->strings["glared at"] = "glared at"; diff --git a/twitter/twitter.php b/twitter/twitter.php index 4c9701d8..606d9c58 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -693,8 +693,7 @@ function twitter_post_hook(App $a, array &$b) Logger::info('Metadata create', ['id' => $b['id'], 'data' => $data, 'return' => json_encode($ret)]); } } else { - Logger::error('Failed upload', ['id' => $b['id'], 'image' => $image['url']]); - throw new Exception('Failed upload of ' . $image['url']); + throw new Exception('Failed upload', ['id' => $b['id'], 'image' => $image['url']]); } } $post['media_ids'] = implode(',', $media_ids);