From 3e512e3785ee27ff5f5be503e8d87dcd5370ed5e Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 29 Jul 2019 15:48:51 +0000 Subject: [PATCH 01/20] More bots added --- blockbot/blockbot.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php index 19f341a6..2c9b9618 100644 --- a/blockbot/blockbot.php +++ b/blockbot/blockbot.php @@ -55,7 +55,7 @@ function blockbot_init_1(App $a) { // List of "good" crawlers $good_agents = ['fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0', - 'Social-Relay/', 'Test Certificate Info', 'Uptimebot/']; + 'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot']; // List of known crawlers. $agents = ['SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/', @@ -74,7 +74,8 @@ function blockbot_init_1(App $a) { 'ArchiveTeam ArchiveBot/', 'yacybot', 'https://developers.google.com/+/web/snippet/', 'Scrapy/', 'github-camo', 'MJ12bot/', 'DotBot/', 'Pinterestbot/', 'Jooblebot/', 'Cliqzbot/', 'YaK/', 'Mediatoolkitbot', 'Snacktory', 'FunWebProducts', 'oBot/', - '7Siters/', 'KOCMOHABT', 'Google-SearchByImage']; + '7Siters/', 'KOCMOHABT', 'Google-SearchByImage', 'FemtosearchBot/', + 'HubSpot Crawler']; if (!Config::get('blockbot', 'good_crawlers')) { $agents = array_merge($agents, $good_agents); From 9cb6ca5a62232f1b9d0f10c8b6e7c55900d9d1b0 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 7 Aug 2019 05:55:04 +0000 Subject: [PATCH 02/20] Some more bots --- blockbot/blockbot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php index 2c9b9618..2714e494 100644 --- a/blockbot/blockbot.php +++ b/blockbot/blockbot.php @@ -75,7 +75,7 @@ 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']; + 'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio']; if (!Config::get('blockbot', 'good_crawlers')) { $agents = array_merge($agents, $good_agents); From 313b7e622fdaea76aa3efc5691bf7e26ce16f212 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 21 Aug 2019 15:12:04 +0200 Subject: [PATCH 03/20] Blockbot translation updated THX vinz --- blockbot/lang/de/messages.po | 5 +++-- blockbot/lang/de/strings.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/blockbot/lang/de/messages.po b/blockbot/lang/de/messages.po index 081593bb..55fe2097 100644 --- a/blockbot/lang/de/messages.po +++ b/blockbot/lang/de/messages.po @@ -5,6 +5,7 @@ # # Translators: # Tobias Diekershoff , 2019 +# Vinzenz Vietzke , 2019 # #, fuzzy msgid "" @@ -13,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-07 09:03+0200\n" "PO-Revision-Date: 2019-08-07 07:43+0000\n" -"Last-Translator: Tobias Diekershoff , 2019\n" +"Last-Translator: Vinzenz Vietzke , 2019\n" "Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,7 +36,7 @@ msgstr "GabSocial Instanzen blockieren" #: blockbot.php:38 msgid "Training mode" -msgstr "Trainings Modus" +msgstr "Trainingsmodus" #: blockbot.php:46 msgid "Settings updated." diff --git a/blockbot/lang/de/strings.php b/blockbot/lang/de/strings.php index 14d215a8..db52f710 100644 --- a/blockbot/lang/de/strings.php +++ b/blockbot/lang/de/strings.php @@ -9,5 +9,5 @@ function string_plural_select_de($n){ $a->strings["Save Settings"] = "Einstellungen speichern"; $a->strings["Allow \"good\" crawlers"] = "\"Gute\" Crawler erlauben"; $a->strings["Block GabSocial"] = "GabSocial Instanzen blockieren"; -$a->strings["Training mode"] = "Trainings Modus"; +$a->strings["Training mode"] = "Trainingsmodus"; $a->strings["Settings updated."] = "Einstellungen aktualisiert."; From 8b653108828ddfd7dce2f5b1153561a8215abcbe Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 21 Aug 2019 15:12:41 +0200 Subject: [PATCH 04/20] Buffer translation updated THX vinz --- buffer/lang/de/messages.po | 29 ++++++++++++++++------------- buffer/lang/de/strings.php | 19 ++++++++++--------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/buffer/lang/de/messages.po b/buffer/lang/de/messages.po index a252d87c..e01056b6 100644 --- a/buffer/lang/de/messages.po +++ b/buffer/lang/de/messages.po @@ -4,15 +4,18 @@ # # # Translators: -# bavatar , 2014 +# Tobias Diekershoff , 2014 +# Tobias Diekershoff , 2018 +# Ulf Rompe , 2019 +# Vinzenz Vietzke , 2019 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-22 13:18+0200\n" -"PO-Revision-Date: 2014-07-03 05:49+0000\n" -"Last-Translator: bavatar \n" -"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" +"PO-Revision-Date: 2019-08-19 10:15+0000\n" +"Last-Translator: Vinzenz Vietzke \n" +"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -37,19 +40,19 @@ msgstr "Client Secret" #: buffer.php:67 msgid "Error when registering buffer connection:" -msgstr "Fehler beim Registrieren des buffer Connectors." +msgstr "Fehler beim Registrieren des Buffer-Connectors." #: buffer.php:86 msgid "You are now authenticated to buffer. " -msgstr "Du bist nun auf buffer authentifiziert." +msgstr "Du bist nun auf Buffer authentifiziert." #: buffer.php:87 msgid "return to the connector page" -msgstr "zurück zur Connector Seite" +msgstr "zurück zur Connector-Seite" #: buffer.php:103 msgid "Post to Buffer" -msgstr "Auf buffer veröffentlichen" +msgstr "Auf Buffer veröffentlichen" #: buffer.php:128 buffer.php:132 msgid "Buffer Export" @@ -57,20 +60,20 @@ msgstr "Buffer Export" #: buffer.php:142 msgid "Authenticate your Buffer connection" -msgstr "Authentifiziere deine Verbindung zu buffer" +msgstr "Authentifiziere deine Verbindung zu Buffer" #: buffer.php:146 msgid "Enable Buffer Post Addon" -msgstr "Buffer Post-Addon aktivieren" +msgstr "Buffer-Post-Addon aktivieren" #: buffer.php:151 msgid "Post to Buffer by default" -msgstr "Standardmäßig auf buffer veröffentlichen" +msgstr "Standardmäßig auf Buffer veröffentlichen" #: buffer.php:156 msgid "Check to delete this preset" -msgstr "Markieren um dieses Preset zu löschen" +msgstr "Markieren, um diese Voreinstellung zu löschen" #: buffer.php:165 msgid "Posts are going to all accounts that are enabled by default:" -msgstr "Beiträge werden an alle Accounts geschickt, die Standardmäßig aktiviert sind." +msgstr "Beiträge werden an alle Accounts geschickt, die standardmäßig aktiviert sind." diff --git a/buffer/lang/de/strings.php b/buffer/lang/de/strings.php index dbf3f7dc..bb55e28b 100644 --- a/buffer/lang/de/strings.php +++ b/buffer/lang/de/strings.php @@ -2,6 +2,7 @@ if(! function_exists("string_plural_select_de")) { function string_plural_select_de($n){ + $n = intval($n); return ($n != 1);; }} ; @@ -9,13 +10,13 @@ $a->strings["Permission denied."] = "Zugriff verweigert."; $a->strings["Save Settings"] = "Einstellungen speichern"; $a->strings["Client ID"] = "Client ID"; $a->strings["Client Secret"] = "Client Secret"; -$a->strings["Error when registering buffer connection:"] = "Fehler beim Registrieren des buffer Connectors."; -$a->strings["You are now authenticated to buffer. "] = "Du bist nun auf buffer authentifiziert."; -$a->strings["return to the connector page"] = "zurück zur Connector Seite"; -$a->strings["Post to Buffer"] = "Auf buffer veröffentlichen"; +$a->strings["Error when registering buffer connection:"] = "Fehler beim Registrieren des Buffer-Connectors."; +$a->strings["You are now authenticated to buffer. "] = "Du bist nun auf Buffer authentifiziert."; +$a->strings["return to the connector page"] = "zurück zur Connector-Seite"; +$a->strings["Post to Buffer"] = "Auf Buffer veröffentlichen"; $a->strings["Buffer Export"] = "Buffer Export"; -$a->strings["Authenticate your Buffer connection"] = "Authentifiziere deine Verbindung zu buffer"; -$a->strings["Enable Buffer Post Addon"] = "Buffer Post-Addon aktivieren"; -$a->strings["Post to Buffer by default"] = "Standardmäßig auf buffer veröffentlichen"; -$a->strings["Check to delete this preset"] = "Markieren um dieses Preset zu löschen"; -$a->strings["Posts are going to all accounts that are enabled by default:"] = "Beiträge werden an alle Accounts geschickt, die Standardmäßig aktiviert sind."; +$a->strings["Authenticate your Buffer connection"] = "Authentifiziere deine Verbindung zu Buffer"; +$a->strings["Enable Buffer Post Addon"] = "Buffer-Post-Addon aktivieren"; +$a->strings["Post to Buffer by default"] = "Standardmäßig auf Buffer veröffentlichen"; +$a->strings["Check to delete this preset"] = "Markieren, um diese Voreinstellung zu löschen"; +$a->strings["Posts are going to all accounts that are enabled by default:"] = "Beiträge werden an alle Accounts geschickt, die standardmäßig aktiviert sind."; From e30403c66cbc431a5568347b19615987850eacbd Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 21 Aug 2019 15:15:46 +0200 Subject: [PATCH 05/20] Blockem SV translation update THX Bjoessi --- blockem/lang/sv/messages.po | 59 +++++++++++++++++++++++++++++++++++++ blockem/lang/sv/strings.php | 20 +++++++++++-- 2 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 blockem/lang/sv/messages.po diff --git a/blockem/lang/sv/messages.po b/blockem/lang/sv/messages.po new file mode 100644 index 00000000..a474f815 --- /dev/null +++ b/blockem/lang/sv/messages.po @@ -0,0 +1,59 @@ +# ADDON blockem +# Copyright (C) +# This file is distributed under the same license as the Friendica blockem addon package. +# +# +# Translators: +# Bjoessi , 2019 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-08-17 10:23+0200\n" +"PO-Revision-Date: 2019-08-20 07:51+0000\n" +"Last-Translator: Bjoessi \n" +"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: blockem.php:54 blockem.php:58 +msgid "Blockem" +msgstr "BLOCKEM" + +#: blockem.php:62 +msgid "" +"Hides user's content by collapsing posts. Also replaces their avatar with " +"generic image." +msgstr "Döljer användares inlägg genom sammanslagning nedåt. Användarens profilbild ersätts med en standardbild." + +#: blockem.php:63 +msgid "Comma separated profile URLS:" +msgstr "Kommaseparerade profiladresser:" + +#: blockem.php:67 +msgid "Save Settings" +msgstr "Spara inställningar" + +#: blockem.php:81 +msgid "BLOCKEM Settings saved." +msgstr "BLOCKEM Inställningar sparade." + +#: blockem.php:143 +#, php-format +msgid "Filtered user: %s" +msgstr "Filtrerat på användare:%s" + +#: blockem.php:202 +msgid "Unblock Author" +msgstr "Avblockera författare" + +#: blockem.php:204 +msgid "Block Author" +msgstr "Blockera författare" + +#: blockem.php:244 +msgid "blockem settings updated" +msgstr "BLOCKEM Inställningar uppdaterade" diff --git a/blockem/lang/sv/strings.php b/blockem/lang/sv/strings.php index 3ec569a7..9685ad8b 100644 --- a/blockem/lang/sv/strings.php +++ b/blockem/lang/sv/strings.php @@ -1,3 +1,17 @@ -strings["Submit"] = "Spara"; +strings["Blockem"] = "BLOCKEM"; +$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Döljer användares inlägg genom sammanslagning nedåt. Användarens profilbild ersätts med en standardbild."; +$a->strings["Comma separated profile URLS:"] = "Kommaseparerade profiladresser:"; +$a->strings["Save Settings"] = "Spara inställningar"; +$a->strings["BLOCKEM Settings saved."] = "BLOCKEM Inställningar sparade."; +$a->strings["Filtered user: %s"] = "Filtrerat på användare:%s"; +$a->strings["Unblock Author"] = "Avblockera författare"; +$a->strings["Block Author"] = "Blockera författare"; +$a->strings["blockem settings updated"] = "BLOCKEM Inställningar uppdaterade"; From 8ef52c088b41f95b1efd13185a245a7fa9d7690f Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 21 Aug 2019 15:24:58 +0200 Subject: [PATCH 06/20] Blogger SV translation update THX Bjoessi --- blogger/lang/sv/messages.po | 56 +++++++++++++++++++++++++++++++++++++ blogger/lang/sv/strings.php | 20 +++++++++++-- 2 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 blogger/lang/sv/messages.po diff --git a/blogger/lang/sv/messages.po b/blogger/lang/sv/messages.po new file mode 100644 index 00000000..a9e4ae81 --- /dev/null +++ b/blogger/lang/sv/messages.po @@ -0,0 +1,56 @@ +# ADDON blogger +# Copyright (C) +# This file is distributed under the same license as the Friendica blogger addon package. +# +# +# Translators: +# Bjoessi , 2019 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-06-22 13:18+0200\n" +"PO-Revision-Date: 2019-08-20 07:54+0000\n" +"Last-Translator: Bjoessi \n" +"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: blogger.php:42 +msgid "Post to blogger" +msgstr "Lägg in på Blogger" + +#: blogger.php:74 blogger.php:78 +msgid "Blogger Export" +msgstr "Export till Blogger" + +#: blogger.php:82 +msgid "Enable Blogger Post Addon" +msgstr "Aktivera tillägg för Blogger-inlägg" + +#: blogger.php:87 +msgid "Blogger username" +msgstr "Blogger användarnamn" + +#: blogger.php:92 +msgid "Blogger password" +msgstr "Blogger lösenord" + +#: blogger.php:97 +msgid "Blogger API URL" +msgstr "Blogger API URL" + +#: blogger.php:102 +msgid "Post to Blogger by default" +msgstr "Lägg in på Blogger som standard" + +#: blogger.php:108 +msgid "Save Settings" +msgstr "Spara inställningar" + +#: blogger.php:178 +msgid "Post from Friendica" +msgstr "Inlägg från Friendica" diff --git a/blogger/lang/sv/strings.php b/blogger/lang/sv/strings.php index 3ec569a7..6bb652dd 100644 --- a/blogger/lang/sv/strings.php +++ b/blogger/lang/sv/strings.php @@ -1,3 +1,17 @@ -strings["Submit"] = "Spara"; +strings["Post to blogger"] = "Lägg in på Blogger"; +$a->strings["Blogger Export"] = "Export till Blogger"; +$a->strings["Enable Blogger Post Addon"] = "Aktivera tillägg för Blogger-inlägg"; +$a->strings["Blogger username"] = "Blogger användarnamn"; +$a->strings["Blogger password"] = "Blogger lösenord"; +$a->strings["Blogger API URL"] = "Blogger API URL"; +$a->strings["Post to Blogger by default"] = "Lägg in på Blogger som standard"; +$a->strings["Save Settings"] = "Spara inställningar"; +$a->strings["Post from Friendica"] = "Inlägg från Friendica"; From 07c3b632f3a4065314365dc0440f743b4f47f6fa Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 21 Aug 2019 15:26:34 +0200 Subject: [PATCH 07/20] Buffer SV translation added THX Bjoessi --- buffer/lang/sv/messages.po | 77 ++++++++++++++++++++++++++++++++++++++ buffer/lang/sv/strings.php | 22 +++++++++++ 2 files changed, 99 insertions(+) create mode 100644 buffer/lang/sv/messages.po create mode 100644 buffer/lang/sv/strings.php diff --git a/buffer/lang/sv/messages.po b/buffer/lang/sv/messages.po new file mode 100644 index 00000000..5ca6e6ec --- /dev/null +++ b/buffer/lang/sv/messages.po @@ -0,0 +1,77 @@ +# ADDON buffer +# Copyright (C) +# This file is distributed under the same license as the Friendica buffer addon package. +# +# +# Translators: +# Hypolite Petovan , 2019 +# Bjoessi , 2019 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-06-22 13:18+0200\n" +"PO-Revision-Date: 2019-08-20 08:07+0000\n" +"Last-Translator: Bjoessi \n" +"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: buffer.php:31 +msgid "Permission denied." +msgstr "Åtkomst nekad." + +#: buffer.php:57 buffer.php:185 +msgid "Save Settings" +msgstr "Spara inställningar" + +#: buffer.php:59 +msgid "Client ID" +msgstr "Klient-ID" + +#: buffer.php:60 +msgid "Client Secret" +msgstr "Klient hemlig nyckel" + +#: buffer.php:67 +msgid "Error when registering buffer connection:" +msgstr "Fel vid anslutning till Buffer" + +#: buffer.php:86 +msgid "You are now authenticated to buffer. " +msgstr "Du är nu autentiserad mot Buffer." + +#: buffer.php:87 +msgid "return to the connector page" +msgstr "återgå till anslutningssida" + +#: buffer.php:103 +msgid "Post to Buffer" +msgstr "Inlägg till Buffer" + +#: buffer.php:128 buffer.php:132 +msgid "Buffer Export" +msgstr "Export till Buffer" + +#: buffer.php:142 +msgid "Authenticate your Buffer connection" +msgstr "Validera din anslutning mot Buffer" + +#: buffer.php:146 +msgid "Enable Buffer Post Addon" +msgstr "Aktivera tillägg för Buffer-inlägg" + +#: buffer.php:151 +msgid "Post to Buffer by default" +msgstr "Lägg in på Buffer som standard" + +#: buffer.php:156 +msgid "Check to delete this preset" +msgstr "Markera för att ta bort förinställning" + +#: buffer.php:165 +msgid "Posts are going to all accounts that are enabled by default:" +msgstr "Inlägg skickas som standard till alla konton som är aktiverade:" diff --git a/buffer/lang/sv/strings.php b/buffer/lang/sv/strings.php new file mode 100644 index 00000000..b48a1766 --- /dev/null +++ b/buffer/lang/sv/strings.php @@ -0,0 +1,22 @@ +strings["Permission denied."] = "Åtkomst nekad."; +$a->strings["Save Settings"] = "Spara inställningar"; +$a->strings["Client ID"] = "Klient-ID"; +$a->strings["Client Secret"] = "Klient hemlig nyckel"; +$a->strings["Error when registering buffer connection:"] = "Fel vid anslutning till Buffer"; +$a->strings["You are now authenticated to buffer. "] = "Du är nu autentiserad mot Buffer."; +$a->strings["return to the connector page"] = "återgå till anslutningssida"; +$a->strings["Post to Buffer"] = "Inlägg till Buffer"; +$a->strings["Buffer Export"] = "Export till Buffer"; +$a->strings["Authenticate your Buffer connection"] = "Validera din anslutning mot Buffer"; +$a->strings["Enable Buffer Post Addon"] = "Aktivera tillägg för Buffer-inlägg"; +$a->strings["Post to Buffer by default"] = "Lägg in på Buffer som standard"; +$a->strings["Check to delete this preset"] = "Markera för att ta bort förinställning"; +$a->strings["Posts are going to all accounts that are enabled by default:"] = "Inlägg skickas som standard till alla konton som är aktiverade:"; From 4872f532cced9ad77c956048f72cb48942480010 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 27 Aug 2019 06:36:03 +0200 Subject: [PATCH 08/20] added blockbot PL translation THX waldis --- blockbot/lang/pl/messages.po | 42 ++++++++++++++++++++++++++++++++++++ blockbot/lang/pl/strings.php | 13 +++++++++++ 2 files changed, 55 insertions(+) create mode 100644 blockbot/lang/pl/messages.po create mode 100644 blockbot/lang/pl/strings.php diff --git a/blockbot/lang/pl/messages.po b/blockbot/lang/pl/messages.po new file mode 100644 index 00000000..f3cf082f --- /dev/null +++ b/blockbot/lang/pl/messages.po @@ -0,0 +1,42 @@ +# ADDON blockbot +# Copyright (C) +# This file is distributed under the same license as the Friendica blockbot addon package. +# +# +# Translators: +# Waldemar Stoczkowski, 2019 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-08-07 09:03+0200\n" +"PO-Revision-Date: 2019-08-07 07:43+0000\n" +"Last-Translator: Waldemar Stoczkowski, 2019\n" +"Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pl\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" + +#: blockbot.php:35 +msgid "Save Settings" +msgstr "Zapisz ustawienia" + +#: blockbot.php:36 +msgid "Allow \"good\" crawlers" +msgstr "Pozwól „dobrym” robotom" + +#: blockbot.php:37 +msgid "Block GabSocial" +msgstr "Zablokuj GabSocial" + +#: blockbot.php:38 +msgid "Training mode" +msgstr "Tryb treningowy" + +#: blockbot.php:46 +msgid "Settings updated." +msgstr "Ustawienia zaktualizowane." diff --git a/blockbot/lang/pl/strings.php b/blockbot/lang/pl/strings.php new file mode 100644 index 00000000..0eafbcaf --- /dev/null +++ b/blockbot/lang/pl/strings.php @@ -0,0 +1,13 @@ +=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);; +}} +; +$a->strings["Save Settings"] = "Zapisz ustawienia"; +$a->strings["Allow \"good\" crawlers"] = "Pozwól „dobrym” robotom"; +$a->strings["Block GabSocial"] = "Zablokuj GabSocial"; +$a->strings["Training mode"] = "Tryb treningowy"; +$a->strings["Settings updated."] = "Ustawienia zaktualizowane."; From 0822bb59a382fbad748fdc2a7e3e04b9ea365695 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Tue, 27 Aug 2019 08:27:06 +0200 Subject: [PATCH 09/20] php notice fixings addons: - bufferapp (missing errorcode) - twitter (wrong field name 'nickname') core: - bbcode (incomplete attachementdata) - crypto (uninitialized key) --- buffer/bufferapp.php | 1 + twitter/twitter.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/buffer/bufferapp.php b/buffer/bufferapp.php index a9aeb49e..ed1d9353 100644 --- a/buffer/bufferapp.php +++ b/buffer/bufferapp.php @@ -42,6 +42,7 @@ public $errors = [ 'invalid-endpoint' => 'The endpoint you supplied does not appear to be valid.', + '401' => 'Unauthorized.', '403' => 'Permission denied.', '404' => 'Endpoint not found.', '405' => 'Method not allowed.', diff --git a/twitter/twitter.php b/twitter/twitter.php index ac23b84d..eeee6caf 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1900,7 +1900,7 @@ function twitter_update_mentions($body) function twitter_convert_share(array $attributes, array $author_contact, $content, $is_quote_share) { if ($author_contact['network'] == Protocol::TWITTER) { - $mention = '@' . $author_contact['nickname']; + $mention = '@' . $author_contact['nick']; } else { $mention = $author_contact['addr']; } From f153070cb93b58b12c5505624f183546ddc56f81 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 28 Aug 2019 18:00:58 +0200 Subject: [PATCH 10/20] added JA translation of blackout addon THX Ozero Dien --- blackout/lang/ja/messages.po | 65 ++++++++++++++++++++++++++++++++++++ blackout/lang/ja/strings.php | 17 ++++++++++ 2 files changed, 82 insertions(+) create mode 100644 blackout/lang/ja/messages.po create mode 100644 blackout/lang/ja/strings.php diff --git a/blackout/lang/ja/messages.po b/blackout/lang/ja/messages.po new file mode 100644 index 00000000..c7e267d7 --- /dev/null +++ b/blackout/lang/ja/messages.po @@ -0,0 +1,65 @@ +# ADDON blackout +# Copyright (C) +# This file is distributed under the same license as the Friendica blackout addon package. +# +# +# Translators: +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: 2019-08-28 10:18+0000\n" +"Last-Translator: Ozero Dien \n" +"Language-Team: Japanese (http://www.transifex.com/Friendica/friendica/language/ja/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ja\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/ja/strings.php b/blackout/lang/ja/strings.php new file mode 100644 index 00000000..820f8e4a --- /dev/null +++ b/blackout/lang/ja/strings.php @@ -0,0 +1,17 @@ +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."] = "備考：送信ボタンを押した時点からリダイレクトが有効になります。現在ログインしているユーザーはリダイレクトされませんが、ブラックアウトが有効な間はログアウト後再度ログインできなくなります。"; From 9523d4d9f1c4b0d296ea0c031aa42ca7cb5d4229 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 29 Aug 2019 06:33:44 +0200 Subject: [PATCH 11/20] added JA translation of twitter addon THX Ozero Dien --- twitter/lang/ja/messages.po | 133 ++++++++++++++++++++++++++++++++++++ twitter/lang/ja/strings.php | 31 +++++++++ 2 files changed, 164 insertions(+) create mode 100644 twitter/lang/ja/messages.po create mode 100644 twitter/lang/ja/strings.php diff --git a/twitter/lang/ja/messages.po b/twitter/lang/ja/messages.po new file mode 100644 index 00000000..bec72954 --- /dev/null +++ b/twitter/lang/ja/messages.po @@ -0,0 +1,133 @@ +# ADDON twitter +# Copyright (C) +# This file is distributed under the same license as the Friendica twitter addon package. +# +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-06-02 10:25+0700\n" +"PO-Revision-Date: 2019-08-28 10:37+0000\n" +"Last-Translator: Ozero Dien \n" +"Language-Team: Japanese (http://www.transifex.com/Friendica/friendica/language/ja/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: twitter.php:195 +msgid "Post to Twitter" +msgstr "Twitterに投稿" + +#: twitter.php:236 +msgid "" +"You submitted an empty PIN, please Sign In with Twitter again to get a new " +"one." +msgstr "空のPINを送信しました。もう一度Twitterでサインインして新しいPINを取得してください。" + +#: twitter.php:263 +msgid "Twitter settings updated." +msgstr "Twitter設定が更新されました。" + +#: twitter.php:293 twitter.php:297 +msgid "Twitter Import/Export/Mirror" +msgstr "Twitterインポート/エクスポート/ミラー" + +#: twitter.php:304 +msgid "" +"No consumer key pair for Twitter found. Please contact your site " +"administrator." +msgstr "Twitterのコンシューマキーペアが見つかりません。サイト管理者に連絡してください。" + +#: twitter.php:316 +msgid "" +"At this Friendica instance the Twitter addon was enabled but you have not " +"yet connected your account to your Twitter account. To do so click the " +"button below to get a PIN from Twitter which you have to copy into the input" +" box below and submit the form. Only your public posts will" +" be posted to Twitter." +msgstr "このFriendicaインスタンスでは、Twitterアドオンは有効になっていますが、アカウントをTwitterアカウントにまだ接続していません。これを行うには、下のボタンをクリックしてTwitterからPINを取得し、それを下の入力ボックスにコピーしてフォームを送信する必要があります。 一般公開投稿のみがTwitterに投稿されます。" + +#: twitter.php:317 +msgid "Log in with Twitter" +msgstr "Twitterでログイン" + +#: twitter.php:319 +msgid "Copy the PIN from Twitter here" +msgstr "ここからTwitterからPINをコピーします" + +#: twitter.php:324 twitter.php:366 twitter.php:636 +msgid "Save Settings" +msgstr "設定を保存する" + +#: twitter.php:336 +msgid "Currently connected to: " +msgstr "現在接続中：" + +#: twitter.php:337 +msgid "Disconnect" +msgstr "切断する" + +#: twitter.php:347 +msgid "Allow posting to Twitter" +msgstr "Twitterへの投稿を許可する" + +#: twitter.php:347 +msgid "" +"If enabled all your public postings can be posted to the " +"associated Twitter account. You can choose to do so by default (here) or for" +" every posting separately in the posting options when writing the entry." +msgstr "有効にすると、すべての一般公開投稿を、関連づけたTwitterアカウントに投稿できます。デフォルト（ここ）で行うか、エントリを書き込む際に投稿オプションですべての投稿を個別に行うかを選択できます。" + +#: twitter.php:350 +msgid "" +"Note: Due to your privacy settings (Hide your profile " +"details from unknown viewers?) the link potentially included in public " +"postings relayed to Twitter will lead the visitor to a blank page informing " +"the visitor that the access to your profile has been restricted." +msgstr "注：プライバシー設定（未知の視聴者からプロフィールの詳細を非表示にしますか？）により、Twitterに中継・公開される投稿内のリンクは、プロフィールへのアクセスが制限されている訪問者に対して空白ページを表示します。" + +#: twitter.php:353 +msgid "Send public postings to Twitter by default" +msgstr "デフォルトでTwitterに一般公開投稿を送信する" + +#: twitter.php:356 +msgid "Mirror all posts from twitter that are no replies" +msgstr "返信がないTwitterのすべての投稿をミラーリングする" + +#: twitter.php:359 +msgid "Import the remote timeline" +msgstr "リモートタイムラインをインポートする" + +#: twitter.php:362 +msgid "Automatically create contacts" +msgstr "連絡先を自動的に作成する" + +#: twitter.php:362 +msgid "" +"This will automatically create a contact in Friendica as soon as you receive" +" a message from an existing contact via the Twitter network. If you do not " +"enable this, you need to manually add those Twitter contacts in Friendica " +"from whom you would like to see posts here. However if enabled, you cannot " +"merely remove a twitter contact from the Friendica contact list, as it will " +"recreate this contact when they post again." +msgstr "これにより、Twitterネットワーク経由で既存の連絡先からメッセージを受信するとすぐに、Friendicaに連絡先が自動的に作成されます。これを有効にしない場合、ここで投稿を表示するFriendicaのTwitter連絡先を手動で追加する必要があります。ただし、有効にした場合、Twitterの連絡先をFriendicaの連絡先リストから単に削除することはできません。再送信するとこの連絡先が再作成されるためです。" + +#: twitter.php:614 +msgid "Twitter post failed. Queued for retry." +msgstr "Twitterの投稿に失敗しました。再試行のためにキューに入れられました。" + +#: twitter.php:628 +msgid "Settings updated." +msgstr "設定が更新されました。" + +#: twitter.php:638 +msgid "Consumer key" +msgstr "コンシューマ キー" + +#: twitter.php:639 +msgid "Consumer secret" +msgstr "コンシューマ シークレット" diff --git a/twitter/lang/ja/strings.php b/twitter/lang/ja/strings.php new file mode 100644 index 00000000..f30a36fa --- /dev/null +++ b/twitter/lang/ja/strings.php @@ -0,0 +1,31 @@ +strings["Post to Twitter"] = "Twitterに投稿"; +$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "空のPINを送信しました。もう一度Twitterでサインインして新しいPINを取得してください。"; +$a->strings["Twitter settings updated."] = "Twitter設定が更新されました。"; +$a->strings["Twitter Import/Export/Mirror"] = "Twitterインポート/エクスポート/ミラー"; +$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Twitterのコンシューマキーペアが見つかりません。サイト管理者に連絡してください。"; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "このFriendicaインスタンスでは、Twitterアドオンは有効になっていますが、アカウントをTwitterアカウントにまだ接続していません。これを行うには、下のボタンをクリックしてTwitterからPINを取得し、それを下の入力ボックスにコピーしてフォームを送信する必要があります。 一般公開投稿のみがTwitterに投稿されます。"; +$a->strings["Log in with Twitter"] = "Twitterでログイン"; +$a->strings["Copy the PIN from Twitter here"] = "ここからTwitterからPINをコピーします"; +$a->strings["Save Settings"] = "設定を保存する"; +$a->strings["Currently connected to: "] = "現在接続中："; +$a->strings["Disconnect"] = "切断する"; +$a->strings["Allow posting to Twitter"] = "Twitterへの投稿を許可する"; +$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "有効にすると、すべての一般公開投稿を、関連づけたTwitterアカウントに投稿できます。デフォルト（ここ）で行うか、エントリを書き込む際に投稿オプションですべての投稿を個別に行うかを選択できます。"; +$a->strings["Note: Due to your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "注：プライバシー設定（未知の視聴者からプロフィールの詳細を非表示にしますか？）により、Twitterに中継・公開される投稿内のリンクは、プロフィールへのアクセスが制限されている訪問者に対して空白ページを表示します。"; +$a->strings["Send public postings to Twitter by default"] = "デフォルトでTwitterに一般公開投稿を送信する"; +$a->strings["Mirror all posts from twitter that are no replies"] = "返信がないTwitterのすべての投稿をミラーリングする"; +$a->strings["Import the remote timeline"] = "リモートタイムラインをインポートする"; +$a->strings["Automatically create contacts"] = "連絡先を自動的に作成する"; +$a->strings["This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again."] = "これにより、Twitterネットワーク経由で既存の連絡先からメッセージを受信するとすぐに、Friendicaに連絡先が自動的に作成されます。これを有効にしない場合、ここで投稿を表示するFriendicaのTwitter連絡先を手動で追加する必要があります。ただし、有効にした場合、Twitterの連絡先をFriendicaの連絡先リストから単に削除することはできません。再送信するとこの連絡先が再作成されるためです。"; +$a->strings["Twitter post failed. Queued for retry."] = "Twitterの投稿に失敗しました。再試行のためにキューに入れられました。"; +$a->strings["Settings updated."] = "設定が更新されました。"; +$a->strings["Consumer key"] = "コンシューマ キー"; +$a->strings["Consumer secret"] = "コンシューマ シークレット"; From 22008114e1c46902856a729fd30df679aa747dbc Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 29 Aug 2019 15:55:40 +0200 Subject: [PATCH 12/20] blockbot addon added CS translation THX Aditoo --- blockbot/lang/cs/messages.po | 42 ++++++++++++++++++++++++++++++++++++ blockbot/lang/cs/strings.php | 13 +++++++++++ 2 files changed, 55 insertions(+) create mode 100644 blockbot/lang/cs/messages.po create mode 100644 blockbot/lang/cs/strings.php diff --git a/blockbot/lang/cs/messages.po b/blockbot/lang/cs/messages.po new file mode 100644 index 00000000..5fdf4047 --- /dev/null +++ b/blockbot/lang/cs/messages.po @@ -0,0 +1,42 @@ +# ADDON blockbot +# Copyright (C) +# This file is distributed under the same license as the Friendica blockbot addon package. +# +# +# Translators: +# Aditoo, 2019 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-08-07 09:03+0200\n" +"PO-Revision-Date: 2019-08-07 07:43+0000\n" +"Last-Translator: Aditoo, 2019\n" +"Language-Team: Czech (https://www.transifex.com/Friendica/teams/12172/cs/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" +"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n" + +#: blockbot.php:35 +msgid "Save Settings" +msgstr "Uložit nastavení" + +#: blockbot.php:36 +msgid "Allow \"good\" crawlers" +msgstr "Povolit „dobré“ crawlery" + +#: blockbot.php:37 +msgid "Block GabSocial" +msgstr "Zablokovat GabSocial" + +#: blockbot.php:38 +msgid "Training mode" +msgstr "Trénovací režim" + +#: blockbot.php:46 +msgid "Settings updated." +msgstr "Nastavení aktualizována." diff --git a/blockbot/lang/cs/strings.php b/blockbot/lang/cs/strings.php new file mode 100644 index 00000000..d3c5a2dd --- /dev/null +++ b/blockbot/lang/cs/strings.php @@ -0,0 +1,13 @@ += 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;; +}} +; +$a->strings["Save Settings"] = "Uložit nastavení"; +$a->strings["Allow \"good\" crawlers"] = "Povolit „dobré“ crawlery"; +$a->strings["Block GabSocial"] = "Zablokovat GabSocial"; +$a->strings["Training mode"] = "Trénovací režim"; +$a->strings["Settings updated."] = "Nastavení aktualizována."; From 4ab75e2e8cb5e3c422d2c45e52a5a12d73ecfdbf Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Tue, 3 Sep 2019 18:37:27 +0200 Subject: [PATCH 13/20] Check twitter details before showing it --- twitter/twitter.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index eeee6caf..d846b1ad 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -352,7 +352,10 @@ function twitter_settings(App $a, &$s) $field_checkbox = Renderer::getMarkupTemplate('field_checkbox.tpl'); - $s .= '
+ if (property_exists($details, 'screen_name') && + property_exists($details, 'description') && + property_exists($details, 'profile_image_url')) { + $s .= '

' . L10n::t('Currently connected to: ') . '' . $details->screen_name . '

@@ -361,6 +364,12 @@ function twitter_settings(App $a, &$s) ' . $details->description . '

'; + } else { + $s .= '
+

Invalid Twitter info

+
'; + Logger::info('Invalid twitter info (verify credentials).', ['auth' => TwitterOAuth::class]); + } $s .= '
'; $s .= Renderer::replaceMacros($field_checkbox, [ From f96ff32b212a71aff8f55b4b7b75b6948cbaba2b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 7 Sep 2019 08:10:25 +0200 Subject: [PATCH 14/20] correction of wrong DE translation for the twitter addon --- twitter/lang/de/messages.po | 147 ++++++++++++++++++++++++++---------- twitter/lang/de/strings.php | 30 ++++++-- 2 files changed, 131 insertions(+), 46 deletions(-) diff --git a/twitter/lang/de/messages.po b/twitter/lang/de/messages.po index c297759f..f8eb5297 100644 --- a/twitter/lang/de/messages.po +++ b/twitter/lang/de/messages.po @@ -1,20 +1,19 @@ -# ADDON nsfw +# ADDON twitter # Copyright (C) -# This file is distributed under the same license as the Friendica nsfw addon package. +# This file is distributed under the same license as the Friendica twitter addon package. # # # Translators: -# Andreas H., 2014 -# hoergen , 2018 -# Tobias Diekershoff , 2014 +# Tobias Diekershoff , 2014-2015 # Tobias Diekershoff , 2018 +# Ulf Rompe , 2019 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-01 11:11-0400\n" -"PO-Revision-Date: 2018-06-09 09:27+0000\n" -"Last-Translator: hoergen \n" +"POT-Creation-Date: 2018-06-02 10:25+0700\n" +"PO-Revision-Date: 2019-02-11 13:54+0000\n" +"Last-Translator: Ulf Rompe \n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,44 +21,116 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: nsfw.php:77 nsfw.php:81 -msgid "Content Filter (NSFW and more)" -msgstr "Inhaltsfilter (NSFW und mehr)" +#: twitter.php:195 +msgid "Post to Twitter" +msgstr "Auf Twitter veröffentlichen" -#: nsfw.php:85 +#: twitter.php:236 msgid "" -"This addon searches for specified words/text in posts and collapses them. It" -" can be used to filter content tagged with for instance #NSFW that may be " -"deemed inappropriate at certain times or places, such as being at work. It " -"is also useful for hiding irrelevant or annoying content from direct view." -msgstr "Dieses Addon sucht, nach den von dir definierten Wörtern bzw. Texten in Beiträgen und klappt bei einem Treffer den gesamten Beitrag zusammen. Damit können z.B. Inhalte gefiltert werden, die mit #NSFW (Not Safe for Work, für die Arbeit unangemessene Beiträge), gekennzeichnet sind. Des Weiteren können damit natürlich auch nicht gewünschte und lästige Beiträge verborgen werden." +"You submitted an empty PIN, please Sign In with Twitter again to get a new " +"one." +msgstr "Du hast keine PIN übertragen. Bitte melde dich erneut bei Twitter an, um eine neue PIN zu erhalten." -#: nsfw.php:86 -msgid "Enable Content filter" -msgstr "Aktiviere den Inhaltsfilter" +#: twitter.php:263 +msgid "Twitter settings updated." +msgstr "Twitter-Einstellungen aktualisiert." -#: nsfw.php:89 -msgid "Comma separated list of keywords to hide" -msgstr "Durch Kommata getrennte Liste von Schlüsselwörtern die verborgen werden sollen" +#: twitter.php:293 twitter.php:297 +msgid "Twitter Import/Export/Mirror" +msgstr "Twitter-Import/Export/Spiegeln" -#: nsfw.php:93 +#: twitter.php:304 +msgid "" +"No consumer key pair for Twitter found. Please contact your site " +"administrator." +msgstr "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite." + +#: twitter.php:316 +msgid "" +"At this Friendica instance the Twitter addon was enabled but you have not " +"yet connected your account to your Twitter account. To do so click the " +"button below to get a PIN from Twitter which you have to copy into the input" +" box below and submit the form. Only your public posts will" +" be posted to Twitter." +msgstr "Auf diesem Friendica-Server wurde das Twitter-Addon aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur öffentliche Beiträge werden bei Twitter veröffentlicht." + +#: twitter.php:317 +msgid "Log in with Twitter" +msgstr "bei Twitter anmelden" + +#: twitter.php:319 +msgid "Copy the PIN from Twitter here" +msgstr "Kopiere die Twitter-PIN hier her" + +#: twitter.php:324 twitter.php:366 twitter.php:636 msgid "Save Settings" msgstr "Einstellungen speichern" -#: nsfw.php:94 -msgid "Use /expression/ to provide regular expressions" -msgstr "Verwende /expression/ um Reguläre Ausdrücke zu verwenden" +#: twitter.php:336 +msgid "Currently connected to: " +msgstr "Momentan verbunden mit: " -#: nsfw.php:109 -msgid "NSFW Settings saved." -msgstr "NSFW-Einstellungen gespeichert" +#: twitter.php:337 +msgid "Disconnect" +msgstr "Trennen" -#: nsfw.php:162 -#, php-format -msgid "Filtered tag: %s" -msgstr "Gefiltertes Schlagwort: %s" +#: twitter.php:347 +msgid "Allow posting to Twitter" +msgstr "Veröffentlichung bei Twitter erlauben" -#: nsfw.php:164 -#, php-format -msgid "Filtered word: %s" -msgstr "Gefilterter Begriff: %s" +#: twitter.php:347 +msgid "" +"If enabled all your public postings can be posted to the " +"associated Twitter account. You can choose to do so by default (here) or for" +" every posting separately in the posting options when writing the entry." +msgstr "Wenn aktiviert, können all deine öffentlichen Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen." + +#: twitter.php:350 +msgid "" +"Note: Due to your privacy settings (Hide your profile " +"details from unknown viewers?) the link potentially included in public " +"postings relayed to Twitter will lead the visitor to a blank page informing " +"the visitor that the access to your profile has been restricted." +msgstr "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an deinen Twitter-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde." + +#: twitter.php:353 +msgid "Send public postings to Twitter by default" +msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter" + +#: twitter.php:356 +msgid "Mirror all posts from twitter that are no replies" +msgstr "Spiegle alle Beiträge von Twitter, die keine Antworten oder wiederholten Nachrichten sind" + +#: twitter.php:359 +msgid "Import the remote timeline" +msgstr "Importiere die entfernte Zeitleiste" + +#: twitter.php:362 +msgid "Automatically create contacts" +msgstr "Automatisch Kontakte anlegen" + +#: twitter.php:362 +msgid "" +"This will automatically create a contact in Friendica as soon as you receive" +" a message from an existing contact via the Twitter network. If you do not " +"enable this, you need to manually add those Twitter contacts in Friendica " +"from whom you would like to see posts here. However if enabled, you cannot " +"merely remove a twitter contact from the Friendica contact list, as it will " +"recreate this contact when they post again." +msgstr "Mit dieser Option wird automatisch ein Kontakt bei Friendica angelegt, wenn du eine Nachricht von einem bestehenden Kontakt auf Twitter erhältst. Ist die Option nicht aktiv, musst du manuell Kontakte für diejenigen deiner Twitter Kontakte anlegen, deren Nachrichten du auf Friendica lesen möchtest.. Auf der anderen Seite kannst du, so diese Option aktiv ist, nicht einfach Twitter Kontakte aus deinen Kontakten bei Friendica entfernen, da diese bei der nächsten Gelegenheit neu erstellt werden." + +#: twitter.php:614 +msgid "Twitter post failed. Queued for retry." +msgstr "Veröffentlichung bei Twitter gescheitert. Wir versuchen es später erneut." + +#: twitter.php:628 +msgid "Settings updated." +msgstr "Einstellungen aktualisiert." + +#: twitter.php:638 +msgid "Consumer key" +msgstr "Consumer Key" + +#: twitter.php:639 +msgid "Consumer secret" +msgstr "Consumer Secret" diff --git a/twitter/lang/de/strings.php b/twitter/lang/de/strings.php index e1d04ad1..c518ee1c 100644 --- a/twitter/lang/de/strings.php +++ b/twitter/lang/de/strings.php @@ -6,12 +6,26 @@ function string_plural_select_de($n){ return ($n != 1);; }} ; -$a->strings["Content Filter (NSFW and more)"] = "Inhaltsfilter (NSFW und mehr)"; -$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "Dieses Addon sucht, nach den von dir definierten Wörtern bzw. Texten in Beiträgen und klappt bei einem Treffer den gesamten Beitrag zusammen. Damit können z.B. Inhalte gefiltert werden, die mit #NSFW (Not Safe for Work, für die Arbeit unangemessene Beiträge), gekennzeichnet sind. Des Weiteren können damit natürlich auch nicht gewünschte und lästige Beiträge verborgen werden."; -$a->strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter"; -$a->strings["Comma separated list of keywords to hide"] = "Durch Kommata getrennte Liste von Schlüsselwörtern die verborgen werden sollen"; +$a->strings["Post to Twitter"] = "Auf Twitter veröffentlichen"; +$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "Du hast keine PIN übertragen. Bitte melde dich erneut bei Twitter an, um eine neue PIN zu erhalten."; +$a->strings["Twitter settings updated."] = "Twitter-Einstellungen aktualisiert."; +$a->strings["Twitter Import/Export/Mirror"] = "Twitter-Import/Export/Spiegeln"; +$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite."; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Auf diesem Friendica-Server wurde das Twitter-Addon aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur öffentliche Beiträge werden bei Twitter veröffentlicht."; +$a->strings["Log in with Twitter"] = "bei Twitter anmelden"; +$a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter-PIN hier her"; $a->strings["Save Settings"] = "Einstellungen speichern"; -$a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um Reguläre Ausdrücke zu verwenden"; -$a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert"; -$a->strings["Filtered tag: %s"] = "Gefiltertes Schlagwort: %s"; -$a->strings["Filtered word: %s"] = "Gefilterter Begriff: %s"; +$a->strings["Currently connected to: "] = "Momentan verbunden mit: "; +$a->strings["Disconnect"] = "Trennen"; +$a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben"; +$a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, können all deine öffentlichen Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; +$a->strings["Note: Due to your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an deinen Twitter-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; +$a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"; +$a->strings["Mirror all posts from twitter that are no replies"] = "Spiegle alle Beiträge von Twitter, die keine Antworten oder wiederholten Nachrichten sind"; +$a->strings["Import the remote timeline"] = "Importiere die entfernte Zeitleiste"; +$a->strings["Automatically create contacts"] = "Automatisch Kontakte anlegen"; +$a->strings["This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again."] = "Mit dieser Option wird automatisch ein Kontakt bei Friendica angelegt, wenn du eine Nachricht von einem bestehenden Kontakt auf Twitter erhältst. Ist die Option nicht aktiv, musst du manuell Kontakte für diejenigen deiner Twitter Kontakte anlegen, deren Nachrichten du auf Friendica lesen möchtest.. Auf der anderen Seite kannst du, so diese Option aktiv ist, nicht einfach Twitter Kontakte aus deinen Kontakten bei Friendica entfernen, da diese bei der nächsten Gelegenheit neu erstellt werden."; +$a->strings["Twitter post failed. Queued for retry."] = "Veröffentlichung bei Twitter gescheitert. Wir versuchen es später erneut."; +$a->strings["Settings updated."] = "Einstellungen aktualisiert."; +$a->strings["Consumer key"] = "Consumer Key"; +$a->strings["Consumer secret"] = "Consumer Secret"; From e7d054c6d5c0666c591841f432cfca9e4072eab0 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 12 Sep 2019 21:48:02 -0400 Subject: [PATCH 15/20] [twitter] Add quoted tweet URL if its body is unavailable (blocked, muted, deleted) --- twitter/twitter.php | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index d846b1ad..317d7e28 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1162,7 +1162,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture) if ($url->url && $url->expanded_url && $url->display_url) { // Quote tweet, we just remove the quoted tweet URL from the body, the share block will be added later. - if (isset($item->quoted_status_id_str) + if (!empty($item->quoted_status) && isset($item->quoted_status_id_str) && substr($url->expanded_url, -strlen($item->quoted_status_id_str)) == $item->quoted_status_id_str ) { $body = str_replace($url->url, '', $body); continue; @@ -1539,20 +1539,21 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl if (!empty($post->quoted_status) && !$noquote) { $quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true); - if (empty($quoted['body'])) { - return []; + if (!empty($quoted['body'])) { + $postarray['body'] .= "\n" . share_header( + $quoted['author-name'], + $quoted['author-link'], + $quoted['author-avatar'], + "", + $quoted['created'], + $quoted['plink'] + ); + + $postarray['body'] .= $quoted['body'] . '[/share]'; + } else { + // Quoted post author is blocked/ignored, so we just provide the link to avoid removing quote context. + $postarray['body'] .= "\n\nhttps://twitter.com/" . $post->quoted_status->user->screen_name . "/status/" . $post->quoted_status->id_str; } - - $postarray['body'] .= "\n" . share_header( - $quoted['author-name'], - $quoted['author-link'], - $quoted['author-avatar'], - "", - $quoted['created'], - $quoted['plink'] - ); - - $postarray['body'] .= $quoted['body'] . '[/share]'; } return $postarray; From 14c6474980f69fad8ccbafd5988f60a7c54af28d Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 16 Sep 2019 04:08:50 +0000 Subject: [PATCH 16/20] Twitter: Better respect "create user" setting --- twitter/twitter.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index 317d7e28..176cb22b 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1036,6 +1036,7 @@ function twitter_fetch_contact($uid, $data, $create_user) $contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'alias' => "twitter::" . $data->id_str]); if (!DBA::isResult($contact) && !$create_user) { + Logger::info('User contact not found', ['uid' => $uid, 'twitter-id' => $data->id_str]); return 0; } @@ -1598,7 +1599,7 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection, if (!empty($posts)) { foreach ($posts as $post) { - $postarray = twitter_createpost($a, $uid, $post, $self, false, false, false); + $postarray = twitter_createpost($a, $uid, $post, $self, false, !PConfig::get($uid, 'twitter', 'create_user'), false); if (empty($postarray['body'])) { continue; @@ -1780,7 +1781,7 @@ function twitter_fetchhometimeline(App $a, $uid) twitter_fetchparentposts($a, $uid, $post, $connection, $self); } - $postarray = twitter_createpost($a, $uid, $post, $self, false, false, false); + $postarray = twitter_createpost($a, $uid, $post, $self, false, !$create_user, false); if (empty($postarray['body'])) { continue; From e2c7578734d58321c6c5b00de8cd52a00067bceb Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 21 Sep 2019 14:53:54 +0000 Subject: [PATCH 17/20] Fix notice in Twitter addon --- twitter/twitter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index 176cb22b..a43e8358 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -630,7 +630,7 @@ function twitter_post_hook(App $a, array &$b) $msg = Plaintext::shorten($msgarr["title"], $max_char - 50); } - if (($msgarr['url'] == $b['plink']) && !empty($msgarr['images']) && (count($msgarr['images']) <= 4)) { + if (!empty($msgarr['url']) && ($msgarr['url'] == $b['plink']) && !empty($msgarr['images']) && (count($msgarr['images']) <= 4)) { $url_added = false; } elseif (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) { $msg .= "\n" . $msgarr["url"]; From b9310fecfb84208d30fb92527f9901883d6bb035 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 25 Sep 2019 08:58:06 +0200 Subject: [PATCH 18/20] added ES translation for blockbot addon THX Julio Cova --- blockbot/lang/es/messages.po | 42 ++++++++++++++++++++++++++++++++++++ blockbot/lang/es/strings.php | 13 +++++++++++ 2 files changed, 55 insertions(+) create mode 100644 blockbot/lang/es/messages.po create mode 100644 blockbot/lang/es/strings.php diff --git a/blockbot/lang/es/messages.po b/blockbot/lang/es/messages.po new file mode 100644 index 00000000..2f7cd499 --- /dev/null +++ b/blockbot/lang/es/messages.po @@ -0,0 +1,42 @@ +# ADDON blockbot +# Copyright (C) +# This file is distributed under the same license as the Friendica blockbot addon package. +# +# +# Translators: +# Julio Cova, 2019 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-08-07 09:03+0200\n" +"PO-Revision-Date: 2019-08-07 07:43+0000\n" +"Last-Translator: Julio Cova, 2019\n" +"Language-Team: Spanish (https://www.transifex.com/Friendica/teams/12172/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: blockbot.php:35 +msgid "Save Settings" +msgstr "Guardar ajustes" + +#: blockbot.php:36 +msgid "Allow \"good\" crawlers" +msgstr "Permitir rastreadores web \"buenos\"" + +#: blockbot.php:37 +msgid "Block GabSocial" +msgstr "Bloquear GabSocial" + +#: blockbot.php:38 +msgid "Training mode" +msgstr "Modo de entrenamiento" + +#: blockbot.php:46 +msgid "Settings updated." +msgstr "Ajustes actualizados." diff --git a/blockbot/lang/es/strings.php b/blockbot/lang/es/strings.php new file mode 100644 index 00000000..813864c8 --- /dev/null +++ b/blockbot/lang/es/strings.php @@ -0,0 +1,13 @@ +strings["Save Settings"] = "Guardar ajustes"; +$a->strings["Allow \"good\" crawlers"] = "Permitir rastreadores web \"buenos\""; +$a->strings["Block GabSocial"] = "Bloquear GabSocial"; +$a->strings["Training mode"] = "Modo de entrenamiento"; +$a->strings["Settings updated."] = "Ajustes actualizados."; From 33e855493054d6b08db9249de055c89e3b527b09 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 27 Sep 2019 08:50:11 +0200 Subject: [PATCH 19/20] added EN GB translation of blockbot addon THX AndyH3 --- blockbot/lang/en-gb/messages.po | 42 +++++++++++++++++++++++++++++++++ blockbot/lang/en-gb/strings.php | 13 ++++++++++ 2 files changed, 55 insertions(+) create mode 100644 blockbot/lang/en-gb/messages.po create mode 100644 blockbot/lang/en-gb/strings.php diff --git a/blockbot/lang/en-gb/messages.po b/blockbot/lang/en-gb/messages.po new file mode 100644 index 00000000..b88c1123 --- /dev/null +++ b/blockbot/lang/en-gb/messages.po @@ -0,0 +1,42 @@ +# ADDON blockbot +# Copyright (C) +# This file is distributed under the same license as the Friendica blockbot addon package. +# +# +# Translators: +# Andy H3 , 2019 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-08-07 09:03+0200\n" +"PO-Revision-Date: 2019-08-07 07:43+0000\n" +"Last-Translator: Andy H3 , 2019\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" + +#: blockbot.php:35 +msgid "Save Settings" +msgstr "Save Settings" + +#: blockbot.php:36 +msgid "Allow \"good\" crawlers" +msgstr "Allow \"good\" crawlers" + +#: blockbot.php:37 +msgid "Block GabSocial" +msgstr "Block GabSocial" + +#: blockbot.php:38 +msgid "Training mode" +msgstr "Training mode" + +#: blockbot.php:46 +msgid "Settings updated." +msgstr "Settings updated." diff --git a/blockbot/lang/en-gb/strings.php b/blockbot/lang/en-gb/strings.php new file mode 100644 index 00000000..f5299bf5 --- /dev/null +++ b/blockbot/lang/en-gb/strings.php @@ -0,0 +1,13 @@ +strings["Save Settings"] = "Save Settings"; +$a->strings["Allow \"good\" crawlers"] = "Allow \"good\" crawlers"; +$a->strings["Block GabSocial"] = "Block GabSocial"; +$a->strings["Training mode"] = "Training mode"; +$a->strings["Settings updated."] = "Settings updated."; From 232a79057b9995b6463d4b96b8b2d1758887ac8a Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 28 Sep 2019 17:13:40 +0000 Subject: [PATCH 20/20] tumblr: Now using https instead of http for the endpoints --- tumblr/library/tumblroauth.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tumblr/library/tumblroauth.php b/tumblr/library/tumblroauth.php index 948b19b6..37da6142 100644 --- a/tumblr/library/tumblroauth.php +++ b/tumblr/library/tumblroauth.php @@ -15,7 +15,7 @@ class TumblrOAuth { /* Contains the last API call. */ public $url; /* Set up the API root URL. */ - public $host = "http://api.tumblr.com/v2/"; + public $host = "https://api.tumblr.com/v2/"; /* Set timeout default. */ public $timeout = 30; /* Set connect timeout. */ @@ -39,10 +39,10 @@ class TumblrOAuth { /** * Set API URLS */ - function accessTokenURL() { return 'http://www.tumblr.com/oauth/access_token'; } - function authenticateURL() { return 'http://www.tumblr.com/oauth/authorize'; } - function authorizeURL() { return 'http://www.tumblr.com/oauth/authorize'; } - function requestTokenURL() { return 'http://www.tumblr.com/oauth/request_token'; } + function accessTokenURL() { return 'https://www.tumblr.com/oauth/access_token'; } + function authenticateURL() { return 'https://www.tumblr.com/oauth/authorize'; } + function authorizeURL() { return 'https://www.tumblr.com/oauth/authorize'; } + function requestTokenURL() { return 'https://www.tumblr.com/oauth/request_token'; } /** * Debug helpers