Merge branch '2019.06-rc'

Author: MrPetovan

README.md

@@ -6,7 +6,7 @@ You can add these addons to the /addon directory of your Friendica installation
 
 After uploading the addons to your server, you need to activate the desired addons in the Admin panel. Addons not activated have no effect on your node.
 
-You can find more addons in the [Friendica Addon listing](https://addons.friendo.ca) in cases the addon developers have choosen not to include them here.
+You can find more addons in the [Friendica Addon listing](https://addons.friendi.ca) in cases the addon developers have choosen not to include them here.
 
 ## Connectors
 

advancedcontentfilter/lang/en-gb/messages.po

@@ -0,0 +1,175 @@
+# ADDON advancedcontentfilter
+# Copyright (C)
+# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
+# 
+# 
+# Translators:
+# Andy H3 <[email protected]>, 2019
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-04-17 04:04+0200\n"
+"PO-Revision-Date: 2018-05-24 06:41+0000\n"
+"Last-Translator: Andy H3 <[email protected]>, 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"
+
+#: advancedcontentfilter.php:134
+#, php-format
+msgid "Filtered by rule: %s"
+msgstr "Filtered by rule: %s"
+
+#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
+msgid "Advanced Content Filter"
+msgstr "Advanced Content Filter"
+
+#: advancedcontentfilter.php:203
+msgid "Back to Addon Settings"
+msgstr "Back to addon settings"
+
+#: advancedcontentfilter.php:205
+msgid "Add a Rule"
+msgstr "Add a rule"
+
+#: advancedcontentfilter.php:206
+msgid "Help"
+msgstr "Help"
+
+#: advancedcontentfilter.php:207
+msgid ""
+"Add and manage your personal content filter rules in this screen. Rules have"
+" a name and an arbitrary expression that will be matched against post data. "
+"For a complete reference of the available operations and variables, check "
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
+msgstr ""
+"Add and manage your personal content filter rules in this screen. Rules have"
+" a name and an arbitrary expression that will be matched against post data. "
+"For a complete reference of the available operations and variables, check "
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
+
+#: advancedcontentfilter.php:208
+msgid "Your rules"
+msgstr "Your rules"
+
+#: advancedcontentfilter.php:209
+msgid ""
+"You have no rules yet! Start adding one by clicking on the button above next"
+" to the title."
+msgstr ""
+"You have no rules yet! Start adding one by clicking on the button above next"
+" to the title."
+
+#: advancedcontentfilter.php:210
+msgid "Disabled"
+msgstr "Disabled"
+
+#: advancedcontentfilter.php:211
+msgid "Enabled"
+msgstr "Enabled"
+
+#: advancedcontentfilter.php:212
+msgid "Disable this rule"
+msgstr "Disable this rule"
+
+#: advancedcontentfilter.php:213
+msgid "Enable this rule"
+msgstr "Enable this rule"
+
+#: advancedcontentfilter.php:214
+msgid "Edit this rule"
+msgstr "Edit this rule"
+
+#: advancedcontentfilter.php:215
+msgid "Edit the rule"
+msgstr "Edit the rule"
+
+#: advancedcontentfilter.php:216
+msgid "Save this rule"
+msgstr "Save this rule"
+
+#: advancedcontentfilter.php:217
+msgid "Delete this rule"
+msgstr "Delete this rule"
+
+#: advancedcontentfilter.php:218
+msgid "Rule"
+msgstr "Rule"
+
+#: advancedcontentfilter.php:219
+msgid "Close"
+msgstr "Close"
+
+#: advancedcontentfilter.php:220
+msgid "Add new rule"
+msgstr "Add new rule"
+
+#: advancedcontentfilter.php:221
+msgid "Rule Name"
+msgstr "Rule name"
+
+#: advancedcontentfilter.php:222
+msgid "Rule Expression"
+msgstr "Rule expression"
+
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+"<p>Examples:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+
+#: advancedcontentfilter.php:224
+msgid "Cancel"
+msgstr "Cancel"
+
+#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
+#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
+#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
+msgid "You must be logged in to use this method"
+msgstr "You must be logged in to use this method"
+
+#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
+#: advancedcontentfilter.php:379
+msgid "Invalid form security token, please refresh the page."
+msgstr "Invalid form security token, please refresh the page."
+
+#: advancedcontentfilter.php:328
+msgid "The rule name and expression are required."
+msgstr "The rule name and expression are required."
+
+#: advancedcontentfilter.php:340
+msgid "Rule successfully added"
+msgstr "Rule successfully added"
+
+#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
+msgid "Rule doesn't exist or doesn't belong to you."
+msgstr "Rule doesn't exist or doesn't belong to you."
+
+#: advancedcontentfilter.php:369
+msgid "Rule successfully updated"
+msgstr "Rule successfully updated"
+
+#: advancedcontentfilter.php:390
+msgid "Rule successfully deleted"
+msgstr "Rule successfully deleted"
+
+#: advancedcontentfilter.php:400
+msgid "Missing argument: guid."
+msgstr "Missing argument: Global Unique Identifier (GUID)."
+
+#: advancedcontentfilter.php:406
+#, php-format
+msgid "Unknown post with guid: %s"
+msgstr "Unknown post with Global Unique Identifier (GUID): %s"
+
+#: src/middlewares.php:28
+msgid "Method not found"
+msgstr "Method not found"

advancedcontentfilter/lang/en-gb/strings.php

@@ -0,0 +1,41 @@
+<?php
+
+if(! function_exists("string_plural_select_en_gb")) {
+function string_plural_select_en_gb($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Filtered by rule: %s"] = "Filtered by rule: %s";
+$a->strings["Advanced Content Filter"] = "Advanced Content Filter";
+$a->strings["Back to Addon Settings"] = "Back to addon settings";
+$a->strings["Add a Rule"] = "Add a rule";
+$a->strings["Help"] = "Help";
+$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>.";
+$a->strings["Your rules"] = "Your rules";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "You have no rules yet! Start adding one by clicking on the button above next to the title.";
+$a->strings["Disabled"] = "Disabled";
+$a->strings["Enabled"] = "Enabled";
+$a->strings["Disable this rule"] = "Disable this rule";
+$a->strings["Enable this rule"] = "Enable this rule";
+$a->strings["Edit this rule"] = "Edit this rule";
+$a->strings["Edit the rule"] = "Edit the rule";
+$a->strings["Save this rule"] = "Save this rule";
+$a->strings["Delete this rule"] = "Delete this rule";
+$a->strings["Rule"] = "Rule";
+$a->strings["Close"] = "Close";
+$a->strings["Add new rule"] = "Add new rule";
+$a->strings["Rule Name"] = "Rule name";
+$a->strings["Rule Expression"] = "Rule expression";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
+$a->strings["Cancel"] = "Cancel";
+$a->strings["You must be logged in to use this method"] = "You must be logged in to use this method";
+$a->strings["Invalid form security token, please refresh the page."] = "Invalid form security token, please refresh the page.";
+$a->strings["The rule name and expression are required."] = "The rule name and expression are required.";
+$a->strings["Rule successfully added"] = "Rule successfully added";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Rule doesn't exist or doesn't belong to you.";
+$a->strings["Rule successfully updated"] = "Rule successfully updated";
+$a->strings["Rule successfully deleted"] = "Rule successfully deleted";
+$a->strings["Missing argument: guid."] = "Missing argument: Global Unique Identifier (GUID).";
+$a->strings["Unknown post with guid: %s"] = "Unknown post with Global Unique Identifier (GUID): %s";
+$a->strings["Method not found"] = "Method not found";

advancedcontentfilter/lang/sv/messages.po

@@ -4,7 +4,7 @@
 # 
 # 
 # Translators:
-# Torbjörn Andersson <[email protected]>, 2019
+# Bjoessi <[email protected]>, 2019
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-04-17 04:04+0200\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Torbjörn Andersson <[email protected]>, 2019\n"
+"Last-Translator: Bjoessi <[email protected]>, 2019\n"
 "Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr ""
 #: advancedcontentfilter.php:134
 #, php-format
 msgid "Filtered by rule: %s"
-msgstr ""
+msgstr "Filtrerat efter regel: %s"
 
 #: advancedcontentfilter.php:147 advancedcontentfilter.php:204
 msgid "Advanced Content Filter"
@@ -139,37 +139,37 @@ msgstr "Du måste vara inloggad för att använda den här funktionen"
 #: advancedcontentfilter.php:316 advancedcontentfilter.php:350
 #: advancedcontentfilter.php:379
 msgid "Invalid form security token, please refresh the page."
-msgstr ""
+msgstr "Felaktigt säkerhetsformulärstecken, vänligen uppdatera sidan."
 
 #: advancedcontentfilter.php:328
 msgid "The rule name and expression are required."
-msgstr ""
+msgstr "Regelns namn och uttryck krävs."
 
 #: advancedcontentfilter.php:340
 msgid "Rule successfully added"
-msgstr ""
+msgstr "Regeln kunde läggas till"
 
 #: advancedcontentfilter.php:354 advancedcontentfilter.php:383
 msgid "Rule doesn't exist or doesn't belong to you."
-msgstr ""
+msgstr "Regeln finns inte eller tillhör inte dig."
 
 #: advancedcontentfilter.php:369
 msgid "Rule successfully updated"
-msgstr ""
+msgstr "Uppdatering av regel lyckades"
 
 #: advancedcontentfilter.php:390
 msgid "Rule successfully deleted"
-msgstr ""
+msgstr "Borttagning av regel lyckades"
 
 #: advancedcontentfilter.php:400
 msgid "Missing argument: guid."
-msgstr ""
+msgstr "Argument saknas: guid."
 
 #: advancedcontentfilter.php:406
 #, php-format
 msgid "Unknown post with guid: %s"
-msgstr ""
+msgstr "Okänt inlägg med guid: %s"
 
 #: src/middlewares.php:28
 msgid "Method not found"
-msgstr ""
+msgstr "Metod hittades inte"

advancedcontentfilter/lang/sv/strings.php

@@ -6,7 +6,7 @@ function string_plural_select_sv($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Filtered by rule: %s"] = "";
+$a->strings["Filtered by rule: %s"] = "Filtrerat efter regel: %s";
 $a->strings["Advanced Content Filter"] = "Avancerat innehållsfiter";
 $a->strings["Back to Addon Settings"] = "TIllbaka till Tilläggsinställningar";
 $a->strings["Add a Rule"] = "Lägg till en regel";
@@ -30,12 +30,12 @@ function string_plural_select_sv($n){
 $a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Exempel:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>taggar</li></ul>";
 $a->strings["Cancel"] = "Avbryt";
 $a->strings["You must be logged in to use this method"] = "Du måste vara inloggad för att använda den här funktionen";
-$a->strings["Invalid form security token, please refresh the page."] = "";
-$a->strings["The rule name and expression are required."] = "";
-$a->strings["Rule successfully added"] = "";
-$a->strings["Rule doesn't exist or doesn't belong to you."] = "";
-$a->strings["Rule successfully updated"] = "";
-$a->strings["Rule successfully deleted"] = "";
-$a->strings["Missing argument: guid."] = "";
-$a->strings["Unknown post with guid: %s"] = "";
-$a->strings["Method not found"] = "";
+$a->strings["Invalid form security token, please refresh the page."] = "Felaktigt säkerhetsformulärstecken, vänligen uppdatera sidan.";
+$a->strings["The rule name and expression are required."] = "Regelns namn och uttryck krävs.";
+$a->strings["Rule successfully added"] = "Regeln kunde läggas till";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Regeln finns inte eller tillhör inte dig.";
+$a->strings["Rule successfully updated"] = "Uppdatering av regel lyckades";
+$a->strings["Rule successfully deleted"] = "Borttagning av regel lyckades";
+$a->strings["Missing argument: guid."] = "Argument saknas: guid.";
+$a->strings["Unknown post with guid: %s"] = "Okänt inlägg med guid: %s";
+$a->strings["Method not found"] = "Metod hittades inte";

blackout/lang/en-gb/messages.po

@@ -0,0 +1,67 @@
+# ADDON blackout
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blackout addon package.
+# 
+# 
+# Translators:
+# Andy H3 <[email protected]>, 2019
+# Kris, 2018
+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-06-05 14:40+0000\n"
+"Last-Translator: Andy H3 <[email protected]>\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"
+
+#: blackout.php:101
+msgid ""
+"The end-date is prior to the start-date of the blackout, you should fix this"
+msgstr "The end date is prior to the start date of the blackout, you should fix this"
+
+#: blackout.php:103
+#, php-format
+msgid ""
+"Please double check that the current settings for the blackout. Begin will "
+"be <strong>%s</strong> and it will end <strong>%s</strong>."
+msgstr "Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."
+
+#: blackout.php:106
+msgid "Save Settings"
+msgstr "Save Settings"
+
+#: blackout.php:107
+msgid "Redirect URL"
+msgstr "Redirect URL"
+
+#: blackout.php:107
+msgid "all your visitors from the web will be redirected to this URL"
+msgstr "Visitors from the web will be redirected to this URL"
+
+#: blackout.php:108
+msgid "Begin of the Blackout"
+msgstr "Blackout begins"
+
+#: blackout.php:108
+msgid ""
+"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
+"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
+msgstr "Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
+
+#: blackout.php:109
+msgid "End of the Blackout"
+msgstr "Blackout ends"
+
+#: blackout.php:111
+msgid ""
+"<strong>Note</strong>: The redirect will be active from the moment you press"
+" the submit button. Users currently logged in will <strong>not</strong> be "
+"thrown out but can't login again after logging out should the blackout is "
+"still in place."
+msgstr "<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be affected but can't login again after logging out should the blackout is still in place."