diff --git a/advancedcontentfilter/lang/C/messages.po b/advancedcontentfilter/lang/C/messages.po
index 74bbaeb1c..6ab34ba51 100644
--- a/advancedcontentfilter/lang/C/messages.po
+++ b/advancedcontentfilter/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-17 04:04+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,147 +17,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: advancedcontentfilter.php:134
+#: src/middlewares.php:49
+msgid "Method not found"
+msgstr ""
+
+#: advancedcontentfilter.php:136
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr ""
 
-#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
+#: advancedcontentfilter.php:150 advancedcontentfilter.php:207
 msgid "Advanced Content Filter"
 msgstr ""
 
-#: advancedcontentfilter.php:203
+#: advancedcontentfilter.php:206
 msgid "Back to Addon Settings"
 msgstr ""
 
-#: advancedcontentfilter.php:205
+#: advancedcontentfilter.php:208
 msgid "Add a Rule"
 msgstr ""
 
-#: advancedcontentfilter.php:206
+#: advancedcontentfilter.php:209
 msgid "Help"
 msgstr ""
 
-#: advancedcontentfilter.php:207
+#: advancedcontentfilter.php:210
 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>."
+"the help page."
 msgstr ""
 
-#: advancedcontentfilter.php:208
+#: advancedcontentfilter.php:211
 msgid "Your rules"
 msgstr ""
 
-#: advancedcontentfilter.php:209
+#: advancedcontentfilter.php:212
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next "
 "to the title."
 msgstr ""
 
-#: advancedcontentfilter.php:210
+#: advancedcontentfilter.php:213
 msgid "Disabled"
 msgstr ""
 
-#: advancedcontentfilter.php:211
+#: advancedcontentfilter.php:214
 msgid "Enabled"
 msgstr ""
 
-#: advancedcontentfilter.php:212
+#: advancedcontentfilter.php:215
 msgid "Disable this rule"
 msgstr ""
 
-#: advancedcontentfilter.php:213
+#: advancedcontentfilter.php:216
 msgid "Enable this rule"
 msgstr ""
 
-#: advancedcontentfilter.php:214
+#: advancedcontentfilter.php:217
 msgid "Edit this rule"
 msgstr ""
 
-#: advancedcontentfilter.php:215
+#: advancedcontentfilter.php:218
 msgid "Edit the rule"
 msgstr ""
 
-#: advancedcontentfilter.php:216
+#: advancedcontentfilter.php:219
 msgid "Save this rule"
 msgstr ""
 
-#: advancedcontentfilter.php:217
+#: advancedcontentfilter.php:220
 msgid "Delete this rule"
 msgstr ""
 
-#: advancedcontentfilter.php:218
+#: advancedcontentfilter.php:221
 msgid "Rule"
 msgstr ""
 
-#: advancedcontentfilter.php:219
+#: advancedcontentfilter.php:222
 msgid "Close"
 msgstr ""
 
-#: advancedcontentfilter.php:220
+#: advancedcontentfilter.php:223
 msgid "Add new rule"
 msgstr ""
 
-#: advancedcontentfilter.php:221
+#: advancedcontentfilter.php:224
 msgid "Rule Name"
 msgstr ""
 
-#: advancedcontentfilter.php:222
+#: advancedcontentfilter.php:225
 msgid "Rule Expression"
 msgstr ""
 
-#: 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 ""
-
-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:226
 msgid "Cancel"
 msgstr ""
 
-#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
-#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
-#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
+#: advancedcontentfilter.php:293 advancedcontentfilter.php:304
+#: advancedcontentfilter.php:315 advancedcontentfilter.php:349
+#: advancedcontentfilter.php:378 advancedcontentfilter.php:399
 msgid "You must be logged in to use this method"
 msgstr ""
 
-#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
-#: advancedcontentfilter.php:379
+#: advancedcontentfilter.php:319 advancedcontentfilter.php:353
+#: advancedcontentfilter.php:382
 msgid "Invalid form security token, please refresh the page."
 msgstr ""
 
-#: advancedcontentfilter.php:328
+#: advancedcontentfilter.php:331
 msgid "The rule name and expression are required."
 msgstr ""
 
-#: advancedcontentfilter.php:340
+#: advancedcontentfilter.php:343
 msgid "Rule successfully added"
 msgstr ""
 
-#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
+#: advancedcontentfilter.php:357 advancedcontentfilter.php:386
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr ""
 
-#: advancedcontentfilter.php:369
+#: advancedcontentfilter.php:372
 msgid "Rule successfully updated"
 msgstr ""
 
-#: advancedcontentfilter.php:390
+#: advancedcontentfilter.php:393
 msgid "Rule successfully deleted"
 msgstr ""
 
-#: advancedcontentfilter.php:400
+#: advancedcontentfilter.php:403
 msgid "Missing argument: guid."
 msgstr ""
 
-#: advancedcontentfilter.php:406
+#: advancedcontentfilter.php:411
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr ""
-
-#: src/middlewares.php:28
-msgid "Method not found"
-msgstr ""
diff --git a/advancedcontentfilter/lang/ca/strings.php b/advancedcontentfilter/lang/ca/strings.php
index 9afcfdb2a..3b02a4f38 100644
--- a/advancedcontentfilter/lang/ca/strings.php
+++ b/advancedcontentfilter/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Filtered by rule: %s"] = "Filtrat per regla: %s";
@@ -11,9 +11,7 @@ $a->strings["Advanced Content Filter"] = "Contingut avançat Filtre";
 $a->strings["Back to Addon Settings"] = "Torna Addon Configuració";
 $a->strings["Add a Rule"] = "Afegiu una regla";
 $a->strings["Help"] = "Ajuda";
-$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>."] = "Afegiu i gestioneu les vostres regles de filtre de contingut personal en aquesta pantalla. Les regles tenen un nom i una expressió arbitrària que es combinen amb les dades de la publicació. Per obtenir una referència completa de les variables i operacions disponibles, comproveu el botó <a href=\"advancedcontentfilter/help\">pàgina d’ajuda</a>.";
 $a->strings["Your rules"] = "Les seves normes";
-$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Encara no teniu normes. Comenceu a afegir-ne un fent clic al botó situat al costat del títol.";
 $a->strings["Disabled"] = "Desactivat";
 $a->strings["Enabled"] = "Permetre";
 $a->strings["Disable this rule"] = "Desactiva aquesta regla";
@@ -27,10 +25,8 @@ $a->strings["Close"] = "Tancar";
 $a->strings["Add new rule"] = "Add nova regla";
 $a->strings["Rule Name"] = "Nom de la regla";
 $a->strings["Rule Expression"] = "Expressió de regla";
-$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Exemples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
 $a->strings["Cancel"] = "cancel·lar";
 $a->strings["You must be logged in to use this method"] = "Per utilitzar aquest mètode, heu d’iniciar sessió";
-$a->strings["Invalid form security token, please refresh the page."] = "El testimoni de seguretat del formulari no és vàlid. Actualitza la pàgina";
 $a->strings["The rule name and expression are required."] = "El nom i l’expressió de la regla són obligatoris";
 $a->strings["Rule successfully added"] = "La regla s'ha afegit correctament";
 $a->strings["Rule doesn't exist or doesn't belong to you."] = "La regla no existeix o no us pertany.";
diff --git a/advancedcontentfilter/lang/cs/strings.php b/advancedcontentfilter/lang/cs/strings.php
index 08349a459..92d07f9cd 100644
--- a/advancedcontentfilter/lang/cs/strings.php
+++ b/advancedcontentfilter/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Filtered by rule: %s"] = "Filtrováno podle pravidla: %s";
@@ -11,9 +11,7 @@ $a->strings["Advanced Content Filter"] = "Rozšířený filtr obsahu";
 $a->strings["Back to Addon Settings"] = "Zpět na nastavení doplňku";
 $a->strings["Add a Rule"] = "Přidat pravidlo";
 $a->strings["Help"] = "Nápověda";
-$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>."] = "Přidávejte a spravujte Vaše osobní pravidla pro filtrování obsahu na této obrazovce. Pravidla mají název a libovolný výraz, který bude porovnán s daty příspěvku. Pro úplnou referenci dostupných operací a proměnných navštivte <a href=\"advancedcontentfilter/help\">stránku nápovědy</a>.";
 $a->strings["Your rules"] = "Vaše pravidla";
-$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Ještě nemáte žádná pravidla! Přidejte první kliknutím na tlačítko nahoře vedle nadpisu.";
 $a->strings["Disabled"] = "Zakázáno";
 $a->strings["Enabled"] = "Povoleno";
 $a->strings["Disable this rule"] = "Zakázat toto pravidlo";
@@ -27,7 +25,6 @@ $a->strings["Close"] = "Zavřít";
 $a->strings["Add new rule"] = "Přidat nové pravidlo";
 $a->strings["Rule Name"] = "Název pravidla";
 $a->strings["Rule Expression"] = "Výraz pravidla";
-$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Příklady:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
 $a->strings["Cancel"] = "Zrušit";
 $a->strings["You must be logged in to use this method"] = "Pro použití této metody musíte být přihlášen/a";
 $a->strings["Invalid form security token, please refresh the page."] = "Neplatná forma bezpečnostního tokenu, prosím obnovte stránku.";
diff --git a/advancedcontentfilter/lang/de/strings.php b/advancedcontentfilter/lang/de/strings.php
index 80b2ecd76..fef789b8e 100644
--- a/advancedcontentfilter/lang/de/strings.php
+++ b/advancedcontentfilter/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Filtered by rule: %s"] = "Nach dieser Regel gefiltert: %s";
@@ -11,9 +11,7 @@ $a->strings["Advanced Content Filter"] = "Erweiterter Inhaltsfilter";
 $a->strings["Back to Addon Settings"] = "Zurück zu den Addon Einstellungen";
 $a->strings["Add a Rule"] = "Eine Regel hinzufügen";
 $a->strings["Help"] = "Hilfe";
-$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>."] = "Auf dieser Seite kannst du deine persönlichen Filterregeln verwalten. Regeln müssen einen Namen und einen frei wählbaren Ausdruck besitzen. Dieser Ausdruck wird mit den Daten der Beiträge abgeglichen und diese dann gegebenenfalls gefiltert. Für eine Übersicht der verfügbaren Operatoren für die Filter, wirf bitte einen Blick auf die <a href=\"advancedcontentfilter/help\">Hilfsseite</a> des Addons.";
 $a->strings["Your rules"] = "Deine Regeln";
-$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Du hast bisher noch keine Regeln definiert. Um eine neue Regel zu erstellen, verwende bitte den Button neben dem Titel.";
 $a->strings["Disabled"] = "Deaktiviert";
 $a->strings["Enabled"] = "Aktiv";
 $a->strings["Disable this rule"] = "Diese Regel deaktivieren";
@@ -27,7 +25,6 @@ $a->strings["Close"] = "Schließen";
 $a->strings["Add new rule"] = "Neue Regel hinzufügen";
 $a->strings["Rule Name"] = "Name der Regel";
 $a->strings["Rule Expression"] = "Ausdruck der Regel";
-$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Ein Beispiel:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
 $a->strings["Cancel"] = "Abbrechen";
 $a->strings["You must be logged in to use this method"] = "Du musst angemeldet sein um diese Methode verwenden zu können ";
 $a->strings["Invalid form security token, please refresh the page."] = "Ungültiges Sciherheitstoken, bitte die Seite neu laden.";
diff --git a/advancedcontentfilter/lang/en-gb/strings.php b/advancedcontentfilter/lang/en-gb/strings.php
index 7fe5be6f7..08dac5ec8 100644
--- a/advancedcontentfilter/lang/en-gb/strings.php
+++ b/advancedcontentfilter/lang/en-gb/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Filtered by rule: %s"] = "Filtered by rule: %s";
@@ -11,9 +11,7 @@ $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";
@@ -27,7 +25,6 @@ $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.";
diff --git a/advancedcontentfilter/lang/fi/strings.php b/advancedcontentfilter/lang/fi/strings.php
index 17e3acc54..3bc841081 100644
--- a/advancedcontentfilter/lang/fi/strings.php
+++ b/advancedcontentfilter/lang/fi/strings.php
@@ -3,20 +3,13 @@
 if(! function_exists("string_plural_select_fi")) {
 function string_plural_select_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
-$a->strings["Filtered by rule: %s"] = "";
-$a->strings["Advanced Content Filter"] = "";
-$a->strings["Back to Addon Settings"] = "";
 $a->strings["Add a Rule"] = "Lisää sääntö";
-$a->strings["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>."] = "";
 $a->strings["Your rules"] = "Sääntösi";
-$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "";
 $a->strings["Disabled"] = "Ei käytössä";
 $a->strings["Enabled"] = "Käytössä";
-$a->strings["Disable this rule"] = "";
 $a->strings["Enable this rule"] = "Ota tämä sääntö käyttöön";
 $a->strings["Edit this rule"] = "Muokkaa tätä sääntöä";
 $a->strings["Edit the rule"] = "Muokkaa sääntöä";
@@ -25,17 +18,6 @@ $a->strings["Delete this rule"] = "Poista tämä sääntö";
 $a->strings["Rule"] = "Sääntö";
 $a->strings["Close"] = "Sulje";
 $a->strings["Add new rule"] = "Lisää uusi sääntö";
-$a->strings["Rule Name"] = "";
-$a->strings["Rule Expression"] = "";
-$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "";
-$a->strings["Cancel"] = "";
-$a->strings["You must be logged in to use this method"] = "";
-$a->strings["Invalid form security token, please refresh the page."] = "";
-$a->strings["The rule name and expression are required."] = "";
 $a->strings["Rule successfully added"] = "Sääntö lisätty";
-$a->strings["Rule doesn't exist or doesn't belong to you."] = "";
 $a->strings["Rule successfully updated"] = "Sääntö päivitetty";
 $a->strings["Rule successfully deleted"] = "Sääntö poistettu";
-$a->strings["Missing argument: guid."] = "";
-$a->strings["Unknown post with guid: %s"] = "";
-$a->strings["Method not found"] = "";
diff --git a/advancedcontentfilter/lang/fr/strings.php b/advancedcontentfilter/lang/fr/strings.php
index 95f39f66d..14ecc38c6 100644
--- a/advancedcontentfilter/lang/fr/strings.php
+++ b/advancedcontentfilter/lang/fr/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Filtered by rule: %s"] = "Filtré par règle:%s";
@@ -11,9 +11,7 @@ $a->strings["Advanced Content Filter"] = "Filtre avancé de contenu";
 $a->strings["Back to Addon Settings"] = "Retour aux paramètres de l'extension";
 $a->strings["Add a Rule"] = "Ajouter une règle";
 $a->strings["Help"] = "Aide";
-$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>."] = "Dans cet écran, ajoutez et gérez votre règle personnelle de filtre de contenu. Les règles portent un nom et contiennent une expression arbitraire qui sera appliquée aux données du post. Pour une liste complète des opérations disponibles, voyez la page d'aide";
 $a->strings["Your rules"] = "Vos règles";
-$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Vous n'avez encore aucune règle! Ajoutez-en une en cliquant le bouton au-dessus près du titre";
 $a->strings["Disabled"] = "Désactivé";
 $a->strings["Enabled"] = "Activé";
 $a->strings["Disable this rule"] = "Désactiver cette règle";
@@ -27,7 +25,6 @@ $a->strings["Close"] = "Fermer";
 $a->strings["Add new rule"] = "Ajouter nouvelle règle";
 $a->strings["Rule Name"] = "Nommer règle";
 $a->strings["Rule Expression"] = "Expression de règle";
-$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Exemples :</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
 $a->strings["Cancel"] = "Annuler";
 $a->strings["You must be logged in to use this method"] = "Vous devez être connecté pour utiliser cette méthode";
 $a->strings["Invalid form security token, please refresh the page."] = "Formulaire token de sécurité invalide, rafraîchissez la page";
diff --git a/advancedcontentfilter/lang/hu/strings.php b/advancedcontentfilter/lang/hu/strings.php
index 8c59617a7..727e1125b 100644
--- a/advancedcontentfilter/lang/hu/strings.php
+++ b/advancedcontentfilter/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Filtered by rule: %s"] = "Szűrve a szabály alapján: %s";
@@ -11,9 +11,7 @@ $a->strings["Advanced Content Filter"] = "Speciális tartalomszűrő";
 $a->strings["Back to Addon Settings"] = "Vissza a bővítménybeállításokhoz";
 $a->strings["Add a Rule"] = "Szabály hozzáadása";
 $a->strings["Help"] = "Súgó";
-$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>."] = "Személyes tartalomszűrő szabályok hozzáadása és kezelése ezen a képernyőn. A szabályoknak van nevük és egy tetszőleges kifejezésük, amely illesztve lesz a bejegyzés adatára. Az elérhető műveletek és változók teljes hivatkozásáért nézze meg a <a href=\"advancedcontentfilter/help\">súgóoldalt</a>.";
 $a->strings["Your rules"] = "Az Ön szabályai";
-$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Még nincsenek szabályai! Kezdje meg egy szabály hozzáadását a cím mellett lévő fenti gombra kattintva.";
 $a->strings["Disabled"] = "Letiltva";
 $a->strings["Enabled"] = "Engedélyezve";
 $a->strings["Disable this rule"] = "A szabály letiltása";
@@ -27,7 +25,6 @@ $a->strings["Close"] = "Bezárás";
 $a->strings["Add new rule"] = "Új szabály hozzáadása";
 $a->strings["Rule Name"] = "Szabály neve";
 $a->strings["Rule Expression"] = "Szabály kifejezése";
-$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Példák:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
 $a->strings["Cancel"] = "Mégse";
 $a->strings["You must be logged in to use this method"] = "Bejelentkezve kell lennie a módszer használatához";
 $a->strings["Invalid form security token, please refresh the page."] = "Érvénytelen űrlap biztonsági token. Frissítse az oldalt.";
diff --git a/advancedcontentfilter/lang/it/strings.php b/advancedcontentfilter/lang/it/strings.php
index b5ef1f08e..88cec9ec2 100644
--- a/advancedcontentfilter/lang/it/strings.php
+++ b/advancedcontentfilter/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Filtered by rule: %s"] = "Filtrato dalla regola: %s";
@@ -11,9 +11,7 @@ $a->strings["Advanced Content Filter"] = "Filtro Avanzato Contenuti";
 $a->strings["Back to Addon Settings"] = "Torna alle impostazioni del componente aggiuntivo";
 $a->strings["Add a Rule"] = "Aggiungi una regola";
 $a->strings["Help"] = "Aiuto";
-$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>."] = "Aggiungi e gestisci le tue regole personali di filtro contenuti in questa schermata. Le regole hanno un nome e un'espressione arbitraria che sarà confrontata con i dati del messaggio. Per un elenco completo delle operazioni disponibili, controlla la <a href=\"advancedcontentfilter/help\">pagina di aiuto</a>.";
 $a->strings["Your rules"] = "Le tue regole";
-$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Non hai ancora nessuna regola! Aggiungine una cliccando sul bottone qui sopra a fianco al titolo.";
 $a->strings["Disabled"] = "Disabilitato";
 $a->strings["Enabled"] = "Abilitato";
 $a->strings["Disable this rule"] = "Diabilita questa regola";
@@ -27,7 +25,6 @@ $a->strings["Close"] = "Chiudi";
 $a->strings["Add new rule"] = "Aggiungi nuova regola";
 $a->strings["Rule Name"] = "Nome Regola";
 $a->strings["Rule Expression"] = "Espressione Regola";
-$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Esempi:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
 $a->strings["Cancel"] = "Annulla";
 $a->strings["You must be logged in to use this method"] = "Devi essere autenticato per usare questo metodo";
 $a->strings["Invalid form security token, please refresh the page."] = "Token di sicurezza invalido, aggiorna la pagina.";
diff --git a/advancedcontentfilter/lang/nl/strings.php b/advancedcontentfilter/lang/nl/strings.php
index 6c40c028d..844d49333 100644
--- a/advancedcontentfilter/lang/nl/strings.php
+++ b/advancedcontentfilter/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Filtered by rule: %s"] = "Gefilterd volgens regel: %s";
@@ -11,9 +11,7 @@ $a->strings["Advanced Content Filter"] = "Geavanceerd filter voor berichtsinhoud
 $a->strings["Back to Addon Settings"] = "Terug naar Addon instellingen";
 $a->strings["Add a Rule"] = "Filterregel toevoegen";
 $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>."] = "Beheer de filterregels van je persoonlijke filter voor berichtsinhoud in dit scherm. Regels hebben een naam en bewoording welke we automatisch controleren door te vergelijken met de inhoud van elk bericht. Voor een compleet naslagwerk van de beschikbare bewerkingen en variabelen, zie de  <a href=\"advancedcontentfilter/help\">help pagina</a>.";
 $a->strings["Your rules"] = "Jouw regels";
-$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Je hebt nog geen regels! Klik op de knop bovenin naast de titel om een regel toe te voegen.";
 $a->strings["Disabled"] = "Uitgeschakeld";
 $a->strings["Enabled"] = "Geactiveerd";
 $a->strings["Disable this rule"] = "Deze regel uitschakelen";
@@ -27,7 +25,6 @@ $a->strings["Close"] = "Sluiten";
 $a->strings["Add new rule"] = "Voeg nieuwe regel toe";
 $a->strings["Rule Name"] = "Regel naam";
 $a->strings["Rule Expression"] = "Regel bewoording";
-$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Voorbeelden:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>label</li></ul>";
 $a->strings["Cancel"] = "Annuleren";
 $a->strings["You must be logged in to use this method"] = "Je moet ingelogd zijn om deze methode te gebruiken";
 $a->strings["Invalid form security token, please refresh the page."] = "Ongeldige formulier beveiligings token, vernieuw de pagina a.u.b.";
diff --git a/advancedcontentfilter/lang/pl/strings.php b/advancedcontentfilter/lang/pl/strings.php
index 0ddf8c450..f8bfcde48 100644
--- a/advancedcontentfilter/lang/pl/strings.php
+++ b/advancedcontentfilter/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Filtered by rule: %s"] = " Filtruj według reguły: %s";
@@ -11,9 +11,7 @@ $a->strings["Advanced Content Filter"] = "Zaawansowany filtr zawartości";
 $a->strings["Back to Addon Settings"] = "Powrót do ustawień dodatków";
 $a->strings["Add a Rule"] = "Dodaj regułę";
 $a->strings["Help"] = "Pomoc";
-$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>."] = "Dodaj i zarządzaj regułami filtrowania treści osobistych na tym ekranie. Reguły mają nazwę i dowolne wyrażenie, które zostanie dopasowane do danych postów. Aby uzyskać pełne informacje o dostępnych operacjach i zmiennych, sprawdź <a href=\"advancedcontentfilter/help\">stronę pomocy</a>.";
 $a->strings["Your rules"] = "Twoje zasady";
-$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Nie masz jeszcze żadnych zasad! Zacznij dodawać jedną, klikając przycisk znajdujący się nad tytułem.";
 $a->strings["Disabled"] = "Wyłącz";
 $a->strings["Enabled"] = "Włącz";
 $a->strings["Disable this rule"] = "Wyłącz tę regułę";
@@ -27,7 +25,6 @@ $a->strings["Close"] = "Zamknij";
 $a->strings["Add new rule"] = "Dodaj nową regułę";
 $a->strings["Rule Name"] = "Nazwa reguły";
 $a->strings["Rule Expression"] = "Wyrażanie reguły";
-$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>przykład</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tagi</li></ul>";
 $a->strings["Cancel"] = "Anuluj";
 $a->strings["You must be logged in to use this method"] = "Musisz być zalogowany, aby skorzystać z tej metody";
 $a->strings["Invalid form security token, please refresh the page."] = "Nieprawidłowy token zabezpieczający formularz, odśwież stronę.";
diff --git a/advancedcontentfilter/lang/ru/strings.php b/advancedcontentfilter/lang/ru/strings.php
index a650e3fd8..c61a7af62 100644
--- a/advancedcontentfilter/lang/ru/strings.php
+++ b/advancedcontentfilter/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Filtered by rule: %s"] = "Отфильтровано по правилу: %s";
@@ -11,9 +11,7 @@ $a->strings["Advanced Content Filter"] = "Расширенный фильтр с
 $a->strings["Back to Addon Settings"] = "Вернуться к настройкам дополнений";
 $a->strings["Add a Rule"] = "Добавить правило";
 $a->strings["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>."] = "Добавляйте и управляйте своими собственными фильтрами на этой странице. У правил есть имя и произвольное выражение, которое будет сопоставляться с данными поста. Для полной ссылки на доступные операции и переменные, посмотрите <a href=\"advancedcontentfilter/help\">страницу справки</a>.";
 $a->strings["Your rules"] = "Ваши правила";
-$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "У Вас нет ни одного правила. Начните добавление первого с нажатия на кнопку выше, рядом с названием.";
 $a->strings["Disabled"] = "Отключено";
 $a->strings["Enabled"] = "Включено";
 $a->strings["Disable this rule"] = "Отключить это правило";
@@ -27,7 +25,6 @@ $a->strings["Close"] = "Закрыть";
 $a->strings["Add new rule"] = "Добавить новое правило";
 $a->strings["Rule Name"] = "Название правила";
 $a->strings["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>Примеры:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
 $a->strings["Cancel"] = "Отмена";
 $a->strings["You must be logged in to use this method"] = "Вы должны авторизоваться для использования этого метода";
 $a->strings["Invalid form security token, please refresh the page."] = "Неверный ключ, пожалуйста, перезагрузите страницу";
diff --git a/advancedcontentfilter/lang/sv/strings.php b/advancedcontentfilter/lang/sv/strings.php
index 8ceea2db4..4465fe472 100644
--- a/advancedcontentfilter/lang/sv/strings.php
+++ b/advancedcontentfilter/lang/sv/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_sv")) {
 function string_plural_select_sv($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Filtered by rule: %s"] = "Filtrerat efter regel: %s";
@@ -11,9 +11,7 @@ $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";
 $a->strings["Help"] = "Hjälp";
-$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>."] = "Lägg till och hantera dina personliga regler för innehållsfilter i det här fönstret. Regler har ett namn och ett valfritt uttryck och kommer jämföras mot inläggets innehåll. Förteckning av alla operander och variabler finns att hitta på <a href=\"advancedcontentfilter/help\">hjälpsidan</a>.";
 $a->strings["Your rules"] = "Dina regler";
-$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Du har inga regler än! Lägg till regler genom att klicka på knappen ovanför, bredvid överskriften.";
 $a->strings["Disabled"] = "Inaktiverad";
 $a->strings["Enabled"] = "Aktiverad";
 $a->strings["Disable this rule"] = "Inaktivera den här regeln";
@@ -27,7 +25,6 @@ $a->strings["Close"] = "Stäng";
 $a->strings["Add new rule"] = "Lägg till ny regel";
 $a->strings["Rule Name"] = "Regelnamn";
 $a->strings["Rule Expression"] = "Regeluttryck";
-$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."] = "Felaktigt säkerhetsformulärstecken, vänligen uppdatera sidan.";
diff --git a/advancedcontentfilter/lang/zh-cn/strings.php b/advancedcontentfilter/lang/zh-cn/strings.php
index a51e68503..ff7e1fa43 100644
--- a/advancedcontentfilter/lang/zh-cn/strings.php
+++ b/advancedcontentfilter/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Filtered by rule: %s"] = "通过规则过滤：%s";
@@ -11,7 +11,6 @@ $a->strings["Advanced Content Filter"] = "高级内容过滤";
 $a->strings["Back to Addon Settings"] = "返回扩展设置";
 $a->strings["Add a Rule"] = "添加规则";
 $a->strings["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>."] = "在此界面上添加和管理你的个人内容过滤规则。规则要有名称和能匹配帖子内容的任意表达式。完整可用的运算符和变量，请查看<a href=\"advancedcontentfilter/help\">帮助页面</a>。";
 $a->strings["Your rules"] = "你的规则";
 $a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "你还没有规则！点击标题上方的按钮开始新增规则。";
 $a->strings["Disabled"] = "禁用";
@@ -27,7 +26,6 @@ $a->strings["Close"] = "关闭";
 $a->strings["Add new rule"] = "新增规则";
 $a->strings["Rule Name"] = "规则名";
 $a->strings["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>例子：</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite</pre></li><li>tags</li></ul>";
 $a->strings["Cancel"] = "取消";
 $a->strings["You must be logged in to use this method"] = "使用此模式您必须先登录。";
 $a->strings["Invalid form security token, please refresh the page."] = "无效的安全令牌，请刷新页面。";
diff --git a/blackout/lang/C/messages.po b/blackout/lang/C/messages.po
index 688e8bb04..6ae15759e 100644
--- a/blackout/lang/C/messages.po
+++ b/blackout/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-23 01:34-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/blackout/lang/ca/strings.php b/blackout/lang/ca/strings.php
index 20c8c1daf..62a0a85cc 100644
--- a/blackout/lang/ca/strings.php
+++ b/blackout/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "La data de finalització és anterior a la data d'inici de l'apagada, hauríeu d'arreglar-ho";
diff --git a/blackout/lang/cs/strings.php b/blackout/lang/cs/strings.php
index c38d70657..460d87726 100644
--- a/blackout/lang/cs/strings.php
+++ b/blackout/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "Datum konce odstávky je před datem zahájení odstávky, prosím opravte to";
diff --git a/blackout/lang/en-gb/strings.php b/blackout/lang/en-gb/strings.php
index 18b615943..b4df35163 100644
--- a/blackout/lang/en-gb/strings.php
+++ b/blackout/lang/en-gb/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "The end date is prior to the start date of the blackout, you should fix this";
diff --git a/blackout/lang/en-us/strings.php b/blackout/lang/en-us/strings.php
index 705163ab6..d8ee9f98a 100644
--- a/blackout/lang/en-us/strings.php
+++ b/blackout/lang/en-us/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_en_us")) {
 function string_plural_select_en_us($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Save Settings"] = "Save Settings";
diff --git a/blackout/lang/es/strings.php b/blackout/lang/es/strings.php
index 867a8c9bc..9ac9e6e45 100644
--- a/blackout/lang/es/strings.php
+++ b/blackout/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Save Settings"] = "Guardar configuración";
diff --git a/blackout/lang/fi-fi/strings.php b/blackout/lang/fi-fi/strings.php
index 898e730f9..cd6dcfdcb 100644
--- a/blackout/lang/fi-fi/strings.php
+++ b/blackout/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Save Settings"] = "Tallenna asetukset";
diff --git a/blackout/lang/fr/strings.php b/blackout/lang/fr/strings.php
index f60d599d3..71fdd5156 100644
--- a/blackout/lang/fr/strings.php
+++ b/blackout/lang/fr/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "La date de fin est antérieure au début de l'extinction, vous devriez corriger cela.";
diff --git a/blackout/lang/hu/strings.php b/blackout/lang/hu/strings.php
index f0a29771c..6fdd59242 100644
--- a/blackout/lang/hu/strings.php
+++ b/blackout/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "A befejezési dátum az áramszünet kezdési dátuma előtt van, ezt javítania kell.";
diff --git a/blackout/lang/is/strings.php b/blackout/lang/is/strings.php
index 41980a4d0..102e475e7 100644
--- a/blackout/lang/is/strings.php
+++ b/blackout/lang/is/strings.php
@@ -3,13 +3,7 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return ($n % 10 != 1 || $n % 100 == 11);;
+	return intval($n % 10 != 1 || $n % 100 == 11);
 }}
 ;
 $a->strings["Save Settings"] = "Vista stillingar";
-$a->strings["Redirect URL"] = "";
-$a->strings["all your visitors from the web will be redirected to this URL"] = "";
-$a->strings["Begin of the Blackout"] = "";
-$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "";
-$a->strings["End of the Blackout"] = "";
-$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "";
diff --git a/blackout/lang/it/strings.php b/blackout/lang/it/strings.php
index 6aa8b95e3..5237193c3 100644
--- a/blackout/lang/it/strings.php
+++ b/blackout/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "La data di fine è precedente alla data di inizio blackout, dovresti sistemarle";
diff --git a/blackout/lang/ja/strings.php b/blackout/lang/ja/strings.php
index 820f8e4a9..51889f384 100644
--- a/blackout/lang/ja/strings.php
+++ b/blackout/lang/ja/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ja")) {
 function string_plural_select_ja($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "終了日はブラックアウトの開始日より前です。これを修正する必要があります";
diff --git a/blackout/lang/nl/strings.php b/blackout/lang/nl/strings.php
index 8311c07e5..6a49746e2 100644
--- a/blackout/lang/nl/strings.php
+++ b/blackout/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Save Settings"] = "Instellingen opslaan";
diff --git a/blackout/lang/pl/strings.php b/blackout/lang/pl/strings.php
index 7b1c3daed..38a15da9e 100644
--- a/blackout/lang/pl/strings.php
+++ b/blackout/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "Data zakończenia jest przed datą rozpoczęcia, powinieneś to naprawić";
diff --git a/blackout/lang/ro/strings.php b/blackout/lang/ro/strings.php
index 498f7c3e3..373bb845d 100644
--- a/blackout/lang/ro/strings.php
+++ b/blackout/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/blackout/lang/ru/strings.php b/blackout/lang/ru/strings.php
index 9dc1ddf1b..13414bc2e 100644
--- a/blackout/lang/ru/strings.php
+++ b/blackout/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "Дата начала позже даты окончания, исправьте это";
diff --git a/blackout/lang/sv/strings.php b/blackout/lang/sv/strings.php
index d7eadfd45..2ec234df5 100644
--- a/blackout/lang/sv/strings.php
+++ b/blackout/lang/sv/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_sv")) {
 function string_plural_select_sv($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "Slutdatumet ligger före startdatumet för nedsläckningen, du bör rätta detta.";
diff --git a/blackout/lang/zh-cn/strings.php b/blackout/lang/zh-cn/strings.php
index 8027bc0b3..5e615761d 100644
--- a/blackout/lang/zh-cn/strings.php
+++ b/blackout/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "结束日期早于开始日期，您应该修复此问题";
diff --git a/blockbot/lang/C/messages.po b/blockbot/lang/C/messages.po
index 1bdd56a7e..79f5d1b54 100644
--- a/blockbot/lang/C/messages.po
+++ b/blockbot/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-07 09:03+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,22 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: blockbot.php:35
+#: blockbot.php:29
 msgid "Save Settings"
 msgstr ""
 
-#: blockbot.php:36
+#: blockbot.php:30
 msgid "Allow \"good\" crawlers"
 msgstr ""
 
-#: blockbot.php:37
+#: blockbot.php:31
 msgid "Block GabSocial"
 msgstr ""
 
-#: blockbot.php:38
+#: blockbot.php:32
 msgid "Training mode"
 msgstr ""
-
-#: blockbot.php:46
-msgid "Settings updated."
-msgstr ""
diff --git a/blockbot/lang/ca/strings.php b/blockbot/lang/ca/strings.php
index 3f95ee05c..fede984bf 100644
--- a/blockbot/lang/ca/strings.php
+++ b/blockbot/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Save Settings"] = "Desa la configuració";
diff --git a/blockbot/lang/cs/strings.php b/blockbot/lang/cs/strings.php
index d3c5a2dd3..bceaa9944 100644
--- a/blockbot/lang/cs/strings.php
+++ b/blockbot/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Save Settings"] = "Uložit nastavení";
diff --git a/blockbot/lang/de/strings.php b/blockbot/lang/de/strings.php
index db52f710f..a711078fc 100644
--- a/blockbot/lang/de/strings.php
+++ b/blockbot/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/blockbot/lang/en-gb/strings.php b/blockbot/lang/en-gb/strings.php
index f5299bf51..5bca00a5e 100644
--- a/blockbot/lang/en-gb/strings.php
+++ b/blockbot/lang/en-gb/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Save Settings"] = "Save Settings";
diff --git a/blockbot/lang/es/strings.php b/blockbot/lang/es/strings.php
index 813864c8b..5eef3effb 100644
--- a/blockbot/lang/es/strings.php
+++ b/blockbot/lang/es/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Save Settings"] = "Guardar ajustes";
diff --git a/blockbot/lang/fr/strings.php b/blockbot/lang/fr/strings.php
index 1597735ac..e9dfcc10a 100644
--- a/blockbot/lang/fr/strings.php
+++ b/blockbot/lang/fr/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Save Settings"] = "Enregistrer les Paramètres";
diff --git a/blockbot/lang/hu/strings.php b/blockbot/lang/hu/strings.php
index 40a4564ab..244bfa144 100644
--- a/blockbot/lang/hu/strings.php
+++ b/blockbot/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Save Settings"] = "Beállítások mentése";
diff --git a/blockbot/lang/it/strings.php b/blockbot/lang/it/strings.php
index 64de6d409..49339fd52 100644
--- a/blockbot/lang/it/strings.php
+++ b/blockbot/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Save Settings"] = "Salva Impostazioni";
diff --git a/blockbot/lang/nl/strings.php b/blockbot/lang/nl/strings.php
index 18d9c2ccc..fdde083af 100644
--- a/blockbot/lang/nl/strings.php
+++ b/blockbot/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Save Settings"] = "Instellingen opslaan";
diff --git a/blockbot/lang/pl/strings.php b/blockbot/lang/pl/strings.php
index 0eafbcafb..6128cc7b8 100644
--- a/blockbot/lang/pl/strings.php
+++ b/blockbot/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Save Settings"] = "Zapisz ustawienia";
diff --git a/blockbot/lang/ru/strings.php b/blockbot/lang/ru/strings.php
index 5467b0dd4..418498f94 100644
--- a/blockbot/lang/ru/strings.php
+++ b/blockbot/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Save Settings"] = "Сохранить настройки";
diff --git a/blockem/lang/C/messages.po b/blockem/lang/C/messages.po
index 95fa643b0..1d9ed121a 100644
--- a/blockem/lang/C/messages.po
+++ b/blockem/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-17 10:23+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,41 +17,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: blockem.php:54 blockem.php:58
+#: blockem.php:42 blockem.php:46
 msgid "Blockem"
 msgstr ""
 
-#: blockem.php:62
+#: blockem.php:50
 msgid ""
 "Hides user's content by collapsing posts. Also replaces their avatar with "
 "generic image."
 msgstr ""
 
-#: blockem.php:63
+#: blockem.php:51
 msgid "Comma separated profile URLS:"
 msgstr ""
 
-#: blockem.php:67
+#: blockem.php:55
 msgid "Save Settings"
 msgstr ""
 
-#: blockem.php:81
-msgid "BLOCKEM Settings saved."
-msgstr ""
-
-#: blockem.php:143
+#: blockem.php:131
 #, php-format
 msgid "Filtered user: %s"
 msgstr ""
 
-#: blockem.php:202
+#: blockem.php:190
 msgid "Unblock Author"
 msgstr ""
 
-#: blockem.php:204
+#: blockem.php:192
 msgid "Block Author"
 msgstr ""
-
-#: blockem.php:244
-msgid "blockem settings updated"
-msgstr ""
diff --git a/blockem/lang/ca/strings.php b/blockem/lang/ca/strings.php
index 057a6019d..5e6975974 100644
--- a/blockem/lang/ca/strings.php
+++ b/blockem/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Blockem"] = "Blockem";
diff --git a/blockem/lang/cs/strings.php b/blockem/lang/cs/strings.php
index 495b9610a..537fddf14 100644
--- a/blockem/lang/cs/strings.php
+++ b/blockem/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Blockem"] = "Blockem";
diff --git a/blockem/lang/de/strings.php b/blockem/lang/de/strings.php
index 60c038589..ea0d0ef33 100644
--- a/blockem/lang/de/strings.php
+++ b/blockem/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Blockem"] = "Blockem";
diff --git a/blockem/lang/en-gb/strings.php b/blockem/lang/en-gb/strings.php
index d31cebe79..90af4761f 100644
--- a/blockem/lang/en-gb/strings.php
+++ b/blockem/lang/en-gb/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Blockem\""] = "\"Blockem\"";
diff --git a/blockem/lang/en-us/strings.php b/blockem/lang/en-us/strings.php
index ed20379a6..b7e92762d 100644
--- a/blockem/lang/en-us/strings.php
+++ b/blockem/lang/en-us/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_en_us")) {
 function string_plural_select_en_us($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Blockem\""] = "Blockem";
diff --git a/blockem/lang/es/strings.php b/blockem/lang/es/strings.php
index 77604fe5e..a7f70b0be 100644
--- a/blockem/lang/es/strings.php
+++ b/blockem/lang/es/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Blockem\""] = "\"Bloquealos\"";
diff --git a/blockem/lang/fi-fi/strings.php b/blockem/lang/fi-fi/strings.php
index b2403e8ae..4c866a728 100644
--- a/blockem/lang/fi-fi/strings.php
+++ b/blockem/lang/fi-fi/strings.php
@@ -2,11 +2,11 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Blockem\""] = "\"Blockem\"";
-$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "";
 $a->strings["Comma separated profile URLS:"] = "Profiilien URL-osoitteet pilkulla erotettuina:";
 $a->strings["Save Settings"] = "Tallenna asetukset";
 $a->strings["BLOCKEM Settings saved."] = "Blockem -asetukset tallennettu";
diff --git a/blockem/lang/fr/strings.php b/blockem/lang/fr/strings.php
index cc2d366f3..00dccda6d 100644
--- a/blockem/lang/fr/strings.php
+++ b/blockem/lang/fr/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Blockem"] = "Bloquez-les";
diff --git a/blockem/lang/hu/strings.php b/blockem/lang/hu/strings.php
index addba1fa4..b0ad2a91f 100644
--- a/blockem/lang/hu/strings.php
+++ b/blockem/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Blockem"] = "Blockem";
diff --git a/blockem/lang/it/strings.php b/blockem/lang/it/strings.php
index 59e4a0f72..6a82e821a 100644
--- a/blockem/lang/it/strings.php
+++ b/blockem/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Blockem"] = "Blockem";
diff --git a/blockem/lang/nl/strings.php b/blockem/lang/nl/strings.php
index b74cc1404..d31cb87ac 100644
--- a/blockem/lang/nl/strings.php
+++ b/blockem/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Blockem"] = "Blockem";
diff --git a/blockem/lang/pl/strings.php b/blockem/lang/pl/strings.php
index 08e1cf4d8..4569c0e37 100644
--- a/blockem/lang/pl/strings.php
+++ b/blockem/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Blockem"] = "Zablokowanie";
diff --git a/blockem/lang/ro/strings.php b/blockem/lang/ro/strings.php
index b842467d9..c9af076e2 100644
--- a/blockem/lang/ro/strings.php
+++ b/blockem/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["\"Blockem\""] = "\"Blockem\"";
diff --git a/blockem/lang/ru/strings.php b/blockem/lang/ru/strings.php
index 9510f68e4..2aaabe0a0 100644
--- a/blockem/lang/ru/strings.php
+++ b/blockem/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Blockem"] = "Blockem";
diff --git a/blockem/lang/sv/strings.php b/blockem/lang/sv/strings.php
index 9685ad8be..b44614ff9 100644
--- a/blockem/lang/sv/strings.php
+++ b/blockem/lang/sv/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_sv")) {
 function string_plural_select_sv($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Blockem"] = "BLOCKEM";
diff --git a/blogger/lang/C/messages.po b/blogger/lang/C/messages.po
index f04bbb392..025350cf4 100644
--- a/blogger/lang/C/messages.po
+++ b/blogger/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: blogger.php:42
+#: blogger.php:37
 msgid "Post to blogger"
 msgstr ""
 
-#: blogger.php:74 blogger.php:78
+#: blogger.php:71 blogger.php:75
 msgid "Blogger Export"
 msgstr ""
 
-#: blogger.php:82
+#: blogger.php:79
 msgid "Enable Blogger Post Addon"
 msgstr ""
 
-#: blogger.php:87
+#: blogger.php:84
 msgid "Blogger username"
 msgstr ""
 
-#: blogger.php:92
+#: blogger.php:89
 msgid "Blogger password"
 msgstr ""
 
-#: blogger.php:97
+#: blogger.php:94
 msgid "Blogger API URL"
 msgstr ""
 
-#: blogger.php:102
+#: blogger.php:99
 msgid "Post to Blogger by default"
 msgstr ""
 
-#: blogger.php:108
+#: blogger.php:104
 msgid "Save Settings"
 msgstr ""
 
-#: blogger.php:178
+#: blogger.php:188
 msgid "Post from Friendica"
 msgstr ""
diff --git a/blogger/lang/ca/strings.php b/blogger/lang/ca/strings.php
index afac5d7fc..e48bbfdac 100644
--- a/blogger/lang/ca/strings.php
+++ b/blogger/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to blogger"] = "Publicar a blogger";
diff --git a/blogger/lang/cs/strings.php b/blogger/lang/cs/strings.php
index 4ce612a7a..8f2ecad21 100644
--- a/blogger/lang/cs/strings.php
+++ b/blogger/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to blogger"] = "Poslat na blogger";
diff --git a/blogger/lang/de/strings.php b/blogger/lang/de/strings.php
index 549b6a2ba..548d6a8c7 100644
--- a/blogger/lang/de/strings.php
+++ b/blogger/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to blogger"] = "Auf Blogger posten";
diff --git a/blogger/lang/en-gb/strings.php b/blogger/lang/en-gb/strings.php
index 4a02842e4..6a98ab6aa 100644
--- a/blogger/lang/en-gb/strings.php
+++ b/blogger/lang/en-gb/strings.php
@@ -2,15 +2,14 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to blogger"] = "Post to Blogger";
-$a->strings["Blogger Export"] = "";
 $a->strings["Enable Blogger Post Addon"] = "Enable Blogger Post Addon";
 $a->strings["Blogger username"] = "Blogger username";
 $a->strings["Blogger password"] = "Blogger password";
-$a->strings["Blogger API URL"] = "";
 $a->strings["Post to Blogger by default"] = "Post to Blogger by default";
 $a->strings["Save Settings"] = "Save Settings";
 $a->strings["Post from Friendica"] = "Post from Friendica";
diff --git a/blogger/lang/es/strings.php b/blogger/lang/es/strings.php
index 52b4f120f..041a99330 100644
--- a/blogger/lang/es/strings.php
+++ b/blogger/lang/es/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to blogger"] = "Entrada para blogger";
diff --git a/blogger/lang/fi-fi/strings.php b/blogger/lang/fi-fi/strings.php
index 115518ad7..bd31e23f9 100644
--- a/blogger/lang/fi-fi/strings.php
+++ b/blogger/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to blogger"] = "Julkaise Bloggerissa";
diff --git a/blogger/lang/fr/strings.php b/blogger/lang/fr/strings.php
index a1500c11f..873ff88fd 100644
--- a/blogger/lang/fr/strings.php
+++ b/blogger/lang/fr/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Post to blogger"] = "Poster sur Blogger";
diff --git a/blogger/lang/hu/strings.php b/blogger/lang/hu/strings.php
index 433f504c0..a2e253114 100644
--- a/blogger/lang/hu/strings.php
+++ b/blogger/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to blogger"] = "Beküldés a Bloggerre";
diff --git a/blogger/lang/is/strings.php b/blogger/lang/is/strings.php
index 5e61af39a..05cd517c7 100644
--- a/blogger/lang/is/strings.php
+++ b/blogger/lang/is/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return ($n % 10 != 1 || $n % 100 == 11);;
+	return intval($n % 10 != 1 || $n % 100 == 11);
 }}
 ;
 $a->strings["Post to blogger"] = "Senda færslu á bloggara";
diff --git a/blogger/lang/it/strings.php b/blogger/lang/it/strings.php
index 80b7b5fae..bd5750478 100644
--- a/blogger/lang/it/strings.php
+++ b/blogger/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to blogger"] = "Invia a Blogger";
diff --git a/blogger/lang/nl/strings.php b/blogger/lang/nl/strings.php
index dd1eeb777..5954ceaef 100644
--- a/blogger/lang/nl/strings.php
+++ b/blogger/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to blogger"] = "Plaatsen op Blogger";
diff --git a/blogger/lang/pl/strings.php b/blogger/lang/pl/strings.php
index a04459000..d64016760 100644
--- a/blogger/lang/pl/strings.php
+++ b/blogger/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to blogger"] = "Opublikuj w bloggerze";
diff --git a/blogger/lang/pt-br/strings.php b/blogger/lang/pt-br/strings.php
index 74a79acad..45c6ba1bc 100644
--- a/blogger/lang/pt-br/strings.php
+++ b/blogger/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Post to blogger"] = "Publicar no Blogger";
diff --git a/blogger/lang/ro/strings.php b/blogger/lang/ro/strings.php
index f6aac95de..77dc8cf87 100644
--- a/blogger/lang/ro/strings.php
+++ b/blogger/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Post to blogger"] = "Postați pe Blogger";
diff --git a/blogger/lang/ru/strings.php b/blogger/lang/ru/strings.php
index c90b73e5a..d8743f032 100644
--- a/blogger/lang/ru/strings.php
+++ b/blogger/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to blogger"] = "Написать в Blogger";
diff --git a/blogger/lang/sv/strings.php b/blogger/lang/sv/strings.php
index 6bb652dd2..c7bf45119 100644
--- a/blogger/lang/sv/strings.php
+++ b/blogger/lang/sv/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_sv")) {
 function string_plural_select_sv($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to blogger"] = "Lägg in på Blogger";
diff --git a/buffer/lang/C/messages.po b/buffer/lang/C/messages.po
index 3d5193379..cd5087732 100644
--- a/buffer/lang/C/messages.po
+++ b/buffer/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,58 +17,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buffer.php:31
+#: buffer.php:39
 msgid "Permission denied."
 msgstr ""
 
-#: buffer.php:57 buffer.php:185
+#: buffer.php:68 buffer.php:216
 msgid "Save Settings"
 msgstr ""
 
-#: buffer.php:59
+#: buffer.php:70
 msgid "Client ID"
 msgstr ""
 
-#: buffer.php:60
+#: buffer.php:71
 msgid "Client Secret"
 msgstr ""
 
-#: buffer.php:67
+#: buffer.php:87
 msgid "Error when registering buffer connection:"
 msgstr ""
 
-#: buffer.php:86
+#: buffer.php:107
 msgid "You are now authenticated to buffer. "
 msgstr ""
 
-#: buffer.php:87
+#: buffer.php:108
 msgid "return to the connector page"
 msgstr ""
 
-#: buffer.php:103
+#: buffer.php:126
 msgid "Post to Buffer"
 msgstr ""
 
-#: buffer.php:128 buffer.php:132
+#: buffer.php:155 buffer.php:159
 msgid "Buffer Export"
 msgstr ""
 
-#: buffer.php:142
+#: buffer.php:170
 msgid "Authenticate your Buffer connection"
 msgstr ""
 
-#: buffer.php:146
+#: buffer.php:174
 msgid "Enable Buffer Post Addon"
 msgstr ""
 
-#: buffer.php:151
+#: buffer.php:179
 msgid "Post to Buffer by default"
 msgstr ""
 
-#: buffer.php:156
+#: buffer.php:184
 msgid "Check to delete this preset"
 msgstr ""
 
-#: buffer.php:165
+#: buffer.php:196
 msgid "Posts are going to all accounts that are enabled by default:"
 msgstr ""
diff --git a/buffer/lang/ca/strings.php b/buffer/lang/ca/strings.php
index d0cdce887..26ae1f607 100644
--- a/buffer/lang/ca/strings.php
+++ b/buffer/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Permís denegat.";
diff --git a/buffer/lang/cs/strings.php b/buffer/lang/cs/strings.php
index 971dbe9b2..b8c9cd538 100644
--- a/buffer/lang/cs/strings.php
+++ b/buffer/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Permission denied."] = "Přístup odmítnut.";
diff --git a/buffer/lang/de/strings.php b/buffer/lang/de/strings.php
index bb55e28b8..76c442ba6 100644
--- a/buffer/lang/de/strings.php
+++ b/buffer/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Zugriff verweigert.";
diff --git a/buffer/lang/es/strings.php b/buffer/lang/es/strings.php
index 0137d30af..7d33eb3e7 100644
--- a/buffer/lang/es/strings.php
+++ b/buffer/lang/es/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Permiso denegado";
diff --git a/buffer/lang/fi-fi/strings.php b/buffer/lang/fi-fi/strings.php
index 53be70e09..a34021d9c 100644
--- a/buffer/lang/fi-fi/strings.php
+++ b/buffer/lang/fi-fi/strings.php
@@ -2,20 +2,16 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Lupa kielletty.";
 $a->strings["Save Settings"] = "Tallenna asetukset";
-$a->strings["Client ID"] = "";
-$a->strings["Client Secret"] = "";
 $a->strings["Error when registering buffer connection:"] = "Virhe Buffer-yhteyden rekisteröimisessä:";
 $a->strings["You are now authenticated to buffer. "] = "Buffer-yhteydesi on todennettu.";
-$a->strings["return to the connector page"] = "";
 $a->strings["Post to Buffer"] = "Julkaise Bufferiin";
 $a->strings["Buffer Export"] = "Buffer Export";
 $a->strings["Authenticate your Buffer connection"] = "Todenna Buffer-yhteydesi";
 $a->strings["Enable Buffer Post Addon"] = "Ota Buffer-viestilisäosa käyttöön";
 $a->strings["Post to Buffer by default"] = "Julkaise Bufferiin oletuksena";
-$a->strings["Check to delete this preset"] = "";
-$a->strings["Posts are going to all accounts that are enabled by default:"] = "";
diff --git a/buffer/lang/fr/strings.php b/buffer/lang/fr/strings.php
index f7d97493d..171cd93e2 100644
--- a/buffer/lang/fr/strings.php
+++ b/buffer/lang/fr/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Permission denied."] = "Permission refusée.";
diff --git a/buffer/lang/hu/strings.php b/buffer/lang/hu/strings.php
index d08a4fd97..1b02392dd 100644
--- a/buffer/lang/hu/strings.php
+++ b/buffer/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Hozzáférés megtagadva.";
diff --git a/buffer/lang/is/strings.php b/buffer/lang/is/strings.php
index 3584aad3b..fbbca8085 100644
--- a/buffer/lang/is/strings.php
+++ b/buffer/lang/is/strings.php
@@ -3,20 +3,7 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return ($n % 10 != 1 || $n % 100 == 11);;
+	return intval($n % 10 != 1 || $n % 100 == 11);
 }}
 ;
 $a->strings["Permission denied."] = "Heimild ekki veitt.";
-$a->strings["Save Settings"] = "";
-$a->strings["Client ID"] = "";
-$a->strings["Client Secret"] = "";
-$a->strings["Error when registering buffer connection:"] = "";
-$a->strings["You are now authenticated to buffer. "] = "";
-$a->strings["return to the connector page"] = "";
-$a->strings["Post to Buffer"] = "";
-$a->strings["Buffer Export"] = "";
-$a->strings["Authenticate your Buffer connection"] = "";
-$a->strings["Enable Buffer Post Addon"] = "";
-$a->strings["Post to Buffer by default"] = "";
-$a->strings["Check to delete this preset"] = "";
-$a->strings["Posts are going to all accounts that are enabled by default:"] = "";
diff --git a/buffer/lang/it/strings.php b/buffer/lang/it/strings.php
index 02fa328b6..199743ebf 100644
--- a/buffer/lang/it/strings.php
+++ b/buffer/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Permesso negato.";
diff --git a/buffer/lang/nl/strings.php b/buffer/lang/nl/strings.php
index 5d6d01515..418b65590 100644
--- a/buffer/lang/nl/strings.php
+++ b/buffer/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Toegang geweigerd.";
diff --git a/buffer/lang/pl/strings.php b/buffer/lang/pl/strings.php
index cd1c1f5ab..6c123f5cd 100644
--- a/buffer/lang/pl/strings.php
+++ b/buffer/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Permission denied."] = "Odmowa uprawnień.";
diff --git a/buffer/lang/pt-br/strings.php b/buffer/lang/pt-br/strings.php
index 737a86eb6..4fb36a9c8 100644
--- a/buffer/lang/pt-br/strings.php
+++ b/buffer/lang/pt-br/strings.php
@@ -2,13 +2,12 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Permission denied."] = "Permissão negada.";
 $a->strings["Save Settings"] = "Salvar configurações";
-$a->strings["Client ID"] = "";
-$a->strings["Client Secret"] = "";
 $a->strings["Error when registering buffer connection:"] = "Erro ao registrar conexão de buffer:";
 $a->strings["You are now authenticated to buffer. "] = "Você está autenticado no buffer.";
 $a->strings["return to the connector page"] = "Volte a página de conectores.";
@@ -18,4 +17,3 @@ $a->strings["Authenticate your Buffer connection"] = "Autenticar sua conexão de
 $a->strings["Enable Buffer Post Addon"] = "Habilita addon para publicar no Buffer";
 $a->strings["Post to Buffer by default"] = "Publica no Buffer por padrão";
 $a->strings["Check to delete this preset"] = "Marque para excluir este perfil";
-$a->strings["Posts are going to all accounts that are enabled by default:"] = "";
diff --git a/buffer/lang/ro/strings.php b/buffer/lang/ro/strings.php
index a6bda064d..595f2021d 100644
--- a/buffer/lang/ro/strings.php
+++ b/buffer/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Permission denied."] = "Permisiune refuzată.";
diff --git a/buffer/lang/ru/strings.php b/buffer/lang/ru/strings.php
index 92dfc5070..cdd378237 100644
--- a/buffer/lang/ru/strings.php
+++ b/buffer/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Permission denied."] = "Доступ запрещен.";
diff --git a/buffer/lang/sv/strings.php b/buffer/lang/sv/strings.php
index b48a1766a..f31eaf109 100644
--- a/buffer/lang/sv/strings.php
+++ b/buffer/lang/sv/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_sv")) {
 function string_plural_select_sv($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Åtkomst nekad.";
diff --git a/buglink/lang/C/messages.po b/buglink/lang/C/messages.po
index 1721ffa6c..442ee8c0b 100644
--- a/buglink/lang/C/messages.po
+++ b/buglink/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buglink.php:15
+#: buglink.php:20
 msgid "Report Bug"
 msgstr ""
diff --git a/buglink/lang/ca/strings.php b/buglink/lang/ca/strings.php
index a818f5dfb..be3776fe3 100644
--- a/buglink/lang/ca/strings.php
+++ b/buglink/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Report Bug"] = "Informar d’error";
diff --git a/buglink/lang/cs/strings.php b/buglink/lang/cs/strings.php
index 7a9f92040..9a3f878d4 100644
--- a/buglink/lang/cs/strings.php
+++ b/buglink/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["Report Bug"] = "Nahlásit chybu";
diff --git a/buglink/lang/de/strings.php b/buglink/lang/de/strings.php
index 2de8583ff..1df4d95c3 100644
--- a/buglink/lang/de/strings.php
+++ b/buglink/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Report Bug"] = "Fehler melden";
diff --git a/buglink/lang/es/strings.php b/buglink/lang/es/strings.php
index 27e45c1b9..5f3c10b1d 100644
--- a/buglink/lang/es/strings.php
+++ b/buglink/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Report Bug"] = "Reportar error";
diff --git a/buglink/lang/fi-fi/strings.php b/buglink/lang/fi-fi/strings.php
index 4222cfac1..9674043d0 100644
--- a/buglink/lang/fi-fi/strings.php
+++ b/buglink/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Report Bug"] = "Ilmoita virheestä";
diff --git a/buglink/lang/hu/strings.php b/buglink/lang/hu/strings.php
index 16b9c06c3..95d9759c5 100644
--- a/buglink/lang/hu/strings.php
+++ b/buglink/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Report Bug"] = "Hiba jelentése";
diff --git a/buglink/lang/is/strings.php b/buglink/lang/is/strings.php
index 0458315a2..335612f94 100644
--- a/buglink/lang/is/strings.php
+++ b/buglink/lang/is/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return ($n % 10 != 1 || $n % 100 == 11);;
+	return intval($n % 10 != 1 || $n % 100 == 11);
 }}
 ;
 $a->strings["Report Bug"] = "Tilkynna villu";
diff --git a/buglink/lang/it/strings.php b/buglink/lang/it/strings.php
index 449e6b9f4..5f9a9085f 100644
--- a/buglink/lang/it/strings.php
+++ b/buglink/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Report Bug"] = "Segnala un Bug";
diff --git a/buglink/lang/nb-no/strings.php b/buglink/lang/nb-no/strings.php
index 9de93361d..88142390b 100644
--- a/buglink/lang/nb-no/strings.php
+++ b/buglink/lang/nb-no/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nb_no")) {
 function string_plural_select_nb_no($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Report Bug"] = "Rapporter feil";
diff --git a/buglink/lang/nl/strings.php b/buglink/lang/nl/strings.php
index a5db04bdb..d44b3b2f2 100644
--- a/buglink/lang/nl/strings.php
+++ b/buglink/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Report Bug"] = "Bug rapporteren";
diff --git a/buglink/lang/pl/strings.php b/buglink/lang/pl/strings.php
index d2e835f90..7fed74fbb 100644
--- a/buglink/lang/pl/strings.php
+++ b/buglink/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Report Bug"] = "Zgłoś błąd";
diff --git a/buglink/lang/ro/strings.php b/buglink/lang/ro/strings.php
index 25a9c7694..20a57ce78 100644
--- a/buglink/lang/ro/strings.php
+++ b/buglink/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Report Bug"] = "Raportează Problema";
diff --git a/buglink/lang/ru/strings.php b/buglink/lang/ru/strings.php
index fe03f9eb7..ace0053f4 100644
--- a/buglink/lang/ru/strings.php
+++ b/buglink/lang/ru/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	$n = intval($n);
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Report Bug"] = "Сообщить об ошибке";
diff --git a/buglink/lang/sv/strings.php b/buglink/lang/sv/strings.php
index 513dd4f3d..9166d6022 100644
--- a/buglink/lang/sv/strings.php
+++ b/buglink/lang/sv/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_sv")) {
 function string_plural_select_sv($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Report Bug"] = "Rapportera bugg";
diff --git a/buglink/lang/zh-cn/strings.php b/buglink/lang/zh-cn/strings.php
index 520c0d091..e467d5c9f 100644
--- a/buglink/lang/zh-cn/strings.php
+++ b/buglink/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Report Bug"] = "报告错误";
diff --git a/calc/lang/C/messages.po b/calc/lang/C/messages.po
deleted file mode 100644
index e69de29bb..000000000
diff --git a/catavatar/lang/C/messages.po b/catavatar/lang/C/messages.po
index de24cff33..e679dad8d 100644
--- a/catavatar/lang/C/messages.po
+++ b/catavatar/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-29 00:53+0000\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/catavatar/lang/ca/strings.php b/catavatar/lang/ca/strings.php
index cb62f4926..3ab33c586 100644
--- a/catavatar/lang/ca/strings.php
+++ b/catavatar/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Use Cat as Avatar"] = "Utilitzeu Gat com a Avatar";
diff --git a/catavatar/lang/cs/strings.php b/catavatar/lang/cs/strings.php
index 8aad15164..f0cf1fe3d 100644
--- a/catavatar/lang/cs/strings.php
+++ b/catavatar/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Use Cat as Avatar"] = "Použít kočku jako avatar";
diff --git a/catavatar/lang/en-gb/strings.php b/catavatar/lang/en-gb/strings.php
index f37ebd612..42e684705 100644
--- a/catavatar/lang/en-gb/strings.php
+++ b/catavatar/lang/en-gb/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Use Cat as Avatar"] = "Use Cat as Avatar";
diff --git a/catavatar/lang/es/strings.php b/catavatar/lang/es/strings.php
index 72ba69909..f7897bf64 100644
--- a/catavatar/lang/es/strings.php
+++ b/catavatar/lang/es/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Use Cat as Avatar"] = "Usar Gato como Avatar";
diff --git a/catavatar/lang/fi-fi/strings.php b/catavatar/lang/fi-fi/strings.php
index ebcd678c2..009435e77 100644
--- a/catavatar/lang/fi-fi/strings.php
+++ b/catavatar/lang/fi-fi/strings.php
@@ -2,12 +2,12 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Use Cat as Avatar"] = "Ota kissa-avatari käyttöön";
 $a->strings["More Random Cat!"] = "Lisää satunnaisia kissoja!";
-$a->strings["Reset to email Cat"] = "";
 $a->strings["Cat Avatar Settings"] = "Cat Avatar -asetukset";
 $a->strings["The cat hadn't found itself."] = "Tietokantavirhe, kissa on eksyksissä.";
 $a->strings["There was an error, the cat ran away."] = "Tapahtui virhe, kissa juoksi karkuun.";
diff --git a/catavatar/lang/fr/strings.php b/catavatar/lang/fr/strings.php
index 78976bf51..3ef02cd3a 100644
--- a/catavatar/lang/fr/strings.php
+++ b/catavatar/lang/fr/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Use Cat as Avatar"] = "Utiliser Chat comme avatar";
diff --git a/catavatar/lang/hu/strings.php b/catavatar/lang/hu/strings.php
index c3d1564f4..d45b3bf9f 100644
--- a/catavatar/lang/hu/strings.php
+++ b/catavatar/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Use Cat as Avatar"] = "Macska használata profilképként";
diff --git a/catavatar/lang/is/strings.php b/catavatar/lang/is/strings.php
index a4266e21b..a5d120b2e 100644
--- a/catavatar/lang/is/strings.php
+++ b/catavatar/lang/is/strings.php
@@ -3,14 +3,8 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return ($n % 10 != 1 || $n % 100 == 11);;
+	return intval($n % 10 != 1 || $n % 100 == 11);
 }}
 ;
-$a->strings["Use Cat as Avatar"] = "";
-$a->strings["More Random Cat!"] = "";
-$a->strings["Reset to email Cat"] = "";
-$a->strings["Cat Avatar Settings"] = "";
-$a->strings["The cat hadn't found itself."] = "";
-$a->strings["There was an error, the cat ran away."] = "";
 $a->strings["Profile Photos"] = "Forsíðumyndir";
 $a->strings["Meow!"] = "Mjá!";
diff --git a/catavatar/lang/nl/strings.php b/catavatar/lang/nl/strings.php
index f97a6ef5d..67c9e9cf4 100644
--- a/catavatar/lang/nl/strings.php
+++ b/catavatar/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Use Cat as Avatar"] = "Gebruik een kat als avatar";
diff --git a/catavatar/lang/pl/strings.php b/catavatar/lang/pl/strings.php
index 203d1a97f..da5bdc272 100644
--- a/catavatar/lang/pl/strings.php
+++ b/catavatar/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Use Cat as Avatar"] = "Użyj kota jako awatara";
diff --git a/catavatar/lang/ru/strings.php b/catavatar/lang/ru/strings.php
index 2dd756cac..15b9dd8d1 100644
--- a/catavatar/lang/ru/strings.php
+++ b/catavatar/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Use Cat as Avatar"] = "Поставить кота на аватар";
diff --git a/convert/lang/C/messages.po b/convert/lang/C/messages.po
deleted file mode 100644
index e69de29bb..000000000
diff --git a/cookienotice/lang/C/messages.po b/cookienotice/lang/C/messages.po
index 7d198f852..15055bb78 100644
--- a/cookienotice/lang/C/messages.po
+++ b/cookienotice/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-30 10:48+0100\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,52 +17,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cookienotice.php:63
+#: cookienotice.php:42
 msgid ""
 "This website uses cookies. If you continue browsing this website, you agree "
 "to the usage of cookies."
 msgstr ""
 
-#: cookienotice.php:64 cookienotice.php:133
+#: cookienotice.php:43 cookienotice.php:108
 msgid "OK"
 msgstr ""
 
-#: cookienotice.php:68
-msgid "\"cookienotice\" Settings"
-msgstr ""
-
-#: cookienotice.php:69
+#: cookienotice.php:47
 msgid ""
 "<b>Configure your cookie usage notice.</b> It should just be a notice, "
 "saying that the website uses cookies. It is shown as long as a user didnt "
 "confirm clicking the OK button."
 msgstr ""
 
-#: cookienotice.php:70
+#: cookienotice.php:48
 msgid "Cookie Usage Notice"
 msgstr ""
 
-#: cookienotice.php:70
-msgid "The cookie usage notice"
-msgstr ""
-
-#: cookienotice.php:71
+#: cookienotice.php:49
 msgid "OK Button Text"
 msgstr ""
 
-#: cookienotice.php:71
-msgid "The OK Button text"
-msgstr ""
-
-#: cookienotice.php:72
+#: cookienotice.php:50
 msgid "Save Settings"
 msgstr ""
 
-#: cookienotice.php:97
-msgid "cookienotice Settings saved."
-msgstr ""
-
-#: cookienotice.php:132
+#: cookienotice.php:107
 msgid ""
 "This website uses cookies to recognize revisiting and logged in users. You "
 "accept the usage of these cookies by continue browsing this website."
diff --git a/cookienotice/lang/ca/strings.php b/cookienotice/lang/ca/strings.php
index fd662e21f..ce12bcccd 100644
--- a/cookienotice/lang/ca/strings.php
+++ b/cookienotice/lang/ca/strings.php
@@ -3,17 +3,14 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
-$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "Aquest lloc web utilitza cookies. Si continueu navegant per aquest lloc web, esteu d’acord amb l’ús de cookies.";
 $a->strings["OK"] = "D'acord";
 $a->strings["\"cookienotice\" Settings"] = "Configuració 'cookienotice'";
-$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Configureu l’avís d’ús de cookies.</b> Només hauria de ser un avís, dient que el lloc web utilitza cookies. Es mostra sempre que un usuari no confirmi el seu clic al botó D'acord";
 $a->strings["Cookie Usage Notice"] = "Avís d’ús de cookies";
 $a->strings["The cookie usage notice"] = "L’avís d’ús de cookies";
 $a->strings["OK Button Text"] = "Text del botó d’acord";
 $a->strings["The OK Button text"] = "Text del botó D'acord";
 $a->strings["Save Settings"] = "Desa la configuració";
 $a->strings["cookienotice Settings saved."] = "Cookienotice S'ha desat la configuració.";
-$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "Aquest lloc web utilitza cookies per reconèixer la revisió i la sessió d’usuaris. Accepteu l’ús d’aquestes cookies continuant navegant per aquest lloc web.";
diff --git a/cookienotice/lang/cs/strings.php b/cookienotice/lang/cs/strings.php
index 3a759f02f..90cfcf95d 100644
--- a/cookienotice/lang/cs/strings.php
+++ b/cookienotice/lang/cs/strings.php
@@ -3,17 +3,14 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
-$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "Tato stránka používá cookies. Pokud budete pokračovat v používání této stránky, souhlasíte s používáním cookies.";
 $a->strings["OK"] = "OK";
 $a->strings["\"cookienotice\" Settings"] = "Nastavení „cookienotice“";
-$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Nastavte si vaše oznámení o používání cookies.</b> Mělo by to být pouze oznámení říkající, že stránka používá cookies. Zobrazí se, dokud uživatel neklikne na tlačítko OK.";
 $a->strings["Cookie Usage Notice"] = "Oznámení o používání cookies";
 $a->strings["The cookie usage notice"] = "Oznámení o používání cookies";
 $a->strings["OK Button Text"] = "Text tlačítka OK";
 $a->strings["The OK Button text"] = "Text tlačítka OK";
 $a->strings["Save Settings"] = "Uložit nastavení";
 $a->strings["cookienotice Settings saved."] = "Nastavení cookienotice uložena.";
-$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "Tato stránka používá cookies pro rozpoznávání znovu navštěvujících a přihlášených uživatelů. Pokud budete pokračovat v používání této stránky, souhlasíte s používáním cookies.";
diff --git a/cookienotice/lang/de/strings.php b/cookienotice/lang/de/strings.php
index b4441c230..b35f44865 100644
--- a/cookienotice/lang/de/strings.php
+++ b/cookienotice/lang/de/strings.php
@@ -3,17 +3,14 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
-$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "Diese Webseite verwendet Cookies. Durch die weitere Benutzung der Webseite stimmen Sie dieser Verwendung zu.";
 $a->strings["OK"] = "OK";
 $a->strings["\"cookienotice\" Settings"] = "\"cookienotice\"-Einstellungen";
-$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Konfiguriere deinen Cookie-Nutzungshinweis.</b> Es sollte ein Hinweis sein, der sagt, dass die Webseite Cookies benutzt. Er wird so lange angezeigt, bis der User den Hinweis durch Klicken des OK-Buttons bestätigt.";
 $a->strings["Cookie Usage Notice"] = "Cookie-Nutzungshinweis";
 $a->strings["The cookie usage notice"] = "Der Hinweis zur Nutzung von Cookies";
 $a->strings["OK Button Text"] = "OK-Button-Text";
 $a->strings["The OK Button text"] = "Der für den OK-Button verwendete Text";
 $a->strings["Save Settings"] = "Einstellungen speichern";
 $a->strings["cookienotice Settings saved."] = "cookienotice-Einstellungen wurden gespeichert";
-$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "Diese Webseite verwendet Cookies zur Erkennung von wiederkehrenden Besuchern und eingeloggten Nutzern. Durch die weitere Benutzung der Webseite akzeptieren Sie die Verwendung der Cookies.";
diff --git a/cookienotice/lang/en-gb/strings.php b/cookienotice/lang/en-gb/strings.php
index 0acb4196c..abcef1156 100644
--- a/cookienotice/lang/en-gb/strings.php
+++ b/cookienotice/lang/en-gb/strings.php
@@ -3,17 +3,14 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
-$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.";
 $a->strings["OK"] = "OK";
 $a->strings["\"cookienotice\" Settings"] = "\"cookienotice\" settings";
-$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.";
 $a->strings["Cookie Usage Notice"] = "Cookie usage notice";
 $a->strings["The cookie usage notice"] = "The cookie usage notice";
 $a->strings["OK Button Text"] = "OK button text";
 $a->strings["The OK Button text"] = "OK button text";
 $a->strings["Save Settings"] = "Save settings";
 $a->strings["cookienotice Settings saved."] = "Cookie notice settings saved.";
-$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.";
diff --git a/cookienotice/lang/fr/strings.php b/cookienotice/lang/fr/strings.php
index f975f4938..a42bcdb13 100644
--- a/cookienotice/lang/fr/strings.php
+++ b/cookienotice/lang/fr/strings.php
@@ -3,14 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
-$a->strings["\"cookienotice\" Settings"] = "";
-$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "";
-$a->strings["Cookie Usage Notice"] = "";
-$a->strings["The cookie usage notice"] = "";
 $a->strings["OK Button Text"] = "Bouton OK Texte ";
-$a->strings["The OK Button text"] = "";
-$a->strings["Save Settings"] = "";
-$a->strings["cookienotice Settings saved."] = "";
diff --git a/cookienotice/lang/hu/strings.php b/cookienotice/lang/hu/strings.php
index ddb749c30..35dfa3216 100644
--- a/cookienotice/lang/hu/strings.php
+++ b/cookienotice/lang/hu/strings.php
@@ -3,17 +3,14 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
-$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "Ez a weboldal sütiket használ. Ha folytatja a böngészést a weboldalon, akkor elfogadja a sütik használatát.";
 $a->strings["OK"] = "Rendben";
 $a->strings["\"cookienotice\" Settings"] = "A sütifigyelmeztetés beállításai";
-$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Állítsa be a sütihasználati figyelmeztetést.</b> Ennek csak egy figyelmeztetésnek kell lennie, amely arra hívja fel a figyelmet, hogy a weboldal sütiket használ. Egészen addig lesz megjelenítve, amíg a felhasználó nem fogadja el a Rendben gombra kattintva.";
 $a->strings["Cookie Usage Notice"] = "Sütihasználati figyelmeztetés";
 $a->strings["The cookie usage notice"] = "A sütihasználati figyelmeztetés";
 $a->strings["OK Button Text"] = "Rendben gomb szövege";
 $a->strings["The OK Button text"] = "A „Rendben” gomb szövege";
 $a->strings["Save Settings"] = "Beállítások mentése";
 $a->strings["cookienotice Settings saved."] = "A sütifigyelmeztetés beállításai elmentve.";
-$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "Ez a weboldal sütiket használ az újralátogatás felismeréséhez és a bejelentkezett felhasználókhoz. A weboldalon történő böngészés folytatásával Ön elfogadja ezen sütik használatát.";
diff --git a/cookienotice/lang/it/strings.php b/cookienotice/lang/it/strings.php
index b4d84be63..7b2caf585 100644
--- a/cookienotice/lang/it/strings.php
+++ b/cookienotice/lang/it/strings.php
@@ -3,17 +3,14 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
-$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "Questo sito web utilizza cookie. Proseguendo la navigazione su questo sito, accetti l'utilizzo dei cookie.";
 $a->strings["OK"] = "OK";
 $a->strings["\"cookienotice\" Settings"] = "Impostazioni \"cookienotice\"";
-$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Configura la tua notifica di utilizzo dei cookie</b> Dovrebbe essere semplicemente una nota che dice che il sito utilizza dei cookie. Viene mostrata fino a quanto l'utente conferma cliccando il bottone OK.";
 $a->strings["Cookie Usage Notice"] = "Nota Utilizzo Cookie";
 $a->strings["The cookie usage notice"] = "La nota di utilizzo dei cookie";
 $a->strings["OK Button Text"] = "Testo Bottone OK";
 $a->strings["The OK Button text"] = "Il testo del bottone OK";
 $a->strings["Save Settings"] = "Salva Impostazioni";
 $a->strings["cookienotice Settings saved."] = "Impostazioni \"cookienotice\" salvate.";
-$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "Questo sito utilizza cookie per riconosce gli utenti loggati e quelli che tornano a visitare. Proseguendo la navigazione su questo sito, accetti l'utilizzo di questi cookie. ";
diff --git a/cookienotice/lang/nl/strings.php b/cookienotice/lang/nl/strings.php
index 4699657e6..59ca77cb7 100644
--- a/cookienotice/lang/nl/strings.php
+++ b/cookienotice/lang/nl/strings.php
@@ -3,17 +3,14 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
-$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "Deze website gebruikt cookies. Door het gebruik van deze website,  je akkoord met het gebruik van deze cookies.";
 $a->strings["OK"] = "OK";
 $a->strings["\"cookienotice\" Settings"] = "\"cookienotice\" instellingen";
-$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Configureer je meldingen voor het gebruik van cookies. </b>Het dient alleen een melding te zijn die zegt dat de website cookies gebruikt. Dit is te zien als de gebruiker niet heeft bevestigd door op de OK knop te drukken.";
 $a->strings["Cookie Usage Notice"] = "Cookiemelding";
 $a->strings["The cookie usage notice"] = "De cookiemelding";
 $a->strings["OK Button Text"] = "OK knop tekst";
 $a->strings["The OK Button text"] = "De OK knop tekst";
 $a->strings["Save Settings"] = "Instellingen Opslaan";
 $a->strings["cookienotice Settings saved."] = "Cookienotice instellingen opgeslagen.";
-$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "Deze website gebruikt cookies om terugkerende en ingelogde gebruikers te herkennen. Door gebruik van deze website gaat u akkoord met het gebruik van deze cookies";
diff --git a/cookienotice/lang/pl/strings.php b/cookienotice/lang/pl/strings.php
index 3643e5ade..78995c233 100644
--- a/cookienotice/lang/pl/strings.php
+++ b/cookienotice/lang/pl/strings.php
@@ -3,17 +3,14 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
-$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "Ta strona używa plików cookie. Jeśli będziesz kontynuować przeglądanie tej strony, zgadzasz się na użycie plików cookie.";
 $a->strings["OK"] = "OK";
 $a->strings["\"cookienotice\" Settings"] = "Ustawienia \"plików cookie\"";
-$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Skonfiguruj zawiadomienie o użyciu plików cookie.</b> Powinien to być po prostu komunikat, że strona korzysta z plików cookie. Jest wyświetlany, o ile użytkownik nie potwierdził, klikając przycisk OK.";
 $a->strings["Cookie Usage Notice"] = "Użyciu plików cookie";
 $a->strings["The cookie usage notice"] = "Powiadomienie o użyciu plików cookie";
 $a->strings["OK Button Text"] = "Tekst przycisku OK";
 $a->strings["The OK Button text"] = "Tekst przycisku OK";
 $a->strings["Save Settings"] = "Zapisz ustawienia";
 $a->strings["cookienotice Settings saved."] = "Zapisano stawienia plików cookie.";
-$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "Ta strona używa plików cookie do rozpoznawania ponownych odwiedzin i zalogowanych użytkowników. Akceptujesz użycie tych plików cookie, kontynuując przeglądanie tej witryny.";
diff --git a/cookienotice/lang/zh-cn/strings.php b/cookienotice/lang/zh-cn/strings.php
index 3036b5be9..e0c5e5869 100644
--- a/cookienotice/lang/zh-cn/strings.php
+++ b/cookienotice/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "本网站将使用 cookies。如果您继续浏览本网站，即表示您同意使用 cookies。";
diff --git a/curweather/lang/C/messages.po b/curweather/lang/C/messages.po
index 048c327a9..30a6f0fcd 100644
--- a/curweather/lang/C/messages.po
+++ b/curweather/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-25 17:17+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,114 +17,106 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: curweather.php:31
-msgid "Error fetching weather data.\\nError was: "
+#: curweather.php:47
+msgid "Error fetching weather data. Error was: "
 msgstr ""
 
-#: curweather.php:111 curweather.php:172
+#: curweather.php:130 curweather.php:192
 msgid "Current Weather"
 msgstr ""
 
-#: curweather.php:118
+#: curweather.php:137
 msgid "Relative Humidity"
 msgstr ""
 
-#: curweather.php:119
+#: curweather.php:138
 msgid "Pressure"
 msgstr ""
 
-#: curweather.php:120
+#: curweather.php:139
 msgid "Wind"
 msgstr ""
 
-#: curweather.php:121
+#: curweather.php:140
 msgid "Last Updated"
 msgstr ""
 
-#: curweather.php:122
+#: curweather.php:141
 msgid "Data by"
 msgstr ""
 
-#: curweather.php:123
+#: curweather.php:142
 msgid "Show on map"
 msgstr ""
 
-#: curweather.php:128
+#: curweather.php:147
 msgid "There was a problem accessing the weather data. But have a look"
 msgstr ""
 
-#: curweather.php:130
+#: curweather.php:149
 msgid "at OpenWeatherMap"
 msgstr ""
 
-#: curweather.php:146
-msgid "Current Weather settings updated."
-msgstr ""
-
-#: curweather.php:161
+#: curweather.php:179
 msgid "No APPID found, please contact your admin to obtain one."
 msgstr ""
 
-#: curweather.php:171 curweather.php:200
+#: curweather.php:191 curweather.php:229
 msgid "Save Settings"
 msgstr ""
 
-#: curweather.php:172
+#: curweather.php:192
 msgid "Settings"
 msgstr ""
 
-#: curweather.php:174
+#: curweather.php:194
 msgid "Enter either the name of your location or the zip code."
 msgstr ""
 
-#: curweather.php:175
+#: curweather.php:195
 msgid "Your Location"
 msgstr ""
 
-#: curweather.php:175
+#: curweather.php:195
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr ""
 
-#: curweather.php:176
+#: curweather.php:196
 msgid "Units"
 msgstr ""
 
-#: curweather.php:176
+#: curweather.php:196
 msgid "select if the temperature should be displayed in &deg;C or &deg;F"
 msgstr ""
 
-#: curweather.php:177
+#: curweather.php:197
 msgid "Show weather data"
 msgstr ""
 
-#: curweather.php:190
-msgid "Curweather settings saved."
-msgstr ""
-
-#: curweather.php:201
+#: curweather.php:232
 msgid "Caching Interval"
 msgstr ""
 
-#: curweather.php:201
+#: curweather.php:234
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr ""
 
-#: curweather.php:201
+#: curweather.php:235
 msgid "no cache"
 msgstr ""
 
-#: curweather.php:201
+#: curweather.php:236 curweather.php:237 curweather.php:238 curweather.php:239
 msgid "minutes"
 msgstr ""
 
-#: curweather.php:202
+#: curweather.php:242
 msgid "Your APPID"
 msgstr ""
 
-#: curweather.php:202
+#: curweather.php:242
 msgid "Your API key provided by OpenWeatherMap"
 msgstr ""
diff --git a/curweather/lang/ca/strings.php b/curweather/lang/ca/strings.php
index 4fed66168..1b576c38f 100644
--- a/curweather/lang/ca/strings.php
+++ b/curweather/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Error fetching weather data.\\nError was: "] = "S'ha produït un error en recuperar les dades meteorològiques. \\\\ NEror ha estat:";
diff --git a/curweather/lang/cs/strings.php b/curweather/lang/cs/strings.php
index 565fe7d7c..ea74d684f 100644
--- a/curweather/lang/cs/strings.php
+++ b/curweather/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Error fetching weather data.\\nError was: "] = "Chyba při získávání dat o počasí.\\nChyba:";
diff --git a/curweather/lang/de/strings.php b/curweather/lang/de/strings.php
index 2f1f0e3d5..7947a44e6 100644
--- a/curweather/lang/de/strings.php
+++ b/curweather/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Error fetching weather data.\\nError was: "] = "Fehler beim abrufen der Wetterdaten.\\nDie Fehlermeldung lautet:";
diff --git a/curweather/lang/es/strings.php b/curweather/lang/es/strings.php
index f968076a7..bd6340cea 100644
--- a/curweather/lang/es/strings.php
+++ b/curweather/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Error fetching weather data.\\nError was: "] = "Error al traer información del clima.\\nError era: ";
diff --git a/curweather/lang/fi-fi/strings.php b/curweather/lang/fi-fi/strings.php
index d942398d6..4a47c6f21 100644
--- a/curweather/lang/fi-fi/strings.php
+++ b/curweather/lang/fi-fi/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Error fetching weather data.\\nError was: "] = "Säätietojen noutamisessa tapahtui virhe.\\nLisätietoja: ";
@@ -28,7 +28,6 @@ $a->strings["select if the temperature should be displayed in &deg;C or &deg;F"]
 $a->strings["Show weather data"] = "Näytä säätiedot";
 $a->strings["Curweather settings saved."] = "Curweather -asetukset tallennettu.";
 $a->strings["Caching Interval"] = "Välimuistin aikaväli";
-$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "";
 $a->strings["no cache"] = "Ei välimuistia";
 $a->strings["minutes"] = "minuuttia";
 $a->strings["Your APPID"] = "Sinun APPID";
diff --git a/curweather/lang/fr/strings.php b/curweather/lang/fr/strings.php
index 466a05086..8915dcf5c 100644
--- a/curweather/lang/fr/strings.php
+++ b/curweather/lang/fr/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Error fetching weather data.\\nError was: "] = "Erreur durant la récupération de la météo.\\nL'erreur était : ";
diff --git a/curweather/lang/hu/strings.php b/curweather/lang/hu/strings.php
index f24c5562a..bc9966f99 100644
--- a/curweather/lang/hu/strings.php
+++ b/curweather/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Error fetching weather data.\\nError was: "] = "Hiba az időjárási adatok lekérésekor.\\nA hiba ez volt: ";
diff --git a/curweather/lang/it/strings.php b/curweather/lang/it/strings.php
index 99525cc1e..32f244b43 100644
--- a/curweather/lang/it/strings.php
+++ b/curweather/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Error fetching weather data.\\nError was: "] = "Errore recuperando i dati meteo: ";
diff --git a/curweather/lang/nl/strings.php b/curweather/lang/nl/strings.php
index 9a4a4d296..f48939a96 100644
--- a/curweather/lang/nl/strings.php
+++ b/curweather/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Error fetching weather data.\\nError was: "] = "Fout bij het ophalen van de weer data:\\nFout was:";
diff --git a/curweather/lang/pl/strings.php b/curweather/lang/pl/strings.php
index aa4df64f2..580a72d5c 100644
--- a/curweather/lang/pl/strings.php
+++ b/curweather/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Error fetching weather data.\\nError was: "] = "Błąd podczas pobierania danych pogodowych. \\nError był:";
diff --git a/curweather/lang/pt-br/strings.php b/curweather/lang/pt-br/strings.php
index f50bc4a04..7e1dbb0dc 100644
--- a/curweather/lang/pt-br/strings.php
+++ b/curweather/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Error fetching weather data.\\nError was: "] = "Houve um erro na obtenção de dados do clima\\nErro:";
diff --git a/curweather/lang/ro/strings.php b/curweather/lang/ro/strings.php
index 0d0ac9e37..1dfe462be 100644
--- a/curweather/lang/ro/strings.php
+++ b/curweather/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Current Weather"] = "Starea Vremii";
diff --git a/diaspora/lang/C/messages.po b/diaspora/lang/C/messages.po
index 82660b50b..749d3f25f 100644
--- a/diaspora/lang/C/messages.po
+++ b/diaspora/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-07 00:15-0400\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,96 +17,88 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: diaspora.php:53
+#: diaspora.php:43
 msgid "Post to Diaspora"
 msgstr ""
 
-#: diaspora.php:78
+#: diaspora.php:68
 #, php-format
 msgid ""
 "Please remember: You can always be reached from Diaspora with your Friendica "
 "handle <strong>%s</strong>. "
 msgstr ""
 
-#: diaspora.php:79
+#: diaspora.php:69
 msgid ""
 "This connector is only meant if you still want to use your old Diaspora "
 "account for some time. "
 msgstr ""
 
-#: diaspora.php:80
+#: diaspora.php:70
 #, php-format
 msgid ""
 "However, it is preferred that you tell your Diaspora contacts the new handle "
 "<strong>%s</strong> instead."
 msgstr ""
 
-#: diaspora.php:90
+#: diaspora.php:80
 msgid "All aspects"
 msgstr ""
 
-#: diaspora.php:91
+#: diaspora.php:81
 msgid "Public"
 msgstr ""
 
-#: diaspora.php:97
+#: diaspora.php:87
 msgid "Post to aspect:"
 msgstr ""
 
-#: diaspora.php:98
+#: diaspora.php:88
 #, php-format
 msgid "Connected with your Diaspora account <strong>%s</strong>"
 msgstr ""
 
-#: diaspora.php:101
+#: diaspora.php:91
 msgid ""
 "Can't login to your Diaspora account. Please check handle (in the format "
 "user@domain.tld) and password."
 msgstr ""
 
-#: diaspora.php:109
+#: diaspora.php:99
 msgid "Diaspora Export"
 msgstr ""
 
-#: diaspora.php:110
+#: diaspora.php:100
 msgid "Information"
 msgstr ""
 
-#: diaspora.php:111
+#: diaspora.php:101
 msgid "Error"
 msgstr ""
 
-#: diaspora.php:112
+#: diaspora.php:102
 msgid "Save Settings"
 msgstr ""
 
-#: diaspora.php:116
+#: diaspora.php:106
 msgid "Enable Diaspora Post Addon"
 msgstr ""
 
-#: diaspora.php:117
+#: diaspora.php:107
 msgid "Diaspora handle"
 msgstr ""
 
-#: diaspora.php:118
+#: diaspora.php:108
 msgid "Diaspora password"
 msgstr ""
 
-#: diaspora.php:118
+#: diaspora.php:108
 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 ""
 
-#: diaspora.php:120
+#: diaspora.php:110
 msgid "Post to Diaspora by default"
 msgstr ""
-
-#: diaspora.php:138
-msgid "Diaspora settings updated."
-msgstr ""
-
-#: diaspora.php:141
-msgid "Diaspora connector disabled."
-msgstr ""
diff --git a/diaspora/lang/ca/strings.php b/diaspora/lang/ca/strings.php
index ce48df198..357973bf5 100644
--- a/diaspora/lang/ca/strings.php
+++ b/diaspora/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Diaspora"] = "Publicar a diàspora";
diff --git a/diaspora/lang/cs/strings.php b/diaspora/lang/cs/strings.php
index 649b02c75..b9c0ab24e 100644
--- a/diaspora/lang/cs/strings.php
+++ b/diaspora/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Diaspora"] = "Odeslat na Diasporu";
diff --git a/diaspora/lang/de/strings.php b/diaspora/lang/de/strings.php
index 6d0ab88ee..db30c36dd 100644
--- a/diaspora/lang/de/strings.php
+++ b/diaspora/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Diaspora"] = "Auf Diaspora veröffentlichen";
diff --git a/diaspora/lang/en-gb/strings.php b/diaspora/lang/en-gb/strings.php
index 7a84ef4c7..a5ceb8341 100644
--- a/diaspora/lang/en-gb/strings.php
+++ b/diaspora/lang/en-gb/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Diaspora"] = "Post to Diaspora";
diff --git a/diaspora/lang/en-us/strings.php b/diaspora/lang/en-us/strings.php
index 237dfee51..ff57d04e5 100644
--- a/diaspora/lang/en-us/strings.php
+++ b/diaspora/lang/en-us/strings.php
@@ -3,26 +3,12 @@
 if(! function_exists("string_plural_select_en_us")) {
 function string_plural_select_en_us($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($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 <strong>%s</strong>. "] = "";
-$a->strings["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 <strong>%s</strong> instead."] = "";
-$a->strings["All aspects"] = "";
-$a->strings["Public"] = "";
-$a->strings["Post to aspect:"] = "";
-$a->strings["Connected with your Diaspora account <strong>%s</strong>"] = "";
-$a->strings["Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."] = "";
 $a->strings["Diaspora Export"] = "Diaspora Export";
-$a->strings["Information"] = "";
-$a->strings["Error"] = "";
 $a->strings["Save Settings"] = "Save settings";
 $a->strings["Enable Diaspora Post Addon"] = "Enable Diaspora export";
-$a->strings["Diaspora handle"] = "";
 $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."] = "";
 $a->strings["Post to Diaspora by default"] = "Post to Diaspora by default";
-$a->strings["Diaspora settings updated."] = "";
-$a->strings["Diaspora connector disabled."] = "";
diff --git a/diaspora/lang/es/strings.php b/diaspora/lang/es/strings.php
index e25594c3f..21e0c6047 100644
--- a/diaspora/lang/es/strings.php
+++ b/diaspora/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Diaspora"] = "Publicar hacia Diaspora*";
diff --git a/diaspora/lang/fi-fi/strings.php b/diaspora/lang/fi-fi/strings.php
index 8d14a70b1..167f2318e 100644
--- a/diaspora/lang/fi-fi/strings.php
+++ b/diaspora/lang/fi-fi/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Diaspora"] = "Lähetä Diasporaan";
diff --git a/diaspora/lang/fr/strings.php b/diaspora/lang/fr/strings.php
index c9037b6af..84a0e0c4a 100644
--- a/diaspora/lang/fr/strings.php
+++ b/diaspora/lang/fr/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Post to Diaspora"] = "Publier sur Diaspora";
diff --git a/diaspora/lang/hu/strings.php b/diaspora/lang/hu/strings.php
index 280686a5d..36230bcbb 100644
--- a/diaspora/lang/hu/strings.php
+++ b/diaspora/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Diaspora"] = "Beküldés a Diasporára";
diff --git a/diaspora/lang/is/strings.php b/diaspora/lang/is/strings.php
index 6149a41b7..b1337cb11 100644
--- a/diaspora/lang/is/strings.php
+++ b/diaspora/lang/is/strings.php
@@ -3,11 +3,10 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return ($n % 10 != 1 || $n % 100 == 11);;
+	return intval($n % 10 != 1 || $n % 100 == 11);
 }}
 ;
 $a->strings["Post to Diaspora"] = "Senda færslu á Diaspora";
-$a->strings["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 útflutningur";
 $a->strings["Enable Diaspora Post Addon"] = "Virkja sendiviðbót fyrir Diaspora";
 $a->strings["Diaspora username"] = "Notandanafn á Diaspora";
diff --git a/diaspora/lang/it/strings.php b/diaspora/lang/it/strings.php
index af97743f3..d36fb0b83 100644
--- a/diaspora/lang/it/strings.php
+++ b/diaspora/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Diaspora"] = "Invia a Diaspora";
diff --git a/diaspora/lang/nl/strings.php b/diaspora/lang/nl/strings.php
index 2308dc867..3ea2a4b36 100644
--- a/diaspora/lang/nl/strings.php
+++ b/diaspora/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Diaspora"] = "Plaatsen op Diaspora";
@@ -20,9 +20,6 @@ $a->strings["Information"] = "Informatie";
 $a->strings["Error"] = "Fout";
 $a->strings["Save Settings"] = "Instellingen opslaan";
 $a->strings["Enable Diaspora Post Addon"] = "Diaspora Post Addon inschakelen";
-$a->strings["Diaspora handle"] = "";
 $a->strings["Diaspora password"] = "Diaspora wachtwoord";
 $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."] = "Privacyverklaring: uw diaspora-wachtwoord wordt onversleuteld opgeslagen om u te authenticeren met uw diaspora-pod. Dit betekent dat uw Friendica-knooppuntbeheerder er toegang toe heeft.";
 $a->strings["Post to Diaspora by default"] = "Plaatsen op Diaspora als standaard instellen ";
-$a->strings["Diaspora settings updated."] = "";
-$a->strings["Diaspora connector disabled."] = "";
diff --git a/diaspora/lang/pl/strings.php b/diaspora/lang/pl/strings.php
index fc026326d..823fe35ba 100644
--- a/diaspora/lang/pl/strings.php
+++ b/diaspora/lang/pl/strings.php
@@ -3,24 +3,19 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Diaspora"] = "Napisz do Diaspory";
-$a->strings["Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. "] = "";
 $a->strings["This connector is only meant if you still want to use your old Diaspora account for some time. "] = "Ten łącznik jest przeznaczony do tego, gdy nadal chcesz korzystać ze starego konta Diaspora przez jakiś czas.";
-$a->strings["However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead."] = "";
 $a->strings["All aspects"] = "Wszystkie aspekty";
 $a->strings["Public"] = "Publiczny";
-$a->strings["Post to aspect:"] = "";
 $a->strings["Connected with your Diaspora account <strong>%s</strong>"] = "Połączony ze swoim kontem Diaspora <strong>%s</strong>";
-$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["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["Post to Diaspora by default"] = "Wyślij domyślnie do Diaspory";
diff --git a/diaspora/lang/ro/strings.php b/diaspora/lang/ro/strings.php
index 3173251cb..021bf884b 100644
--- a/diaspora/lang/ro/strings.php
+++ b/diaspora/lang/ro/strings.php
@@ -3,13 +3,12 @@
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
 	$n = intval($n);
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Post to Diaspora"] = "Postați pe Diaspora";
 $a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Nu se poate face autentificarea pe contul dvs. Diaspora. Verificați numele de utilizator şi parola şi asigurați-vă că ați folosit adresa completă  (inclusiv http ... )";
 $a->strings["Diaspora Export"] = "Exportare pe Diaspora ";
-$a->strings["Enable Diaspora Post Addon"] = "";
 $a->strings["Diaspora username"] = "Utilizator Diaspora";
 $a->strings["Diaspora password"] = "Parola Diaspora";
 $a->strings["Diaspora site URL"] = "URL site Diaspora";
diff --git a/diaspora/lang/ru/strings.php b/diaspora/lang/ru/strings.php
index 1038ec218..61b471975 100644
--- a/diaspora/lang/ru/strings.php
+++ b/diaspora/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Diaspora"] = "Отправить в Diaspora";
diff --git a/diaspora/lang/zh-cn/strings.php b/diaspora/lang/zh-cn/strings.php
index 307a634f2..2da3664ff 100644
--- a/diaspora/lang/zh-cn/strings.php
+++ b/diaspora/lang/zh-cn/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
-	return 0;;
+	$n = intval($n);
+	return intval(0);
 }}
 ;
 $a->strings["Post to Diaspora"] = "发到 Diaspora";
diff --git a/dwpost/lang/C/messages.po b/dwpost/lang/C/messages.po
index c81e9f0fa..3787f75b6 100644
--- a/dwpost/lang/C/messages.po
+++ b/dwpost/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,30 +17,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dwpost.php:39
+#: dwpost.php:41
 msgid "Post to Dreamwidth"
 msgstr ""
 
-#: dwpost.php:70
-msgid "Dreamwidth Post Settings"
+#: dwpost.php:72 dwpost.php:76
+msgid "Dreamwidth Export"
 msgstr ""
 
-#: dwpost.php:72
+#: dwpost.php:80
 msgid "Enable dreamwidth Post Addon"
 msgstr ""
 
-#: dwpost.php:77
+#: dwpost.php:85
 msgid "dreamwidth username"
 msgstr ""
 
-#: dwpost.php:82
+#: dwpost.php:90
 msgid "dreamwidth password"
 msgstr ""
 
-#: dwpost.php:87
+#: dwpost.php:95
 msgid "Post to dreamwidth by default"
 msgstr ""
 
-#: dwpost.php:93
-msgid "Submit"
+#: dwpost.php:100
+msgid "Save Settings"
 msgstr ""
diff --git a/dwpost/lang/ca/strings.php b/dwpost/lang/ca/strings.php
index cd5c1e1a4..2ec9f0c21 100644
--- a/dwpost/lang/ca/strings.php
+++ b/dwpost/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Dreamwidth"] = "Publica a Dreamwidth";
diff --git a/dwpost/lang/cs/strings.php b/dwpost/lang/cs/strings.php
index 0c1f68a43..87e4468ce 100644
--- a/dwpost/lang/cs/strings.php
+++ b/dwpost/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Dreamwidth"] = "Poslat na Dreamwidth";
diff --git a/dwpost/lang/de/strings.php b/dwpost/lang/de/strings.php
index a810f79ef..17cf2e366 100644
--- a/dwpost/lang/de/strings.php
+++ b/dwpost/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Dreamwidth"] = "In Dreamwidth veröffentlichen";
diff --git a/dwpost/lang/en-gb/strings.php b/dwpost/lang/en-gb/strings.php
index 1f03e9b12..e2643cf4d 100644
--- a/dwpost/lang/en-gb/strings.php
+++ b/dwpost/lang/en-gb/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Dreamwidth"] = "Post to Dreamwidth";
diff --git a/dwpost/lang/es/strings.php b/dwpost/lang/es/strings.php
index 4c5c116f4..c8c0399cf 100644
--- a/dwpost/lang/es/strings.php
+++ b/dwpost/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Dreamwidth"] = "Publicar en Dreamwidth";
diff --git a/dwpost/lang/fi-fi/strings.php b/dwpost/lang/fi-fi/strings.php
index 4c8de9093..723921679 100644
--- a/dwpost/lang/fi-fi/strings.php
+++ b/dwpost/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Dreamwidth"] = "Lähetä Dreamwidthiin";
diff --git a/dwpost/lang/fr/strings.php b/dwpost/lang/fr/strings.php
index 5ecda4717..578286e80 100644
--- a/dwpost/lang/fr/strings.php
+++ b/dwpost/lang/fr/strings.php
@@ -2,12 +2,12 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Post to Dreamwidth"] = "Publier sur Dreamwidth";
 $a->strings["Dreamwidth Post Settings"] = "Paramètres pour Dreamwidth";
-$a->strings["Enable dreamwidth Post Addon"] = "";
 $a->strings["dreamwidth username"] = "Nom d'utilisateur Dreamwidth";
 $a->strings["dreamwidth password"] = "Mot de passe dreamwidth";
 $a->strings["Post to dreamwidth by default"] = "Poster sur Dreamwidth par défaut";
diff --git a/dwpost/lang/hu/strings.php b/dwpost/lang/hu/strings.php
index 1e9019573..7cedb7972 100644
--- a/dwpost/lang/hu/strings.php
+++ b/dwpost/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Dreamwidth"] = "Beküldés a Dreamwidth-re";
diff --git a/dwpost/lang/it/strings.php b/dwpost/lang/it/strings.php
index d906cc993..d6b25ff97 100644
--- a/dwpost/lang/it/strings.php
+++ b/dwpost/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Dreamwidth"] = "Invia a Dreamwidth";
diff --git a/dwpost/lang/nl/strings.php b/dwpost/lang/nl/strings.php
index ddf5083a1..9295c05b9 100644
--- a/dwpost/lang/nl/strings.php
+++ b/dwpost/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Dreamwidth"] = "Plaatsen op Dreamwidth";
diff --git a/dwpost/lang/pl/strings.php b/dwpost/lang/pl/strings.php
index 7ed9b44e6..acddf562f 100644
--- a/dwpost/lang/pl/strings.php
+++ b/dwpost/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Dreamwidth"] = "Opublikuj w Dreamwidth";
diff --git a/dwpost/lang/pt-br/strings.php b/dwpost/lang/pt-br/strings.php
index 03dc7d2d2..a96d7acff 100644
--- a/dwpost/lang/pt-br/strings.php
+++ b/dwpost/lang/pt-br/strings.php
@@ -1,9 +1,15 @@
-<?php
-
-$a->strings["Post to Dreamwidth"] = "Publicar no Dreamwidth";
-$a->strings["Dreamwidth Post Settings"] = "Configurações de publicação no Dreamwidth";
-$a->strings["Enable dreamwidth Post Addon"] = "Habilitar o addon de publicação no Dreamwidth";
-$a->strings["dreamwidth username"] = "Nome de usuário do Dreamwidth";
-$a->strings["dreamwidth password"] = "Senha do Dreamwidth";
-$a->strings["Post to dreamwidth by default"] = "Publicar no Dreamwidth por padrão";
-$a->strings["Submit"] = "Enviar";
+<?php
+
+if(! function_exists("string_plural_select_pt_br")) {
+function string_plural_select_pt_br($n){
+	$n = intval($n);
+	return intval($n > 1);
+}}
+;
+$a->strings["Post to Dreamwidth"] = "Publicar no Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Configurações de publicação no Dreamwidth";
+$a->strings["Enable dreamwidth Post Addon"] = "Habilitar plug-in para publicar no Dreamwidth";
+$a->strings["dreamwidth username"] = "Nome de usuário no Dreamwidth";
+$a->strings["dreamwidth password"] = "Senha do Dreamwidth";
+$a->strings["Post to dreamwidth by default"] = "Publicar no Dreamwidth por padrão";
+$a->strings["Submit"] = "Enviar";
diff --git a/dwpost/lang/ro/strings.php b/dwpost/lang/ro/strings.php
index ed3ece27f..c900fcf17 100644
--- a/dwpost/lang/ro/strings.php
+++ b/dwpost/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Post to Dreamwidth"] = "Postați pe Dreamwidth";
diff --git a/dwpost/lang/ru/strings.php b/dwpost/lang/ru/strings.php
index 5c3513206..aded77b49 100644
--- a/dwpost/lang/ru/strings.php
+++ b/dwpost/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Dreamwidth"] = "Отправить в Dreamwidth";
diff --git a/forumdirectory/lang/C/messages.po b/forumdirectory/lang/C/messages.po
index fa467fea9..5beaff0b4 100644
--- a/forumdirectory/lang/C/messages.po
+++ b/forumdirectory/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: forumdirectory.php:22
+#: forumdirectory.php:33 forumdirectory.php:137
 msgid "Forum Directory"
 msgstr ""
 
@@ -25,54 +25,22 @@ msgstr ""
 msgid "Public access denied."
 msgstr ""
 
-#: forumdirectory.php:71
+#: forumdirectory.php:125
+msgid "No entries (some entries may be hidden)."
+msgstr ""
+
+#: forumdirectory.php:131
 msgid "Global Directory"
 msgstr ""
 
-#: forumdirectory.php:79
+#: forumdirectory.php:133
 msgid "Find on this site"
 msgstr ""
 
-#: forumdirectory.php:81
-msgid "Finding: "
+#: forumdirectory.php:135
+msgid "Results for:"
 msgstr ""
 
-#: forumdirectory.php:82
-msgid "Site Directory"
-msgstr ""
-
-#: forumdirectory.php:83
+#: forumdirectory.php:139
 msgid "Find"
 msgstr ""
-
-#: forumdirectory.php:133
-msgid "Age: "
-msgstr ""
-
-#: forumdirectory.php:136
-msgid "Gender: "
-msgstr ""
-
-#: forumdirectory.php:156
-msgid "Location:"
-msgstr ""
-
-#: forumdirectory.php:158
-msgid "Gender:"
-msgstr ""
-
-#: forumdirectory.php:160
-msgid "Status:"
-msgstr ""
-
-#: forumdirectory.php:162
-msgid "Homepage:"
-msgstr ""
-
-#: forumdirectory.php:164
-msgid "About:"
-msgstr ""
-
-#: forumdirectory.php:201
-msgid "No entries (some entries may be hidden)."
-msgstr ""
diff --git a/forumdirectory/lang/ca/strings.php b/forumdirectory/lang/ca/strings.php
index b8ba9d62d..ece5068dc 100644
--- a/forumdirectory/lang/ca/strings.php
+++ b/forumdirectory/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Forum Directory"] = "Directori de fòrums";
diff --git a/forumdirectory/lang/cs/strings.php b/forumdirectory/lang/cs/strings.php
index f438ade9d..42c96354c 100644
--- a/forumdirectory/lang/cs/strings.php
+++ b/forumdirectory/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Forum Directory"] = "Adresář fór";
diff --git a/forumdirectory/lang/de/strings.php b/forumdirectory/lang/de/strings.php
index dfacc62d9..c0f701f2d 100644
--- a/forumdirectory/lang/de/strings.php
+++ b/forumdirectory/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Forum Directory"] = "Foren Verzeichnis";
diff --git a/forumdirectory/lang/es/strings.php b/forumdirectory/lang/es/strings.php
index 03341780c..f8e38d6fb 100644
--- a/forumdirectory/lang/es/strings.php
+++ b/forumdirectory/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Forum Directory"] = "Directorio de foro";
diff --git a/forumdirectory/lang/fi-fi/strings.php b/forumdirectory/lang/fi-fi/strings.php
index dfe4a7ece..ec673aacd 100644
--- a/forumdirectory/lang/fi-fi/strings.php
+++ b/forumdirectory/lang/fi-fi/strings.php
@@ -3,14 +3,13 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Forum Directory"] = "Foorumihakemisto";
 $a->strings["Public access denied."] = "Julkinen käyttö estetty.";
 $a->strings["Global Directory"] = "Maailmanlaajuinen hakemisto";
 $a->strings["Find on this site"] = "Sivustohaku";
-$a->strings["Finding: "] = "";
 $a->strings["Site Directory"] = "Sivustoluettelo";
 $a->strings["Find"] = "Etsi";
 $a->strings["Age: "] = "Ikä:";
diff --git a/forumdirectory/lang/fr/strings.php b/forumdirectory/lang/fr/strings.php
index 6c71b096f..2ea94e0e9 100644
--- a/forumdirectory/lang/fr/strings.php
+++ b/forumdirectory/lang/fr/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Forum Directory"] = "Annuaire de Forums";
diff --git a/forumdirectory/lang/hu/strings.php b/forumdirectory/lang/hu/strings.php
index d9e03adc2..b053ab55a 100644
--- a/forumdirectory/lang/hu/strings.php
+++ b/forumdirectory/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Forum Directory"] = "Fórumkönyvtár";
diff --git a/forumdirectory/lang/it/strings.php b/forumdirectory/lang/it/strings.php
index 48ad5f49c..437318ab7 100644
--- a/forumdirectory/lang/it/strings.php
+++ b/forumdirectory/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Forum Directory"] = "Elenco Forum";
diff --git a/forumdirectory/lang/nl/strings.php b/forumdirectory/lang/nl/strings.php
index ca340c156..d01dc3ffd 100644
--- a/forumdirectory/lang/nl/strings.php
+++ b/forumdirectory/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Forum Directory"] = "Forum index";
diff --git a/forumdirectory/lang/pl/strings.php b/forumdirectory/lang/pl/strings.php
index 6b24f0b03..ae9112a54 100644
--- a/forumdirectory/lang/pl/strings.php
+++ b/forumdirectory/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Forum Directory"] = "Katalog forum";
diff --git a/forumdirectory/lang/pt-br/strings.php b/forumdirectory/lang/pt-br/strings.php
index 622568b6f..e0f7db368 100644
--- a/forumdirectory/lang/pt-br/strings.php
+++ b/forumdirectory/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Forum Directory"] = "Diretório de Fóruns";
diff --git a/forumdirectory/lang/ro/strings.php b/forumdirectory/lang/ro/strings.php
index 357904b2a..558bbc531 100644
--- a/forumdirectory/lang/ro/strings.php
+++ b/forumdirectory/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Forum Directory"] = "Director Forum";
diff --git a/forumdirectory/lang/ru/strings.php b/forumdirectory/lang/ru/strings.php
index 17e6b1f9f..2499fd470 100644
--- a/forumdirectory/lang/ru/strings.php
+++ b/forumdirectory/lang/ru/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	$n = intval($n);
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Forum Directory"] = "Каталог форумов";
diff --git a/fromapp/lang/C/messages.po b/fromapp/lang/C/messages.po
index 18f24e022..195d61781 100644
--- a/fromapp/lang/C/messages.po
+++ b/fromapp/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-19 16:42+0100\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,25 +17,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: fromapp.php:40
-msgid "Fromapp settings updated."
-msgstr ""
-
-#: fromapp.php:65 fromapp.php:69
+#: fromapp.php:53 fromapp.php:57
 msgid "FromApp Settings"
 msgstr ""
 
-#: fromapp.php:72
+#: fromapp.php:60
 msgid ""
 "The application name you would like to show your posts originating from. "
 "Separate different app names with a comma. A random one will then be "
 "selected for every posting."
 msgstr ""
 
-#: fromapp.php:76
+#: fromapp.php:64
 msgid "Use this application name even if another application was used."
 msgstr ""
 
-#: fromapp.php:83
+#: fromapp.php:71
 msgid "Save Settings"
 msgstr ""
diff --git a/fromapp/lang/ca/strings.php b/fromapp/lang/ca/strings.php
index c24ff44d6..d62a02c73 100644
--- a/fromapp/lang/ca/strings.php
+++ b/fromapp/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Fromapp settings updated."] = "S'ha actualitzat la configuració de Fromapp";
diff --git a/fromapp/lang/cs/strings.php b/fromapp/lang/cs/strings.php
index a8024c131..f12fc7b9b 100644
--- a/fromapp/lang/cs/strings.php
+++ b/fromapp/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Fromapp settings updated."] = "Nastavení FromApp aktualizována.";
diff --git a/fromapp/lang/de/strings.php b/fromapp/lang/de/strings.php
index abcf7bfb7..006e7dbdd 100644
--- a/fromapp/lang/de/strings.php
+++ b/fromapp/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Fromapp settings updated."] = "Fromapp-Einstellungen aktualisiert.";
diff --git a/fromapp/lang/en-gb/strings.php b/fromapp/lang/en-gb/strings.php
index b2be22857..779248ceb 100644
--- a/fromapp/lang/en-gb/strings.php
+++ b/fromapp/lang/en-gb/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Fromapp settings updated."] = "FromApp settings updated.";
diff --git a/fromapp/lang/es/strings.php b/fromapp/lang/es/strings.php
index 84e1dcf84..4e763acda 100644
--- a/fromapp/lang/es/strings.php
+++ b/fromapp/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Fromapp settings updated."] = "Ajustes de Fromapp actualizados.";
diff --git a/fromapp/lang/fi-fi/strings.php b/fromapp/lang/fi-fi/strings.php
index a41ae8b85..4b4366418 100644
--- a/fromapp/lang/fi-fi/strings.php
+++ b/fromapp/lang/fi-fi/strings.php
@@ -2,11 +2,10 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Fromapp settings updated."] = "FromApp -asetukset päivitettiin.";
 $a->strings["FromApp Settings"] = "FromApp -asetukset";
-$a->strings["The application name you would like to show your posts originating from."] = "";
-$a->strings["Use this application name even if another application was used."] = "";
 $a->strings["Submit"] = "Lähetä";
diff --git a/fromapp/lang/it/strings.php b/fromapp/lang/it/strings.php
index ffaa40cda..e746e1ac4 100644
--- a/fromapp/lang/it/strings.php
+++ b/fromapp/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Fromapp settings updated."] = "Impostazioni \"FromApp\" aggiornato.";
diff --git a/fromapp/lang/nl/strings.php b/fromapp/lang/nl/strings.php
index 178524792..dc2ca18e5 100644
--- a/fromapp/lang/nl/strings.php
+++ b/fromapp/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Fromapp settings updated."] = "Fromapp instellingen opgeslagen";
diff --git a/fromapp/lang/pl/strings.php b/fromapp/lang/pl/strings.php
index e65f47d5b..a5c4f6fef 100644
--- a/fromapp/lang/pl/strings.php
+++ b/fromapp/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Fromapp settings updated."] = "Zaktualizowano ustawienia Fromapp.";
diff --git a/fromapp/lang/ro/strings.php b/fromapp/lang/ro/strings.php
index 075f881f1..5d4911624 100644
--- a/fromapp/lang/ro/strings.php
+++ b/fromapp/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Fromapp settings updated."] = "Configurările Fromapp au fost actualizate.";
diff --git a/fromapp/lang/ru/strings.php b/fromapp/lang/ru/strings.php
index c67a3e762..5012a133a 100644
--- a/fromapp/lang/ru/strings.php
+++ b/fromapp/lang/ru/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	$n = intval($n);
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Fromapp settings updated."] = "Настройки Fromapp обновлены.";
diff --git a/geonames/lang/C/messages.po b/geonames/lang/C/messages.po
index 81c239d2b..af1a126a8 100644
--- a/geonames/lang/C/messages.po
+++ b/geonames/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,18 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: geonames.php:143
-msgid "Geonames settings updated."
-msgstr ""
-
-#: geonames.php:179
+#: geonames.php:141
 msgid "Geonames Settings"
 msgstr ""
 
-#: geonames.php:181
+#: geonames.php:142
+msgid ""
+"Replace numerical coordinates by the nearest populated location name in your "
+"posts."
+msgstr ""
+
+#: geonames.php:143
 msgid "Enable Geonames Addon"
 msgstr ""
 
-#: geonames.php:187
-msgid "Submit"
+#: geonames.php:144
+msgid "Save Settings"
 msgstr ""
diff --git a/geonames/lang/cs/strings.php b/geonames/lang/cs/strings.php
index f8f41c1b9..78a3221ec 100644
--- a/geonames/lang/cs/strings.php
+++ b/geonames/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Geonames settings updated."] = "Nastavení Geonames aktualizována.";
diff --git a/geonames/lang/de/strings.php b/geonames/lang/de/strings.php
index 26f2246e6..e469a2148 100644
--- a/geonames/lang/de/strings.php
+++ b/geonames/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Geonames settings updated."] = "Geonames Einstellungen aktualisiert";
diff --git a/geonames/lang/es/strings.php b/geonames/lang/es/strings.php
index d2cb635d7..d75774a03 100644
--- a/geonames/lang/es/strings.php
+++ b/geonames/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Geonames settings updated."] = "Ajustes de geonombres actualizados.";
diff --git a/geonames/lang/fi-fi/strings.php b/geonames/lang/fi-fi/strings.php
index d3bb53b6a..9e043c124 100644
--- a/geonames/lang/fi-fi/strings.php
+++ b/geonames/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Geonames settings updated."] = "Geonames -asetukset päivitetty.";
diff --git a/geonames/lang/fr/strings.php b/geonames/lang/fr/strings.php
index fac517e96..c5b4eb2c8 100644
--- a/geonames/lang/fr/strings.php
+++ b/geonames/lang/fr/strings.php
@@ -3,10 +3,8 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Geonames settings updated."] = "Paramètres de Geonames mis à jour.";
 $a->strings["Geonames Settings"] = "Paramètres Geonames";
-$a->strings["Enable Geonames Addon"] = "";
-$a->strings["Submit"] = "";
diff --git a/geonames/lang/hu/strings.php b/geonames/lang/hu/strings.php
index b8c4e53b2..477dcc617 100644
--- a/geonames/lang/hu/strings.php
+++ b/geonames/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Geonames settings updated."] = "A földrajzi nevek beállításai frissítve.";
diff --git a/geonames/lang/is/strings.php b/geonames/lang/is/strings.php
index 8462f4c36..95c6191c1 100644
--- a/geonames/lang/is/strings.php
+++ b/geonames/lang/is/strings.php
@@ -3,10 +3,7 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return ($n % 10 != 1 || $n % 100 == 11);;
+	return intval($n % 10 != 1 || $n % 100 == 11);
 }}
 ;
-$a->strings["Geonames settings updated."] = "";
-$a->strings["Geonames Settings"] = "";
-$a->strings["Enable Geonames Addon"] = "";
 $a->strings["Submit"] = "Senda inn";
diff --git a/geonames/lang/it/strings.php b/geonames/lang/it/strings.php
index 33148f6ba..06205cf44 100644
--- a/geonames/lang/it/strings.php
+++ b/geonames/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Geonames settings updated."] = "Impostazioni di Geonames aggiornate.";
diff --git a/geonames/lang/nl/strings.php b/geonames/lang/nl/strings.php
index baaf2e1e9..16e4924cb 100644
--- a/geonames/lang/nl/strings.php
+++ b/geonames/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Geonames settings updated."] = "Geonames instellingen opgeslagen";
diff --git a/geonames/lang/pl/strings.php b/geonames/lang/pl/strings.php
index 4a04e1480..f3d7dceb0 100644
--- a/geonames/lang/pl/strings.php
+++ b/geonames/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Geonames settings updated."] = "Zaktualizowano ustawienia Geonames.";
diff --git a/geonames/lang/ro/strings.php b/geonames/lang/ro/strings.php
index b62585527..73975d499 100644
--- a/geonames/lang/ro/strings.php
+++ b/geonames/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Geonames settings updated."] = "Configurări Geonume actualizate.";
diff --git a/geonames/lang/ru/strings.php b/geonames/lang/ru/strings.php
index 282db7502..5b675fb63 100644
--- a/geonames/lang/ru/strings.php
+++ b/geonames/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Geonames settings updated."] = "Настройки Geonames обновлены.";
diff --git a/gnot/lang/C/messages.po b/gnot/lang/C/messages.po
index 230d2364b..11b67cfb6 100644
--- a/gnot/lang/C/messages.po
+++ b/gnot/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,29 +17,25 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnot.php:48
-msgid "Gnot settings updated."
-msgstr ""
-
-#: gnot.php:79
+#: gnot.php:71
 msgid "Gnot Settings"
 msgstr ""
 
-#: gnot.php:81
+#: gnot.php:72
+msgid "Save Settings"
+msgstr ""
+
+#: gnot.php:73
+msgid "Enable this addon?"
+msgstr ""
+
+#: gnot.php:75
 msgid ""
 "Allows threading of email comment notifications on Gmail and anonymising the "
 "subject line."
 msgstr ""
 
-#: gnot.php:82
-msgid "Enable this addon?"
-msgstr ""
-
-#: gnot.php:88
-msgid "Submit"
-msgstr ""
-
-#: gnot.php:97
+#: gnot.php:84
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%d"
 msgstr ""
diff --git a/gnot/lang/ca/strings.php b/gnot/lang/ca/strings.php
index 4a4187cf5..ad7b7b3bd 100644
--- a/gnot/lang/ca/strings.php
+++ b/gnot/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Gnot settings updated."] = "S'ha actualitzat la configuració de Gnot.";
diff --git a/gnot/lang/cs/strings.php b/gnot/lang/cs/strings.php
index 633f09176..93b7233b1 100644
--- a/gnot/lang/cs/strings.php
+++ b/gnot/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Gnot settings updated."] = "Nastavení Gnot aktualizováno.";
diff --git a/gnot/lang/de/strings.php b/gnot/lang/de/strings.php
index b798a21b9..e9e4c8c22 100644
--- a/gnot/lang/de/strings.php
+++ b/gnot/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Gnot settings updated."] = "Gnot Einstellungen aktualisiert.";
diff --git a/gnot/lang/es/strings.php b/gnot/lang/es/strings.php
index 2f9e7a8d4..ac77d10ea 100644
--- a/gnot/lang/es/strings.php
+++ b/gnot/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Gnot settings updated."] = "Ajustes de Gnot actualizados.";
diff --git a/gnot/lang/fi-fi/strings.php b/gnot/lang/fi-fi/strings.php
index 284bd29f7..9de95b726 100644
--- a/gnot/lang/fi-fi/strings.php
+++ b/gnot/lang/fi-fi/strings.php
@@ -2,12 +2,12 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Gnot settings updated."] = "Gnot -asetukset päivitetty.";
 $a->strings["Gnot Settings"] = "Gnot -asetukset";
-$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
 $a->strings["Enable this addon?"] = "Ota tämä lisäosa käyttöön?";
 $a->strings["Submit"] = "Lähetä";
 $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify] Kommentti keskustelussa #%d";
diff --git a/gnot/lang/fr/strings.php b/gnot/lang/fr/strings.php
index 96130f0a6..a8406b71e 100644
--- a/gnot/lang/fr/strings.php
+++ b/gnot/lang/fr/strings.php
@@ -3,12 +3,8 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Gnot settings updated."] = "Paramètres de Gnot mis à jour.";
 $a->strings["Gnot Settings"] = "Paramètres Gnot";
-$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
-$a->strings["Enable this addon?"] = "";
-$a->strings["Submit"] = "";
-$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "";
diff --git a/gnot/lang/hu/strings.php b/gnot/lang/hu/strings.php
index 905aa9f55..ef501d2ab 100644
--- a/gnot/lang/hu/strings.php
+++ b/gnot/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Gnot settings updated."] = "A Gnot beállításai frissítve.";
diff --git a/gnot/lang/it/strings.php b/gnot/lang/it/strings.php
index c38bac29b..ffc791a59 100644
--- a/gnot/lang/it/strings.php
+++ b/gnot/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Gnot settings updated."] = "Impostazioni di \"Gnot\" aggiornate.";
diff --git a/gnot/lang/nl/strings.php b/gnot/lang/nl/strings.php
index 30902b4a9..38b27be55 100644
--- a/gnot/lang/nl/strings.php
+++ b/gnot/lang/nl/strings.php
@@ -3,12 +3,9 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Gnot settings updated."] = "Gnot instellingen opgeslagen";
 $a->strings["Gnot Settings"] = "Gnot instellingen";
-$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
 $a->strings["Enable this addon?"] = "Deze addon inschakelen?";
-$a->strings["Submit"] = "";
-$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "";
diff --git a/gnot/lang/pl/strings.php b/gnot/lang/pl/strings.php
index ccbe5deef..4a348c2cc 100644
--- a/gnot/lang/pl/strings.php
+++ b/gnot/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Gnot settings updated."] = "Zaktualizowano ustawienia Gnot.";
diff --git a/gnot/lang/ro/strings.php b/gnot/lang/ro/strings.php
index a3641f4e5..1a5bb0e84 100644
--- a/gnot/lang/ro/strings.php
+++ b/gnot/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Gnot settings updated."] = "Configurările Gnot au fost actualizate.";
diff --git a/gnot/lang/ru/strings.php b/gnot/lang/ru/strings.php
index d49d02194..c0288984a 100644
--- a/gnot/lang/ru/strings.php
+++ b/gnot/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Gnot settings updated."] = "Настройки Gnot обновлены.";
diff --git a/gravatar/lang/C/messages.po b/gravatar/lang/C/messages.po
index dcbf653a8..a3311e056 100644
--- a/gravatar/lang/C/messages.po
+++ b/gravatar/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,57 +17,53 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gravatar.php:71
+#: gravatar.php:78
 msgid "generic profile image"
 msgstr ""
 
-#: gravatar.php:72
+#: gravatar.php:79
 msgid "random geometric pattern"
 msgstr ""
 
-#: gravatar.php:73
+#: gravatar.php:80
 msgid "monster face"
 msgstr ""
 
-#: gravatar.php:74
+#: gravatar.php:81
 msgid "computer generated face"
 msgstr ""
 
-#: gravatar.php:75
+#: gravatar.php:82
 msgid "retro arcade style face"
 msgstr ""
 
-#: gravatar.php:89
+#: gravatar.php:96
 msgid "Information"
 msgstr ""
 
-#: gravatar.php:89
+#: gravatar.php:96
 msgid ""
 "Libravatar addon is installed, too. Please disable Libravatar addon or this "
 "Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
 "nothing was found at Libravatar."
 msgstr ""
 
-#: gravatar.php:95
-msgid "Submit"
+#: gravatar.php:102
+msgid "Save Settings"
 msgstr ""
 
-#: gravatar.php:96
+#: gravatar.php:103
 msgid "Default avatar image"
 msgstr ""
 
-#: gravatar.php:96
+#: gravatar.php:103
 msgid "Select default avatar image if none was found at Gravatar. See README"
 msgstr ""
 
-#: gravatar.php:97
+#: gravatar.php:104
 msgid "Rating of images"
 msgstr ""
 
-#: gravatar.php:97
+#: gravatar.php:104
 msgid "Select the appropriate avatar rating for your site. See README"
 msgstr ""
-
-#: gravatar.php:111
-msgid "Gravatar settings updated."
-msgstr ""
diff --git a/gravatar/lang/ca/strings.php b/gravatar/lang/ca/strings.php
index 2c950e4c9..edb305cef 100644
--- a/gravatar/lang/ca/strings.php
+++ b/gravatar/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["generic profile image"] = "imatge de perfil genèrica";
diff --git a/gravatar/lang/cs/strings.php b/gravatar/lang/cs/strings.php
index 5cec81949..60a0533b0 100644
--- a/gravatar/lang/cs/strings.php
+++ b/gravatar/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["generic profile image"] = "generický profilový obrázek";
diff --git a/gravatar/lang/de/strings.php b/gravatar/lang/de/strings.php
index 4b5cd3402..8183e42d1 100644
--- a/gravatar/lang/de/strings.php
+++ b/gravatar/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["generic profile image"] = "generisches Profilbild";
diff --git a/gravatar/lang/es/strings.php b/gravatar/lang/es/strings.php
index a4a247c61..537652ac8 100644
--- a/gravatar/lang/es/strings.php
+++ b/gravatar/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["generic profile image"] = "imagen de perfir genético";
diff --git a/gravatar/lang/fi-fi/strings.php b/gravatar/lang/fi-fi/strings.php
index 3dc04e083..6153e8f31 100644
--- a/gravatar/lang/fi-fi/strings.php
+++ b/gravatar/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["generic profile image"] = "Yleinen profiilikuva";
@@ -11,10 +12,6 @@ $a->strings["monster face"] = "hirviö";
 $a->strings["computer generated face"] = "tietokoneella tuotettut kasvot";
 $a->strings["retro arcade style face"] = "retro-videopeli kasvot";
 $a->strings["Information"] = "Tietoja";
-$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
 $a->strings["Submit"] = "Lähetä";
 $a->strings["Default avatar image"] = "Avatarin oletuskuva";
-$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
-$a->strings["Rating of images"] = "";
-$a->strings["Select the appropriate avatar rating for your site. See README"] = "";
 $a->strings["Gravatar settings updated."] = "Gravatar -asetukset päivitetty.";
diff --git a/gravatar/lang/fr/strings.php b/gravatar/lang/fr/strings.php
index bc062845c..a2ff71301 100644
--- a/gravatar/lang/fr/strings.php
+++ b/gravatar/lang/fr/strings.php
@@ -3,19 +3,13 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["generic profile image"] = "image de profil générique";
 $a->strings["random geometric pattern"] = "Schéma géométrique aléatoire ";
-$a->strings["monster face"] = "";
 $a->strings["computer generated face"] = "visage généré par ordinateur";
-$a->strings["retro arcade style face"] = "";
 $a->strings["Information"] = "Information";
-$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
 $a->strings["Submit"] = "Envoyer";
 $a->strings["Default avatar image"] = "Image par défaut d'avatar";
-$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
-$a->strings["Rating of images"] = "";
-$a->strings["Select the appropriate avatar rating for your site. See README"] = "";
 $a->strings["Gravatar settings updated."] = "Paramètres de Gravatar mis à jour.";
diff --git a/gravatar/lang/hu/strings.php b/gravatar/lang/hu/strings.php
index 29d0bf792..0f75477fd 100644
--- a/gravatar/lang/hu/strings.php
+++ b/gravatar/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["generic profile image"] = "Általános profilkép";
diff --git a/gravatar/lang/it/strings.php b/gravatar/lang/it/strings.php
index 5e55a7611..770c5f077 100644
--- a/gravatar/lang/it/strings.php
+++ b/gravatar/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["generic profile image"] = "immagine generica del profilo";
diff --git a/gravatar/lang/nl/strings.php b/gravatar/lang/nl/strings.php
index 9883c8c78..dd615902a 100644
--- a/gravatar/lang/nl/strings.php
+++ b/gravatar/lang/nl/strings.php
@@ -3,19 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["generic profile image"] = "Generieke profiel-foto";
 $a->strings["random geometric pattern"] = "Willekeurige geometrische figuur";
-$a->strings["monster face"] = "";
-$a->strings["computer generated face"] = "";
-$a->strings["retro arcade style face"] = "";
 $a->strings["Information"] = "Informatie";
-$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
-$a->strings["Submit"] = "";
-$a->strings["Default avatar image"] = "";
-$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
-$a->strings["Rating of images"] = "";
-$a->strings["Select the appropriate avatar rating for your site. See README"] = "";
 $a->strings["Gravatar settings updated."] = "Gravatar instellingen opgeslagen";
diff --git a/gravatar/lang/pl/strings.php b/gravatar/lang/pl/strings.php
index 935fb7f1b..af05adb54 100644
--- a/gravatar/lang/pl/strings.php
+++ b/gravatar/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["generic profile image"] = "ogólny obraz profilu";
diff --git a/gravatar/lang/pt-br/strings.php b/gravatar/lang/pt-br/strings.php
index c7b3754fd..5b9381e9d 100644
--- a/gravatar/lang/pt-br/strings.php
+++ b/gravatar/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["generic profile image"] = "imagem de perfil genérica";
diff --git a/gravatar/lang/ro/strings.php b/gravatar/lang/ro/strings.php
index b962b1a27..355ec92b1 100644
--- a/gravatar/lang/ro/strings.php
+++ b/gravatar/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["generic profile image"] = "imagine generică de profil";
diff --git a/gravatar/lang/ru/strings.php b/gravatar/lang/ru/strings.php
index ee284a158..c787e79bc 100644
--- a/gravatar/lang/ru/strings.php
+++ b/gravatar/lang/ru/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	$n = intval($n);
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["generic profile image"] = "общее изображение профиля";
diff --git a/group_text/lang/C/messages.po b/group_text/lang/C/messages.po
index 781b923ad..87b94b862 100644
--- a/group_text/lang/C/messages.po
+++ b/group_text/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,18 +17,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: group_text.php:46
-msgid "Group Text settings updated."
-msgstr ""
-
-#: group_text.php:76
+#: group_text.php:62
 msgid "Group Text"
 msgstr ""
 
-#: group_text.php:78
+#: group_text.php:64
 msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
 msgstr ""
 
-#: group_text.php:84
-msgid "Submit"
+#: group_text.php:70
+msgid "Save Settings"
 msgstr ""
diff --git a/group_text/lang/ca/strings.php b/group_text/lang/ca/strings.php
index 8072b46f1..c32779a5d 100644
--- a/group_text/lang/ca/strings.php
+++ b/group_text/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Group Text settings updated."] = "La configuració del text del grup s'ha actualitzat.";
diff --git a/group_text/lang/cs/strings.php b/group_text/lang/cs/strings.php
index c5055a293..0181c595d 100644
--- a/group_text/lang/cs/strings.php
+++ b/group_text/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Group Text settings updated."] = "Nastavení Group Text aktualizována.";
diff --git a/group_text/lang/de/strings.php b/group_text/lang/de/strings.php
index 87464fe80..3deb34eb5 100644
--- a/group_text/lang/de/strings.php
+++ b/group_text/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Group Text settings updated."] = "Gruppen Text Einstellungen aktualisiert";
diff --git a/group_text/lang/es/strings.php b/group_text/lang/es/strings.php
index 9eccc680f..d48bc7ffc 100644
--- a/group_text/lang/es/strings.php
+++ b/group_text/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Group Text settings updated."] = "Ajustes de Grupo de Texto actualizados";
diff --git a/group_text/lang/fi-fi/strings.php b/group_text/lang/fi-fi/strings.php
index 7df538bbb..d26aebc9d 100644
--- a/group_text/lang/fi-fi/strings.php
+++ b/group_text/lang/fi-fi/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Group Text settings updated."] = "Group Text -asetukset päivitetty.";
 $a->strings["Group Text"] = "Group Text";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
 $a->strings["Submit"] = "Lähetä";
diff --git a/group_text/lang/it/strings.php b/group_text/lang/it/strings.php
index 36eb872bd..85881bfef 100644
--- a/group_text/lang/it/strings.php
+++ b/group_text/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Group Text settings updated."] = "Impostazioni di \"Editor Gruppi Testuale\" aggiornate.";
diff --git a/group_text/lang/nl/strings.php b/group_text/lang/nl/strings.php
index 2a99dc8e3..7fe23f7b8 100644
--- a/group_text/lang/nl/strings.php
+++ b/group_text/lang/nl/strings.php
@@ -3,10 +3,8 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Group Text settings updated."] = "Groupsberichten instellingen opgeslagen";
 $a->strings["Group Text"] = "Groepsbericht";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
-$a->strings["Submit"] = "";
diff --git a/group_text/lang/pl/strings.php b/group_text/lang/pl/strings.php
index a2c95868f..86bab60f0 100644
--- a/group_text/lang/pl/strings.php
+++ b/group_text/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Group Text settings updated."] = "Zaktualizowano ustawienia tekstu grupowego.";
diff --git a/group_text/lang/ro/strings.php b/group_text/lang/ro/strings.php
index c4f688824..0b4203344 100644
--- a/group_text/lang/ro/strings.php
+++ b/group_text/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Group Text settings updated."] = "Configurările Text Grup, au fost actualizate.";
diff --git a/group_text/lang/ru/strings.php b/group_text/lang/ru/strings.php
index 895ba662b..a1b80f8f8 100644
--- a/group_text/lang/ru/strings.php
+++ b/group_text/lang/ru/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	$n = intval($n);
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Group Text settings updated."] = "Настройки Group Text обновлены.";
diff --git a/ifttt/lang/C/messages.po b/ifttt/lang/C/messages.po
index 1ea670bc2..c87c66a7d 100644
--- a/ifttt/lang/C/messages.po
+++ b/ifttt/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ifttt.php:53 ifttt.php:57
+#: ifttt.php:50 ifttt.php:54
 msgid "IFTTT Mirror"
 msgstr ""
 
-#: ifttt.php:61
+#: ifttt.php:58
 msgid ""
 "Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
 "three Facebook recipes that are connected with <a href=\"https://ifttt.com/"
@@ -29,22 +29,22 @@ msgid ""
 "following parameters:"
 msgstr ""
 
-#: ifttt.php:68
+#: ifttt.php:65
 msgid "Body for \"new status message\""
 msgstr ""
 
-#: ifttt.php:70
+#: ifttt.php:67
 msgid "Body for \"new photo upload\""
 msgstr ""
 
-#: ifttt.php:72
+#: ifttt.php:69
 msgid "Body for \"new link post\""
 msgstr ""
 
-#: ifttt.php:77
+#: ifttt.php:74
 msgid "Generate new key"
 msgstr ""
 
-#: ifttt.php:81
+#: ifttt.php:78
 msgid "Save Settings"
 msgstr ""
diff --git a/ifttt/lang/cs/strings.php b/ifttt/lang/cs/strings.php
index 45587f39c..04a95b1cc 100644
--- a/ifttt/lang/cs/strings.php
+++ b/ifttt/lang/cs/strings.php
@@ -3,11 +3,10 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["IFTTT Mirror"] = "Zrcadlení IFTTT";
-$a->strings["Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:"] = "Vytvořte si účet na <a href=\"http://www.ifttt.com\">IFTTT</a>. Vytvořte si tři recepty na Facebooku, které jsou připojeny k <a href=\"https://ifttt.com/maker\">Makeru</a> (ve formě \"If Facebook then Maker\") s následujícími parametry:";
 $a->strings["Body for \"new status message\""] = "Tělo pole \"nová statusová zpráva\"";
 $a->strings["Body for \"new photo upload\""] = "Tělo pole \"nová nahraná fotografie\"";
 $a->strings["Body for \"new link post\""] = "Tělo pole \"nový příspěvek\"";
diff --git a/ifttt/lang/de/strings.php b/ifttt/lang/de/strings.php
index a16db4e92..3485ba19b 100644
--- a/ifttt/lang/de/strings.php
+++ b/ifttt/lang/de/strings.php
@@ -2,11 +2,11 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["IFTTT Mirror"] = "IFTTT Spiegel";
-$a->strings["Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:"] = "Lege ein Konto bei <a href=\"http://www.ifttt.com\"> IFTTT an</a>. Gebe drei Facebook Empfänger ein, die mit <a href=\"https://ifttt.com/maker\">Maker </a> verbunden sind (in der Form \"wenn Facebook dann Maker\"), mit den folgenden Parametern:";
 $a->strings["Body for \"new status message\""] = "Body für \"Neue Status Meldung\"";
 $a->strings["Body for \"new photo upload\""] = "Body für \"Neues Foto hochgeladen\"";
 $a->strings["Body for \"new link post\""] = "Body für \"Neue Nachricht\"";
diff --git a/ifttt/lang/en-gb/strings.php b/ifttt/lang/en-gb/strings.php
index 0b5aaeada..e0e7578f2 100644
--- a/ifttt/lang/en-gb/strings.php
+++ b/ifttt/lang/en-gb/strings.php
@@ -3,11 +3,10 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["IFTTT Mirror"] = "IFTTT Mirror";
-$a->strings["Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:"] = "Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:";
 $a->strings["Body for \"new status message\""] = "Body for \"new status message\"";
 $a->strings["Body for \"new photo upload\""] = "Body for \"new photo upload\"";
 $a->strings["Body for \"new link post\""] = "Body for \"new link post\"";
diff --git a/ifttt/lang/fi-fi/strings.php b/ifttt/lang/fi-fi/strings.php
index 3ca734cb4..1d71a7c1f 100644
--- a/ifttt/lang/fi-fi/strings.php
+++ b/ifttt/lang/fi-fi/strings.php
@@ -2,13 +2,9 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
-$a->strings["IFTTT Mirror"] = "";
-$a->strings["Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:"] = "";
-$a->strings["Body for \"new status message\""] = "";
-$a->strings["Body for \"new photo upload\""] = "";
-$a->strings["Body for \"new link post\""] = "";
 $a->strings["Generate new key"] = "Luo uusi avain";
 $a->strings["Save Settings"] = "Tallenna asetukset";
diff --git a/ifttt/lang/pl/strings.php b/ifttt/lang/pl/strings.php
index eab45ef56..4b87d05bf 100644
--- a/ifttt/lang/pl/strings.php
+++ b/ifttt/lang/pl/strings.php
@@ -2,11 +2,11 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["IFTTT Mirror"] = "Lustro IFTTT";
-$a->strings["Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:"] = "Utwórz konto na <a href=\"http://www.ifttt.com\">IFTTT</a>. Utwórz trzy przepisy na Facebooku, które są powiązane z <a href=\"https://ifttt.com/maker\">Maker</a> (W formie \"jeśli Facebook następnie Maker\") z następujących parametrów:";
 $a->strings["Body for \"new status message\""] = "Treść dla \"nowy status wiadomości\"";
 $a->strings["Body for \"new photo upload\""] = "Treść dla \"nowe przesyłanie zdjęć\"";
 $a->strings["Body for \"new link post\""] = "Treść dla \"nowe łącza postu\"";
diff --git a/ifttt/lang/zh-cn/strings.php b/ifttt/lang/zh-cn/strings.php
index 61e3402e2..ada75bca2 100644
--- a/ifttt/lang/zh-cn/strings.php
+++ b/ifttt/lang/zh-cn/strings.php
@@ -3,13 +3,9 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["IFTTT Mirror"] = "IFTTT 镜像";
-$a->strings["Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:"] = "在<a href=\"http://www.ifttt.com\">IFTTT</a>创建一个帐户。创建三个与<a href=\"https://ifttt.com/maker\">Maker</a>(表格为“ if Facebook then Maker”)相关的 Facebook 菜谱，参数如下:";
-$a->strings["Body for \"new status message\""] = "";
-$a->strings["Body for \"new photo upload\""] = "";
-$a->strings["Body for \"new link post\""] = "";
 $a->strings["Generate new key"] = "生成新的密钥";
 $a->strings["Save Settings"] = "保存设置";
diff --git a/ijpost/lang/C/messages.po b/ijpost/lang/C/messages.po
index 33e9c31aa..1abb78706 100644
--- a/ijpost/lang/C/messages.po
+++ b/ijpost/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,26 +21,26 @@ msgstr ""
 msgid "Post to Insanejournal"
 msgstr ""
 
-#: ijpost.php:70
-msgid "InsaneJournal Post Settings"
+#: ijpost.php:71 ijpost.php:75
+msgid "InsaneJournal Export"
 msgstr ""
 
-#: ijpost.php:72
+#: ijpost.php:79
 msgid "Enable InsaneJournal Post Addon"
 msgstr ""
 
-#: ijpost.php:77
+#: ijpost.php:84
 msgid "InsaneJournal username"
 msgstr ""
 
-#: ijpost.php:82
+#: ijpost.php:89
 msgid "InsaneJournal password"
 msgstr ""
 
-#: ijpost.php:87
+#: ijpost.php:94
 msgid "Post to InsaneJournal by default"
 msgstr ""
 
-#: ijpost.php:93
-msgid "Submit"
+#: ijpost.php:99
+msgid "Save Settings"
 msgstr ""
diff --git a/ijpost/lang/ca/strings.php b/ijpost/lang/ca/strings.php
index c0f8d9c07..5abf4a9eb 100644
--- a/ijpost/lang/ca/strings.php
+++ b/ijpost/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Insanejournal"] = "Enviar a Insanejournal";
diff --git a/ijpost/lang/cs/strings.php b/ijpost/lang/cs/strings.php
index c9ef79787..4b2b3e38b 100644
--- a/ijpost/lang/cs/strings.php
+++ b/ijpost/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Insanejournal"] = "Posílat na InsaneJournal";
diff --git a/ijpost/lang/de/strings.php b/ijpost/lang/de/strings.php
index 3b8dbb6d8..acec38902 100644
--- a/ijpost/lang/de/strings.php
+++ b/ijpost/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten.";
diff --git a/ijpost/lang/es/strings.php b/ijpost/lang/es/strings.php
index 76c9e5f94..f513d85ba 100644
--- a/ijpost/lang/es/strings.php
+++ b/ijpost/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Insanejournal"] = "Publicar en Insanejournal";
diff --git a/ijpost/lang/fi-fi/strings.php b/ijpost/lang/fi-fi/strings.php
index 9b4b280d9..a6ec9cca3 100644
--- a/ijpost/lang/fi-fi/strings.php
+++ b/ijpost/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Insanejournal"] = "Lähetä InsaneJournaliin";
diff --git a/ijpost/lang/it/strings.php b/ijpost/lang/it/strings.php
index d8bd49e98..b3d3da54e 100644
--- a/ijpost/lang/it/strings.php
+++ b/ijpost/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Insanejournal"] = "Invia a InsaneJournal";
diff --git a/ijpost/lang/nl/strings.php b/ijpost/lang/nl/strings.php
index 4e0dbf3d5..12981866d 100644
--- a/ijpost/lang/nl/strings.php
+++ b/ijpost/lang/nl/strings.php
@@ -3,13 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Insanejournal"] = "Plaatsen op Insanejournal";
 $a->strings["InsaneJournal Post Settings"] = "InsaneJournal Post instellingen";
 $a->strings["Enable InsaneJournal Post Addon"] = "InsaneJournal Post Addon inschakelen";
-$a->strings["InsaneJournal username"] = "";
-$a->strings["InsaneJournal password"] = "";
 $a->strings["Post to InsaneJournal by default"] = "Plaatsen op InsaneJournal als standaard instellen ";
-$a->strings["Submit"] = "";
diff --git a/ijpost/lang/pl/strings.php b/ijpost/lang/pl/strings.php
index eea5e0eb5..266e7d277 100644
--- a/ijpost/lang/pl/strings.php
+++ b/ijpost/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Insanejournal"] = "Opublikuj w Insanejournal";
diff --git a/ijpost/lang/pt-br/strings.php b/ijpost/lang/pt-br/strings.php
index fbc1f2840..ce901cb79 100644
--- a/ijpost/lang/pt-br/strings.php
+++ b/ijpost/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Post to Insanejournal"] = "Publicar no Insanejournal";
diff --git a/ijpost/lang/ro/strings.php b/ijpost/lang/ro/strings.php
index 35d64ea6c..607d3da7c 100644
--- a/ijpost/lang/ro/strings.php
+++ b/ijpost/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Post to Insanejournal"] = "Postare pe Insanejournal";
diff --git a/impressum/lang/C/messages.po b/impressum/lang/C/messages.po
index 0700e210e..a1ca6659d 100644
--- a/impressum/lang/C/messages.po
+++ b/impressum/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,71 +17,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: impressum.php:37
+#: impressum.php:53
 msgid "Impressum"
 msgstr ""
 
-#: impressum.php:50 impressum.php:52 impressum.php:84
+#: impressum.php:66 impressum.php:68 impressum.php:99
 msgid "Site Owner"
 msgstr ""
 
-#: impressum.php:50 impressum.php:88
+#: impressum.php:66 impressum.php:103
 msgid "Email Address"
 msgstr ""
 
-#: impressum.php:55 impressum.php:86
+#: impressum.php:71 impressum.php:101
 msgid "Postal Address"
 msgstr ""
 
-#: impressum.php:61
+#: impressum.php:77
 msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
 "refer to the README file of the addon."
 msgstr ""
 
-#: impressum.php:78
-msgid "Settings updated."
+#: impressum.php:98
+msgid "Save Settings"
 msgstr ""
 
-#: impressum.php:83
-msgid "Submit"
-msgstr ""
-
-#: impressum.php:84
+#: impressum.php:99
 msgid "The page operators name."
 msgstr ""
 
-#: impressum.php:85
+#: impressum.php:100
 msgid "Site Owners Profile"
 msgstr ""
 
-#: impressum.php:85
+#: impressum.php:100
 msgid "Profile address of the operator."
 msgstr ""
 
-#: impressum.php:86
+#: impressum.php:101
 msgid "How to contact the operator via snail mail. You can use BBCode here."
 msgstr ""
 
-#: impressum.php:87
+#: impressum.php:102
 msgid "Notes"
 msgstr ""
 
-#: impressum.php:87
+#: impressum.php:102
 msgid ""
 "Additional notes that are displayed beneath the contact information. You can "
 "use BBCode here."
 msgstr ""
 
-#: impressum.php:88
+#: impressum.php:103
 msgid "How to contact the operator via email. (will be displayed obfuscated)"
 msgstr ""
 
-#: impressum.php:89
+#: impressum.php:104
 msgid "Footer note"
 msgstr ""
 
-#: impressum.php:89
+#: impressum.php:104
 msgid "Text for the footer. You can use BBCode here."
 msgstr ""
diff --git a/impressum/lang/ca/strings.php b/impressum/lang/ca/strings.php
index 2f2e59e2e..6db879a5a 100644
--- a/impressum/lang/ca/strings.php
+++ b/impressum/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Impressum"] = "empremta";
diff --git a/impressum/lang/cs/strings.php b/impressum/lang/cs/strings.php
index 9e49b43a9..ad99cea1a 100644
--- a/impressum/lang/cs/strings.php
+++ b/impressum/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Impressum"] = "Impressum";
diff --git a/impressum/lang/de/strings.php b/impressum/lang/de/strings.php
index 0cf1a4aea..0e73d5115 100644
--- a/impressum/lang/de/strings.php
+++ b/impressum/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Impressum"] = "Impressum";
diff --git a/impressum/lang/en-gb/strings.php b/impressum/lang/en-gb/strings.php
index 3d1a2ec15..582013978 100644
--- a/impressum/lang/en-gb/strings.php
+++ b/impressum/lang/en-gb/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Impressum"] = "Impressum";
diff --git a/impressum/lang/es/strings.php b/impressum/lang/es/strings.php
index fea759eb3..ddbe67598 100644
--- a/impressum/lang/es/strings.php
+++ b/impressum/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Impressum"] = "Impressum";
diff --git a/impressum/lang/fi-fi/strings.php b/impressum/lang/fi-fi/strings.php
index 404f0f131..75eaedc29 100644
--- a/impressum/lang/fi-fi/strings.php
+++ b/impressum/lang/fi-fi/strings.php
@@ -3,22 +3,16 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Impressum"] = "Impressum";
 $a->strings["Site Owner"] = "Sivuston omistaja";
 $a->strings["Email Address"] = "Sähköpostiosoite";
 $a->strings["Postal Address"] = "Postiosoite";
-$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "";
 $a->strings["Settings updated."] = "Asetukset tallennettu";
 $a->strings["Submit"] = "Lähetä";
 $a->strings["The page operators name."] = "Sivuston ylläpitäjän nimi.";
 $a->strings["Site Owners Profile"] = "Sivuston omistajan profiili";
 $a->strings["Profile address of the operator."] = "Ylläpitäjän profiiliosoite.";
-$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "";
 $a->strings["Notes"] = "Muistiinpanot";
-$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "";
-$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "";
-$a->strings["Footer note"] = "";
-$a->strings["Text for the footer. You can use BBCode here."] = "";
diff --git a/impressum/lang/fr/strings.php b/impressum/lang/fr/strings.php
index f0f15d8f5..97ee443ab 100644
--- a/impressum/lang/fr/strings.php
+++ b/impressum/lang/fr/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Impressum"] = "Mentions légales";
diff --git a/impressum/lang/it/strings.php b/impressum/lang/it/strings.php
index 25f3b1bea..62f5a416e 100644
--- a/impressum/lang/it/strings.php
+++ b/impressum/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Impressum"] = "Colophon";
diff --git a/impressum/lang/nl/strings.php b/impressum/lang/nl/strings.php
index bfc0f7562..1720ae63b 100644
--- a/impressum/lang/nl/strings.php
+++ b/impressum/lang/nl/strings.php
@@ -3,22 +3,9 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Impressum"] = "Colofon";
 $a->strings["Site Owner"] = "Siteeigenaar";
-$a->strings["Email Address"] = "";
-$a->strings["Postal Address"] = "";
-$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "";
 $a->strings["Settings updated."] = "Instellingen opgeslagen";
-$a->strings["Submit"] = "";
-$a->strings["The page operators name."] = "";
-$a->strings["Site Owners Profile"] = "";
-$a->strings["Profile address of the operator."] = "";
-$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "";
-$a->strings["Notes"] = "";
-$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "";
-$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "";
-$a->strings["Footer note"] = "";
-$a->strings["Text for the footer. You can use BBCode here."] = "";
diff --git a/impressum/lang/pl/strings.php b/impressum/lang/pl/strings.php
index fec7b84b3..5a919ec22 100644
--- a/impressum/lang/pl/strings.php
+++ b/impressum/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Impressum"] = "Stopka redakcyjna";
diff --git a/impressum/lang/pt-br/strings.php b/impressum/lang/pt-br/strings.php
index 90273f968..041ae7329 100644
--- a/impressum/lang/pt-br/strings.php
+++ b/impressum/lang/pt-br/strings.php
@@ -2,22 +2,15 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Impressum"] = "Impressum";
 $a->strings["Site Owner"] = "Responsável pelo site";
 $a->strings["Email Address"] = "Endereço de e-mail";
 $a->strings["Postal Address"] = "Endereço postal";
-$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "";
 $a->strings["Settings updated."] = "As configurações foram atualizadas.";
 $a->strings["Submit"] = "Enviar";
-$a->strings["The page operators name."] = "";
 $a->strings["Site Owners Profile"] = "Perfil do responsável pelo site";
-$a->strings["Profile address of the operator."] = "";
-$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "";
-$a->strings["Notes"] = "";
-$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "";
-$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "";
 $a->strings["Footer note"] = "Nota de rodapé";
-$a->strings["Text for the footer. You can use BBCode here."] = "";
diff --git a/impressum/lang/ro/strings.php b/impressum/lang/ro/strings.php
index 0b7d9ebb5..dc66a7ab7 100644
--- a/impressum/lang/ro/strings.php
+++ b/impressum/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Impressum"] = "Impressum";
diff --git a/infiniteimprobabilitydrive/lang/C/messages.po b/infiniteimprobabilitydrive/lang/C/messages.po
index 0e867643f..aed367613 100644
--- a/infiniteimprobabilitydrive/lang/C/messages.po
+++ b/infiniteimprobabilitydrive/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: infiniteimprobabilitydrive.php:19
+#: infiniteimprobabilitydrive.php:18
 msgid "Infinite Improbability Drive"
 msgstr ""
diff --git a/infiniteimprobabilitydrive/lang/ca/strings.php b/infiniteimprobabilitydrive/lang/ca/strings.php
index 9020ca59a..43212f562 100644
--- a/infiniteimprobabilitydrive/lang/ca/strings.php
+++ b/infiniteimprobabilitydrive/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Infinite Improbability Drive"] = "Unitat de millora de la infinitat";
diff --git a/infiniteimprobabilitydrive/lang/cs/strings.php b/infiniteimprobabilitydrive/lang/cs/strings.php
index 9dec8bccd..f3d70fc3c 100644
--- a/infiniteimprobabilitydrive/lang/cs/strings.php
+++ b/infiniteimprobabilitydrive/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive";
diff --git a/infiniteimprobabilitydrive/lang/de/strings.php b/infiniteimprobabilitydrive/lang/de/strings.php
index d98dd403e..c6a052b29 100644
--- a/infiniteimprobabilitydrive/lang/de/strings.php
+++ b/infiniteimprobabilitydrive/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive";
diff --git a/infiniteimprobabilitydrive/lang/es/strings.php b/infiniteimprobabilitydrive/lang/es/strings.php
index 7387f4dd4..957281b8c 100644
--- a/infiniteimprobabilitydrive/lang/es/strings.php
+++ b/infiniteimprobabilitydrive/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Infinite Improbability Drive"] = "Drive de improbabilidad infinita";
diff --git a/infiniteimprobabilitydrive/lang/it/strings.php b/infiniteimprobabilitydrive/lang/it/strings.php
index 5909f7543..44e9dbb45 100644
--- a/infiniteimprobabilitydrive/lang/it/strings.php
+++ b/infiniteimprobabilitydrive/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Infinite Improbability Drive"] = "Motore ad Improbabilità Infinita";
diff --git a/infiniteimprobabilitydrive/lang/nl/strings.php b/infiniteimprobabilitydrive/lang/nl/strings.php
index 9da6a7269..54aa41464 100644
--- a/infiniteimprobabilitydrive/lang/nl/strings.php
+++ b/infiniteimprobabilitydrive/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Infinite Improbability Drive"] = "Oneindige schijf voor onbetrouwbaarheid";
diff --git a/infiniteimprobabilitydrive/lang/pl/strings.php b/infiniteimprobabilitydrive/lang/pl/strings.php
index 85356333b..1201ef7aa 100644
--- a/infiniteimprobabilitydrive/lang/pl/strings.php
+++ b/infiniteimprobabilitydrive/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Infinite Improbability Drive"] = "Wyświetl losowego użytkownika";
diff --git a/infiniteimprobabilitydrive/lang/pt-br/strings.php b/infiniteimprobabilitydrive/lang/pt-br/strings.php
index 10c7f46e6..ceffff1b3 100644
--- a/infiniteimprobabilitydrive/lang/pt-br/strings.php
+++ b/infiniteimprobabilitydrive/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Infinite Improbability Drive"] = "Gerador de improbabilidade infinita";
diff --git a/infiniteimprobabilitydrive/lang/ro/strings.php b/infiniteimprobabilitydrive/lang/ro/strings.php
index b082c2e81..508ae2061 100644
--- a/infiniteimprobabilitydrive/lang/ro/strings.php
+++ b/infiniteimprobabilitydrive/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Infinite Improbability Drive"] = "Unitate improbabil infinită";
diff --git a/infiniteimprobabilitydrive/lang/ru/strings.php b/infiniteimprobabilitydrive/lang/ru/strings.php
index 2852e0658..245943c9c 100644
--- a/infiniteimprobabilitydrive/lang/ru/strings.php
+++ b/infiniteimprobabilitydrive/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive";
diff --git a/irc/lang/C/messages.po b/irc/lang/C/messages.po
index 86c203aa6..bf560eac1 100644
--- a/irc/lang/C/messages.po
+++ b/irc/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-08 13:17+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,45 +17,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: irc.php:37
+#: irc.php:34
 msgid "IRC Settings"
 msgstr ""
 
-#: irc.php:38
+#: irc.php:35
 msgid ""
 "Here you can change the system wide settings for the channels to "
 "automatically join and access via the side bar. Note the changes you do "
 "here, only effect the channel selection if you are logged in."
 msgstr ""
 
-#: irc.php:39 irc.php:136
+#: irc.php:36 irc.php:134
 msgid "Save Settings"
 msgstr ""
 
-#: irc.php:40 irc.php:137
+#: irc.php:37 irc.php:135
 msgid "Channel(s) to auto connect (comma separated)"
 msgstr ""
 
-#: irc.php:40 irc.php:137
+#: irc.php:37 irc.php:135
 msgid ""
 "List of channels that shall automatically connected to when the app is "
 "launched."
 msgstr ""
 
-#: irc.php:41 irc.php:138
+#: irc.php:38 irc.php:136
 msgid "Popular Channels (comma separated)"
 msgstr ""
 
-#: irc.php:41 irc.php:138
+#: irc.php:38 irc.php:136
 msgid ""
 "List of popular channels, will be displayed at the side and hotlinked for "
 "easy joining."
 msgstr ""
 
-#: irc.php:57 irc.php:128
-msgid "IRC settings saved."
-msgstr ""
-
 #: irc.php:62
 msgid "IRC Chatroom"
 msgstr ""
diff --git a/irc/lang/cs/strings.php b/irc/lang/cs/strings.php
index f97b463eb..17e8e218c 100644
--- a/irc/lang/cs/strings.php
+++ b/irc/lang/cs/strings.php
@@ -3,11 +3,10 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["IRC Settings"] = "Nastavení IRC";
-$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "";
 $a->strings["Save Settings"] = "Uložit nastavení";
 $a->strings["Channel(s) to auto connect (comma separated)"] = "Kanál(y) pro automatické připojení (oddělené čárkami)";
 $a->strings["List of channels that shall automatically connected to when the app is launched."] = "Seznam kanálů, které budou při spuštění aplikace automaticky připojeny.";
diff --git a/irc/lang/de/strings.php b/irc/lang/de/strings.php
index cb1ba7c45..11d57dd01 100644
--- a/irc/lang/de/strings.php
+++ b/irc/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["IRC Settings"] = "IRC Einstellungen";
diff --git a/irc/lang/es/strings.php b/irc/lang/es/strings.php
index 870c53f0a..f26b77dc4 100644
--- a/irc/lang/es/strings.php
+++ b/irc/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["IRC Settings"] = "Ajustes de IRC";
diff --git a/irc/lang/fi-fi/strings.php b/irc/lang/fi-fi/strings.php
index 4c1c3e331..3c3a0f8ca 100644
--- a/irc/lang/fi-fi/strings.php
+++ b/irc/lang/fi-fi/strings.php
@@ -3,16 +3,14 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["IRC Settings"] = "IRC-asetukset";
-$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "";
 $a->strings["Save Settings"] = "Tallenna asetukset";
 $a->strings["Channel(s) to auto connect (comma separated)"] = "Kanavat jota yhdistetään automaattisesti (pilkuilla eroteltu luettelo)";
 $a->strings["List of channels that shall automatically connected to when the app is launched."] = "Kanavat johon luodaan yhteys automaattisesti kun sovellus käynnistyy.";
 $a->strings["Popular Channels (comma separated)"] = "Suositut kanavat (pilkuilla eroteltu luettelo)";
-$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "";
 $a->strings["IRC settings saved."] = "IRC-asetukset tallennettu.";
 $a->strings["IRC Chatroom"] = "IRC-tsättihuone";
 $a->strings["Popular Channels"] = "Suositut kanavat";
diff --git a/irc/lang/fr/strings.php b/irc/lang/fr/strings.php
index a6244e25b..fa88492a2 100644
--- a/irc/lang/fr/strings.php
+++ b/irc/lang/fr/strings.php
@@ -3,16 +3,8 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["IRC Settings"] = "Paramètres de l'IRC";
-$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "";
 $a->strings["Save Settings"] = "Sauvegarder les paramètres";
-$a->strings["Channel(s) to auto connect (comma separated)"] = "";
-$a->strings["List of channels that shall automatically connected to when the app is launched."] = "";
-$a->strings["Popular Channels (comma separated)"] = "";
-$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "";
-$a->strings["IRC settings saved."] = "";
-$a->strings["IRC Chatroom"] = "";
-$a->strings["Popular Channels"] = "";
diff --git a/irc/lang/it/strings.php b/irc/lang/it/strings.php
index 0c970453b..69f2163ba 100644
--- a/irc/lang/it/strings.php
+++ b/irc/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["IRC Settings"] = "Impostazioni IRC";
diff --git a/irc/lang/nl/strings.php b/irc/lang/nl/strings.php
index c834f69c3..f6d06f469 100644
--- a/irc/lang/nl/strings.php
+++ b/irc/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["IRC Settings"] = "IRC instellingen";
diff --git a/irc/lang/pl/strings.php b/irc/lang/pl/strings.php
index 25a825d79..b32c3a777 100644
--- a/irc/lang/pl/strings.php
+++ b/irc/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["IRC Settings"] = "Ustawienia IRC";
diff --git a/irc/lang/pt-br/strings.php b/irc/lang/pt-br/strings.php
index 28a4e468d..a6cf82989 100644
--- a/irc/lang/pt-br/strings.php
+++ b/irc/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["IRC Settings"] = "Configurações do IRC";
diff --git a/irc/lang/ro/strings.php b/irc/lang/ro/strings.php
index bf70bbe68..f1e629acf 100644
--- a/irc/lang/ro/strings.php
+++ b/irc/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["IRC Settings"] = "Configurări IRC";
diff --git a/irc/lang/zh-cn/strings.php b/irc/lang/zh-cn/strings.php
index 4268cd1e7..93b70cfcc 100644
--- a/irc/lang/zh-cn/strings.php
+++ b/irc/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["IRC Settings"] = "IRC 设置";
diff --git a/jappixmini/lang/C/messages.po b/jappixmini/lang/C/messages.po
index 0b9f273f0..267236082 100644
--- a/jappixmini/lang/C/messages.po
+++ b/jappixmini/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,58 +17,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: jappixmini.php:266
-msgid "Jappix Mini addon settings"
+#: jappixmini.php:318 jappixmini.php:322
+msgid "Jappix Mini"
 msgstr ""
 
-#: jappixmini.php:268
+#: jappixmini.php:325
 msgid "Activate addon"
 msgstr ""
 
-#: jappixmini.php:271
+#: jappixmini.php:328
 msgid "Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
 msgstr ""
 
-#: jappixmini.php:274
+#: jappixmini.php:331
 msgid "Jabber username"
 msgstr ""
 
-#: jappixmini.php:277
+#: jappixmini.php:334
 msgid "Jabber server"
 msgstr ""
 
-#: jappixmini.php:281
+#: jappixmini.php:339
 msgid "Jabber BOSH host"
 msgstr ""
 
-#: jappixmini.php:285
+#: jappixmini.php:344
 msgid "Jabber password"
 msgstr ""
 
-#: jappixmini.php:290
+#: jappixmini.php:349
 msgid "Encrypt Jabber password with Friendica password (recommended)"
 msgstr ""
 
-#: jappixmini.php:293
+#: jappixmini.php:352
 msgid "Friendica password"
 msgstr ""
 
-#: jappixmini.php:296
+#: jappixmini.php:355
 msgid "Approve subscription requests from Friendica contacts automatically"
 msgstr ""
 
-#: jappixmini.php:299
+#: jappixmini.php:358
 msgid "Subscribe to Friendica contacts automatically"
 msgstr ""
 
-#: jappixmini.php:302
+#: jappixmini.php:361
 msgid "Purge internal list of jabber addresses of contacts"
 msgstr ""
 
-#: jappixmini.php:307
-msgid "Submit"
+#: jappixmini.php:368
+msgid "Save Settings"
 msgstr ""
 
-#: jappixmini.php:308
+#: jappixmini.php:369
 msgid "Add contact"
 msgstr ""
diff --git a/jappixmini/lang/cs/strings.php b/jappixmini/lang/cs/strings.php
index 4fe5d3521..7079761e9 100644
--- a/jappixmini/lang/cs/strings.php
+++ b/jappixmini/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Jappix Mini addon settings"] = "Nastavení rozšíření Jappix Mini";
diff --git a/jappixmini/lang/de/strings.php b/jappixmini/lang/de/strings.php
index 5982ac1d4..e38d1053c 100644
--- a/jappixmini/lang/de/strings.php
+++ b/jappixmini/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Jappix Mini addon settings"] = "Jappix Mini Addon Einstellungen";
diff --git a/jappixmini/lang/es/strings.php b/jappixmini/lang/es/strings.php
index 440ccefdd..ac2860ae7 100644
--- a/jappixmini/lang/es/strings.php
+++ b/jappixmini/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Jappix Mini addon settings"] = "Ajustes del addon de Jappix Mini";
diff --git a/jappixmini/lang/fi-fi/strings.php b/jappixmini/lang/fi-fi/strings.php
index f86fbc3c8..60b17be2a 100644
--- a/jappixmini/lang/fi-fi/strings.php
+++ b/jappixmini/lang/fi-fi/strings.php
@@ -3,12 +3,11 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Jappix Mini addon settings"] = "Jappix Mini -lisäosan asetukset";
 $a->strings["Activate addon"] = "Ota lisäosa käyttöön";
-$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "";
 $a->strings["Jabber username"] = "Jabber -käyttäjätunnus";
 $a->strings["Jabber server"] = "Jabber -palvelin";
 $a->strings["Jabber BOSH host"] = "Jabber BOSH-palvelin";
@@ -16,7 +15,5 @@ $a->strings["Jabber password"] = "Jabber -salasana";
 $a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Salaa Jabber -salasana Friendica -salasanalla (suositeltava)";
 $a->strings["Friendica password"] = "Friendica -salasana";
 $a->strings["Approve subscription requests from Friendica contacts automatically"] = "Hyväksy automaattisesti tilauspyynnöt Friendica -kontakteilta";
-$a->strings["Subscribe to Friendica contacts automatically"] = "";
-$a->strings["Purge internal list of jabber addresses of contacts"] = "";
 $a->strings["Submit"] = "Lähetä";
 $a->strings["Add contact"] = "Lisää kontakti";
diff --git a/jappixmini/lang/fr/strings.php b/jappixmini/lang/fr/strings.php
index 35ceca655..86bbba47d 100644
--- a/jappixmini/lang/fr/strings.php
+++ b/jappixmini/lang/fr/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Jappix Mini addon settings"] = "Paramètres de l'addon Jappix Mini";
diff --git a/jappixmini/lang/it/strings.php b/jappixmini/lang/it/strings.php
index 51f6b7949..f172f79d6 100644
--- a/jappixmini/lang/it/strings.php
+++ b/jappixmini/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Jappix Mini addon settings"] = "Impostazioni plugin Jappix Mini";
diff --git a/jappixmini/lang/nl/strings.php b/jappixmini/lang/nl/strings.php
index 7753199ad..aacd530f3 100644
--- a/jappixmini/lang/nl/strings.php
+++ b/jappixmini/lang/nl/strings.php
@@ -3,20 +3,8 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Jappix Mini addon settings"] = "Jappix Mini addon instellingen";
 $a->strings["Activate addon"] = "Activatie addon";
-$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "";
-$a->strings["Jabber username"] = "";
-$a->strings["Jabber server"] = "";
-$a->strings["Jabber BOSH host"] = "";
-$a->strings["Jabber password"] = "";
-$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "";
-$a->strings["Friendica password"] = "";
-$a->strings["Approve subscription requests from Friendica contacts automatically"] = "";
-$a->strings["Subscribe to Friendica contacts automatically"] = "";
-$a->strings["Purge internal list of jabber addresses of contacts"] = "";
-$a->strings["Submit"] = "";
-$a->strings["Add contact"] = "";
diff --git a/jappixmini/lang/pl/strings.php b/jappixmini/lang/pl/strings.php
index efc4a7c82..0f24c67bc 100644
--- a/jappixmini/lang/pl/strings.php
+++ b/jappixmini/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Jappix Mini addon settings"] = "Ustawienia dodatku Jappix Mini";
diff --git a/jappixmini/lang/pt-br/strings.php b/jappixmini/lang/pt-br/strings.php
index 6d5b61bcf..9b898ed6a 100644
--- a/jappixmini/lang/pt-br/strings.php
+++ b/jappixmini/lang/pt-br/strings.php
@@ -2,20 +2,12 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
-$a->strings["Jappix Mini addon settings"] = "";
-$a->strings["Activate addon"] = "";
-$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "";
 $a->strings["Jabber username"] = "Nome de usuário no Jabber";
-$a->strings["Jabber server"] = "";
-$a->strings["Jabber BOSH host"] = "";
 $a->strings["Jabber password"] = "Senha do Jabber";
 $a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Criptografar senha de Jabber com senha do Friendica (recomendado)";
 $a->strings["Friendica password"] = "Senha do Friendica";
-$a->strings["Approve subscription requests from Friendica contacts automatically"] = "";
-$a->strings["Subscribe to Friendica contacts automatically"] = "";
-$a->strings["Purge internal list of jabber addresses of contacts"] = "";
 $a->strings["Submit"] = "Enviar";
-$a->strings["Add contact"] = "";
diff --git a/jappixmini/lang/ro/strings.php b/jappixmini/lang/ro/strings.php
index d88743cbd..bd0ed973f 100644
--- a/jappixmini/lang/ro/strings.php
+++ b/jappixmini/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Jappix Mini addon settings"] = "Configurare addon Mini Jappix";
diff --git a/js_upload/lang/C/messages.po b/js_upload/lang/C/messages.po
index e2e081307..aa474d50a 100644
--- a/js_upload/lang/C/messages.po
+++ b/js_upload/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: js_upload.php:43
-msgid "Upload a file"
+#: js_upload.php:33
+msgid "Select files for upload"
 msgstr ""
 
-#: js_upload.php:44
+#: js_upload.php:34
 msgid "Drop files here to upload"
 msgstr ""
 
-#: js_upload.php:45
+#: js_upload.php:35
 msgid "Cancel"
 msgstr ""
 
-#: js_upload.php:46
+#: js_upload.php:36
 msgid "Failed"
 msgstr ""
 
-#: js_upload.php:303
+#: js_upload.php:214
 msgid "No files were uploaded."
 msgstr ""
 
-#: js_upload.php:309
+#: js_upload.php:220
 msgid "Uploaded file is empty"
 msgstr ""
 
-#: js_upload.php:321
+#: js_upload.php:232
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: js_upload.php:332
+#: js_upload.php:246
 msgid "File has an invalid extension, it should be one of "
 msgstr ""
 
-#: js_upload.php:343
+#: js_upload.php:257
 msgid "Upload was cancelled, or server error encountered"
 msgstr ""
diff --git a/js_upload/lang/cs/strings.php b/js_upload/lang/cs/strings.php
index 6cb6b6549..8cbcac7e3 100644
--- a/js_upload/lang/cs/strings.php
+++ b/js_upload/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["Upload a file"] = "Nahrát soubor";
diff --git a/js_upload/lang/de/strings.php b/js_upload/lang/de/strings.php
index 5a680cb23..0ecead2c0 100644
--- a/js_upload/lang/de/strings.php
+++ b/js_upload/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Upload a file"] = "Datei hochladen";
diff --git a/js_upload/lang/es/strings.php b/js_upload/lang/es/strings.php
index 63168e8c3..b938efaa1 100644
--- a/js_upload/lang/es/strings.php
+++ b/js_upload/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Upload a file"] = "Subir un archivo";
diff --git a/js_upload/lang/fi-fi/strings.php b/js_upload/lang/fi-fi/strings.php
index 25db34c5c..2e636419b 100644
--- a/js_upload/lang/fi-fi/strings.php
+++ b/js_upload/lang/fi-fi/strings.php
@@ -3,11 +3,10 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Upload a file"] = "Lähetä tiedosto";
-$a->strings["Drop files here to upload"] = "";
 $a->strings["Cancel"] = "Peruuta";
 $a->strings["Failed"] = "Epäonnistui";
 $a->strings["No files were uploaded."] = "Tiedostoja ei lähetetty.";
diff --git a/js_upload/lang/fr/strings.php b/js_upload/lang/fr/strings.php
index eb0a4d665..9cea86ed1 100644
--- a/js_upload/lang/fr/strings.php
+++ b/js_upload/lang/fr/strings.php
@@ -3,15 +3,9 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Upload a file"] = "Téléverser un fichier";
 $a->strings["Drop files here to upload"] = "Glisser les fichiers ici pour uploader";
 $a->strings["Cancel"] = "Annuler";
-$a->strings["Failed"] = "";
-$a->strings["No files were uploaded."] = "";
-$a->strings["Uploaded file is empty"] = "";
-$a->strings["Image exceeds size limit of "] = "";
-$a->strings["File has an invalid extension, it should be one of "] = "";
-$a->strings["Upload was cancelled, or server error encountered"] = "";
diff --git a/js_upload/lang/it/strings.php b/js_upload/lang/it/strings.php
index dd51f3853..74cefc161 100644
--- a/js_upload/lang/it/strings.php
+++ b/js_upload/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Upload a file"] = "Carica un file";
diff --git a/js_upload/lang/nl/strings.php b/js_upload/lang/nl/strings.php
index 9289cc408..d63d5a857 100644
--- a/js_upload/lang/nl/strings.php
+++ b/js_upload/lang/nl/strings.php
@@ -3,15 +3,8 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Upload a file"] = "Upload een bestand";
 $a->strings["Drop files here to upload"] = "Sleep uw bestanden hier om ze te uploaden";
-$a->strings["Cancel"] = "";
-$a->strings["Failed"] = "";
-$a->strings["No files were uploaded."] = "";
-$a->strings["Uploaded file is empty"] = "";
-$a->strings["Image exceeds size limit of "] = "";
-$a->strings["File has an invalid extension, it should be one of "] = "";
-$a->strings["Upload was cancelled, or server error encountered"] = "";
diff --git a/js_upload/lang/pl/strings.php b/js_upload/lang/pl/strings.php
index 19140b92c..b5cc9363e 100644
--- a/js_upload/lang/pl/strings.php
+++ b/js_upload/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Upload a file"] = "Prześlij plik";
diff --git a/js_upload/lang/ro/strings.php b/js_upload/lang/ro/strings.php
index 778210e77..0ebcb516c 100644
--- a/js_upload/lang/ro/strings.php
+++ b/js_upload/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Upload a file"] = "Încărcați un fișier";
diff --git a/js_upload/lang/ru/strings.php b/js_upload/lang/ru/strings.php
index c2071cf31..dbc761edd 100644
--- a/js_upload/lang/ru/strings.php
+++ b/js_upload/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Upload a file"] = "Загрузить файл";
diff --git a/krynn/lang/C/messages.po b/krynn/lang/C/messages.po
index 63255c9f3..429271bd0 100644
--- a/krynn/lang/C/messages.po
+++ b/krynn/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: krynn.php:150
+#: krynn.php:132 krynn.php:136
+msgid "Krynn"
+msgstr ""
+
+#: krynn.php:141
 msgid "Krynn Settings"
 msgstr ""
 
-#: krynn.php:152
+#: krynn.php:143
 msgid "Enable Krynn Addon"
 msgstr ""
 
-#: krynn.php:158
-msgid "Submit"
+#: krynn.php:148
+msgid "Save Settings"
 msgstr ""
diff --git a/krynn/lang/cs/strings.php b/krynn/lang/cs/strings.php
index 4e9d61c37..0e600b0bc 100644
--- a/krynn/lang/cs/strings.php
+++ b/krynn/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Krynn Settings"] = "Nastavení Krynn";
diff --git a/krynn/lang/de/strings.php b/krynn/lang/de/strings.php
index d8a54083a..73d69b043 100644
--- a/krynn/lang/de/strings.php
+++ b/krynn/lang/de/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
-$a->strings["Krynn Settings"] = "Krynn Einstellungen";
-$a->strings["Enable Krynn Addon"] = "Krynn-Addon aktivieren";
+$a->strings["Krynn Settings"] = "Planeten Einstellungen";
+$a->strings["Enable Krynn Addon"] = "Planeten-Addon aktivieren";
 $a->strings["Submit"] = "Senden";
diff --git a/krynn/lang/es/strings.php b/krynn/lang/es/strings.php
index 6bb39518b..416876c84 100644
--- a/krynn/lang/es/strings.php
+++ b/krynn/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Krynn Settings"] = "Ajustes de Krynn";
diff --git a/krynn/lang/fi-fi/strings.php b/krynn/lang/fi-fi/strings.php
index d6112ffa8..22082bebd 100644
--- a/krynn/lang/fi-fi/strings.php
+++ b/krynn/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Krynn Settings"] = "Krynn -asetukset";
diff --git a/krynn/lang/it/strings.php b/krynn/lang/it/strings.php
index 9c6f59bed..7378a55e8 100644
--- a/krynn/lang/it/strings.php
+++ b/krynn/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Krynn Settings"] = "Impostazioni Krynn";
diff --git a/krynn/lang/nl/strings.php b/krynn/lang/nl/strings.php
index bf323800d..28be50f4c 100644
--- a/krynn/lang/nl/strings.php
+++ b/krynn/lang/nl/strings.php
@@ -3,9 +3,8 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Krynn Settings"] = "Krynn instellingen";
 $a->strings["Enable Krynn Addon"] = "Krynn Addon inschakelen";
-$a->strings["Submit"] = "";
diff --git a/krynn/lang/pl/strings.php b/krynn/lang/pl/strings.php
index 26cda5886..45dfcba53 100644
--- a/krynn/lang/pl/strings.php
+++ b/krynn/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Krynn Settings"] = "Ustawienia Krynn";
diff --git a/krynn/lang/ro/strings.php b/krynn/lang/ro/strings.php
index f6c6f53d2..be624dc4a 100644
--- a/krynn/lang/ro/strings.php
+++ b/krynn/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Krynn Settings"] = "Configurări Krynn";
diff --git a/langfilter/lang/C/messages.po b/langfilter/lang/C/messages.po
index 0fed0fae1..daaa3c568 100644
--- a/langfilter/lang/C/messages.po
+++ b/langfilter/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-03 22:02-0400\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,58 +17,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: langfilter.php:52
+#: langfilter.php:50
 msgid "Language Filter"
 msgstr ""
 
-#: langfilter.php:53
+#: langfilter.php:51
 msgid ""
 "This addon tries to identify the language posts are writen in. If it does "
 "not match any language specifed below, posts will be hidden by collapsing "
 "them."
 msgstr ""
 
-#: langfilter.php:54
+#: langfilter.php:52
 msgid "Use the language filter"
 msgstr ""
 
-#: langfilter.php:55
+#: langfilter.php:53
 msgid "Able to read"
 msgstr ""
 
-#: langfilter.php:55
+#: langfilter.php:53
 msgid ""
 "List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
 "separated. For example \"de,it\"."
 msgstr ""
 
-#: langfilter.php:56
+#: langfilter.php:54
 msgid "Minimum confidence in language detection"
 msgstr ""
 
-#: langfilter.php:56
+#: langfilter.php:54
 msgid ""
 "Minimum confidence in language detection being correct, from 0 to 100. Posts "
 "will not be filtered when the confidence of language detection is below this "
 "percent value."
 msgstr ""
 
-#: langfilter.php:57
+#: langfilter.php:55
 msgid "Minimum length of message body"
 msgstr ""
 
-#: langfilter.php:57
+#: langfilter.php:55
 msgid ""
 "Minimum number of characters in message body for filter to be used. Posts "
 "shorter than this will not be filtered. Note: Language detection is "
 "unreliable for short content (<200 characters)."
 msgstr ""
 
-#: langfilter.php:58
+#: langfilter.php:56
 msgid "Save Settings"
 msgstr ""
 
-#: langfilter.php:189
+#: langfilter.php:187
 #, php-format
 msgid "Filtered language: %s"
 msgstr ""
diff --git a/langfilter/lang/ca/strings.php b/langfilter/lang/ca/strings.php
index e2bef03e0..678fade36 100644
--- a/langfilter/lang/ca/strings.php
+++ b/langfilter/lang/ca/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Language Filter"] = "Filtre d'Idioma";
diff --git a/langfilter/lang/cs/strings.php b/langfilter/lang/cs/strings.php
index 6f3988798..dc3673318 100644
--- a/langfilter/lang/cs/strings.php
+++ b/langfilter/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Language Filter"] = "Jazykový filtr";
diff --git a/langfilter/lang/en-gb/strings.php b/langfilter/lang/en-gb/strings.php
index 20eb6d029..4ac43a939 100644
--- a/langfilter/lang/en-gb/strings.php
+++ b/langfilter/lang/en-gb/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Language Filter"] = "Language Filter";
diff --git a/langfilter/lang/en-us/strings.php b/langfilter/lang/en-us/strings.php
index 5f7f7e1de..fef182958 100644
--- a/langfilter/lang/en-us/strings.php
+++ b/langfilter/lang/en-us/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_en_us")) {
 function string_plural_select_en_us($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Language Filter"] = "Language Filter";
diff --git a/langfilter/lang/es/strings.php b/langfilter/lang/es/strings.php
index b3ff9333c..97bd83d6b 100644
--- a/langfilter/lang/es/strings.php
+++ b/langfilter/lang/es/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Language Filter"] = "Filtro de Idioma";
diff --git a/langfilter/lang/et/strings.php b/langfilter/lang/et/strings.php
index e8aa27fae..00b5bd518 100644
--- a/langfilter/lang/et/strings.php
+++ b/langfilter/lang/et/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_et")) {
 function string_plural_select_et($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Language Filter"] = "Keelefilter";
diff --git a/langfilter/lang/fi-fi/strings.php b/langfilter/lang/fi-fi/strings.php
index adfda3a10..85fb6e0ff 100644
--- a/langfilter/lang/fi-fi/strings.php
+++ b/langfilter/lang/fi-fi/strings.php
@@ -2,18 +2,12 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Language Filter"] = "Kielisuodatin";
-$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "";
 $a->strings["Use the language filter"] = "Ota kielisuodatin käyttöön";
-$a->strings["Able to read"] = "";
-$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "";
-$a->strings["Minimum confidence in language detection"] = "";
-$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "";
-$a->strings["Minimum length of message body"] = "";
-$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "";
 $a->strings["Save Settings"] = "Tallenna asetukset";
 $a->strings["Language Filter Settings saved."] = "Kielisuodatinasetukset tallennettu";
 $a->strings["Filtered language: %s"] = "Suodatettu kieli: %s";
diff --git a/langfilter/lang/fr/strings.php b/langfilter/lang/fr/strings.php
index c8dc633e8..15a5d6ae1 100644
--- a/langfilter/lang/fr/strings.php
+++ b/langfilter/lang/fr/strings.php
@@ -3,14 +3,18 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Language Filter"] = "Filtre de langues";
-$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "Cette extension essaie de reconnaître la langue dans laquelle les publications sont écrites. Si elle ne correspond à aucune de la liste donnée plus bas, les publications seront réduites.";
 $a->strings["Use the language filter"] = "Utiliser le filtre de langues";
-$a->strings["I speak"] = "Je parle";
-$a->strings["List of abbreviations for languages you speak, comma seperated. For excample \"de,it\"."] = "Liste d’abréviation des langues que vous maîtrisez, séparés par des virgules. Par exemple \"en,fr\".";
+$a->strings["Able to read"] = "Peut lire";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Liste d'abréviations (codes iso2) pour les langues que vous parlez, séparées par des virgules. Par exemple, \"fr,it\".";
+$a->strings["Minimum confidence in language detection"] = "Confiance minimale dans la détection de langues";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Seuil de confiance minimal pour la détection des langues, de 0 à 100. Une publication ne sera pas filtrée si elle est détectée avec une confiance moindre.";
+$a->strings["Minimum length of message body"] = "Longueur minimale du corps de message.";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Nombre minimal de signes dans le corps de message pour déclencher le filtre. Une publication plus courte ne sera pas filtrée. Remarque: la détection de langue n'est pas fiable pour du contenu court (<200 signes).";
 $a->strings["Save Settings"] = "Sauvegarder les paramètres";
 $a->strings["Language Filter Settings saved."] = "Paramètres du filtre de langues sauvegardés.";
-$a->strings["unspoken language %s - Click to open/close"] = "Langue %s non parlé - Cliquez pour ouvrir/fermer";
+$a->strings["Filtered language: %s"] = "Langues filtrées: %s";
diff --git a/langfilter/lang/it/strings.php b/langfilter/lang/it/strings.php
index 3f3ca93ee..49b6cd76c 100644
--- a/langfilter/lang/it/strings.php
+++ b/langfilter/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Language Filter"] = "Filtro Lingua";
diff --git a/langfilter/lang/nb-no/strings.php b/langfilter/lang/nb-no/strings.php
index 995e68996..091e3f3b2 100644
--- a/langfilter/lang/nb-no/strings.php
+++ b/langfilter/lang/nb-no/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_nb_no")) {
 function string_plural_select_nb_no($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Language Filter"] = "Språkfilter";
diff --git a/langfilter/lang/nl/strings.php b/langfilter/lang/nl/strings.php
index 97ab88e27..62febd5ef 100644
--- a/langfilter/lang/nl/strings.php
+++ b/langfilter/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Language Filter"] = "Taalfilter";
diff --git a/langfilter/lang/pl/strings.php b/langfilter/lang/pl/strings.php
index 37e45659f..92165f303 100644
--- a/langfilter/lang/pl/strings.php
+++ b/langfilter/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Language Filter"] = "Filtr językowy";
diff --git a/langfilter/lang/pt-br/strings.php b/langfilter/lang/pt-br/strings.php
index bddcc2106..080ea6582 100644
--- a/langfilter/lang/pt-br/strings.php
+++ b/langfilter/lang/pt-br/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Language Filter"] = "Filtro de Idiomas";
diff --git a/langfilter/lang/ru/strings.php b/langfilter/lang/ru/strings.php
index 1b3a1581f..e4a111adc 100644
--- a/langfilter/lang/ru/strings.php
+++ b/langfilter/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Language Filter"] = "Языковой фильтр";
diff --git a/langfilter/lang/sv/strings.php b/langfilter/lang/sv/strings.php
index 3274e98b5..b6688301e 100644
--- a/langfilter/lang/sv/strings.php
+++ b/langfilter/lang/sv/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_sv")) {
 function string_plural_select_sv($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Language Filter"] = "Språkfilter";
diff --git a/langfilter/lang/zh-cn/strings.php b/langfilter/lang/zh-cn/strings.php
index bbeedf3e6..bcb0b723b 100644
--- a/langfilter/lang/zh-cn/strings.php
+++ b/langfilter/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Language Filter"] = "语言过滤器";
diff --git a/ldapauth/lang/C/messages.po b/ldapauth/lang/C/messages.po
deleted file mode 100644
index e69de29bb..000000000
diff --git a/libertree/lang/C/messages.po b/libertree/lang/C/messages.po
index ec61f8475..47054070f 100644
--- a/libertree/lang/C/messages.po
+++ b/libertree/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,30 +17,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libertree.php:36
+#: libertree.php:37
 msgid "Post to libertree"
 msgstr ""
 
-#: libertree.php:67
-msgid "libertree Post Settings"
-msgstr ""
-
-#: libertree.php:69
-msgid "Enable Libertree Post Addon"
-msgstr ""
-
-#: libertree.php:74
-msgid "Libertree API token"
+#: libertree.php:71 libertree.php:75
+msgid "libertree Export"
 msgstr ""
 
 #: libertree.php:79
-msgid "Libertree site URL"
+msgid "Enable Libertree Post Addon"
 msgstr ""
 
 #: libertree.php:84
+msgid "Libertree API token"
+msgstr ""
+
+#: libertree.php:89
+msgid "Libertree site URL"
+msgstr ""
+
+#: libertree.php:94
 msgid "Post to Libertree by default"
 msgstr ""
 
-#: libertree.php:90
-msgid "Submit"
+#: libertree.php:100
+msgid "Save Settings"
 msgstr ""
diff --git a/libertree/lang/cs/strings.php b/libertree/lang/cs/strings.php
index 57ad0ff13..5d2fa411f 100644
--- a/libertree/lang/cs/strings.php
+++ b/libertree/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["Post to libertree"] = "Poslat na libertree";
diff --git a/libertree/lang/de/strings.php b/libertree/lang/de/strings.php
index c6867705c..33fdd74a0 100644
--- a/libertree/lang/de/strings.php
+++ b/libertree/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to libertree"] = "bei libertree veröffentlichen";
diff --git a/libertree/lang/es/strings.php b/libertree/lang/es/strings.php
index 8a8dbf1f9..c5833cffd 100644
--- a/libertree/lang/es/strings.php
+++ b/libertree/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to libertree"] = "Publicar en Libertree";
diff --git a/libertree/lang/fi-fi/strings.php b/libertree/lang/fi-fi/strings.php
index b24fde821..a887a4f84 100644
--- a/libertree/lang/fi-fi/strings.php
+++ b/libertree/lang/fi-fi/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to libertree"] = "Lähetä Libertreehin";
 $a->strings["libertree Post Settings"] = "Libertree -viestin asetukset";
 $a->strings["Enable Libertree Post Addon"] = "Ota Libertree -viestilisäosa käyttöön";
-$a->strings["Libertree API token"] = "";
 $a->strings["Libertree site URL"] = "Libertree -sivuston URL-osoite";
 $a->strings["Post to Libertree by default"] = "Lähetä Libertreehin oletuksena";
 $a->strings["Submit"] = "Lähetä";
diff --git a/libertree/lang/fr/strings.php b/libertree/lang/fr/strings.php
index e3e9ff7e9..a86d54613 100644
--- a/libertree/lang/fr/strings.php
+++ b/libertree/lang/fr/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Post to libertree"] = "Publier sur libertree";
diff --git a/libertree/lang/it/strings.php b/libertree/lang/it/strings.php
index 91984f9d5..0db76fab7 100644
--- a/libertree/lang/it/strings.php
+++ b/libertree/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to libertree"] = "Invia a Libertree";
diff --git a/libertree/lang/nl/strings.php b/libertree/lang/nl/strings.php
index 1b8524f2a..a01e03b3a 100644
--- a/libertree/lang/nl/strings.php
+++ b/libertree/lang/nl/strings.php
@@ -3,13 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to libertree"] = "Plaatsen op Libertree";
 $a->strings["libertree Post Settings"] = "Libertree Post instellingen";
 $a->strings["Enable Libertree Post Addon"] = "Libertree Post Addon inschakelen";
-$a->strings["Libertree API token"] = "";
-$a->strings["Libertree site URL"] = "";
 $a->strings["Post to Libertree by default"] = "Plaatsen op Libertree als standaard instellen ";
-$a->strings["Submit"] = "";
diff --git a/libertree/lang/pl/strings.php b/libertree/lang/pl/strings.php
index 1c535c33d..ca3b9799d 100644
--- a/libertree/lang/pl/strings.php
+++ b/libertree/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to libertree"] = "Opublikuj na libertree";
diff --git a/libertree/lang/pt-br/strings.php b/libertree/lang/pt-br/strings.php
index d55aee610..9a4170a70 100644
--- a/libertree/lang/pt-br/strings.php
+++ b/libertree/lang/pt-br/strings.php
@@ -2,13 +2,12 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Post to libertree"] = "Publicar no Libertree";
 $a->strings["libertree Post Settings"] = "Configurações de publicação do Libertree";
 $a->strings["Enable Libertree Post Addon"] = "Habilitar plug-in para publicar no Libertree";
-$a->strings["Libertree API token"] = "";
-$a->strings["Libertree site URL"] = "";
 $a->strings["Post to Libertree by default"] = "Publicar no Libertree por padrão";
 $a->strings["Submit"] = "Enviar";
diff --git a/libertree/lang/ro/strings.php b/libertree/lang/ro/strings.php
index efa612ed5..de3a95ea6 100644
--- a/libertree/lang/ro/strings.php
+++ b/libertree/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Post to libertree"] = "Postați pe libertree";
diff --git a/libertree/lang/zh-cn/strings.php b/libertree/lang/zh-cn/strings.php
index 212f51460..540f35a76 100644
--- a/libertree/lang/zh-cn/strings.php
+++ b/libertree/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Post to libertree"] = "发布到 libertree";
diff --git a/libravatar/lang/C/messages.po b/libravatar/lang/C/messages.po
index d0aee6f4f..ebb364c1a 100644
--- a/libravatar/lang/C/messages.po
+++ b/libravatar/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-08 07:16+0000\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/libravatar/lang/cs/strings.php b/libravatar/lang/cs/strings.php
index 9d47c544d..5be745911 100644
--- a/libravatar/lang/cs/strings.php
+++ b/libravatar/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Libravatar NENÍ možné úspěšně nainstalovat.<br>Vyžaduje PHP >= 5.3";
diff --git a/libravatar/lang/es/strings.php b/libravatar/lang/es/strings.php
index 1ab20cf1e..33ce363f2 100644
--- a/libravatar/lang/es/strings.php
+++ b/libravatar/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Podría NO instalar Libravatar con éxito.<br>Requiere PHP >= 5.3";
diff --git a/libravatar/lang/fi-fi/strings.php b/libravatar/lang/fi-fi/strings.php
index 6be2f23fb..8c4b3a69b 100644
--- a/libravatar/lang/fi-fi/strings.php
+++ b/libravatar/lang/fi-fi/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Libravataria ei voitu asentaa.<br>Vaatii PHP-version >=5.3";
@@ -16,7 +16,6 @@ $a->strings["Warning"] = "Varoitus";
 $a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "PHP-versiosi on %s. Friendica vaatii PHP >= 5.3.";
 $a->strings["This addon is not functional on your server."] = "Tämä lisäosa ei toimi palvelimellasi.";
 $a->strings["Information"] = "Tietoja";
-$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
 $a->strings["Submit"] = "Lähetä";
 $a->strings["Default avatar image"] = "Avatarin oletuskuva";
 $a->strings["Select default avatar image if none was found. See README"] = "Valitse oletusavatarikuva jos avatari puuttuu. Katso lisätietoja README:stä.";
diff --git a/libravatar/lang/fr/strings.php b/libravatar/lang/fr/strings.php
index 48f8cf62b..52bdf1c45 100644
--- a/libravatar/lang/fr/strings.php
+++ b/libravatar/lang/fr/strings.php
@@ -2,21 +2,15 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
-$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "";
 $a->strings["generic profile image"] = "image de profil générique";
-$a->strings["random geometric pattern"] = "";
-$a->strings["monster face"] = "";
 $a->strings["computer generated face"] = "visage généré par ordinateur";
-$a->strings["retro arcade style face"] = "";
 $a->strings["Warning"] = "Attention";
 $a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Votre version de PHP %s est inférieure à la minimum requise (5.3).";
-$a->strings["This addon is not functional on your server."] = "";
 $a->strings["Information"] = "Information";
-$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
 $a->strings["Submit"] = "Envoyer";
 $a->strings["Default avatar image"] = "Avatar par défaut";
-$a->strings["Select default avatar image if none was found. See README"] = "";
 $a->strings["Libravatar settings updated."] = "Paramètres de Libravatar mis à jour.";
diff --git a/libravatar/lang/nl/strings.php b/libravatar/lang/nl/strings.php
index 1cb30e742..371315f9b 100644
--- a/libravatar/lang/nl/strings.php
+++ b/libravatar/lang/nl/strings.php
@@ -3,21 +3,9 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Kon Libravater NIET succesvol installeren.<br>PHP 5.3 of meer is vereist";
 $a->strings["generic profile image"] = "Generieke profiel-foto";
-$a->strings["random geometric pattern"] = "";
-$a->strings["monster face"] = "";
-$a->strings["computer generated face"] = "";
-$a->strings["retro arcade style face"] = "";
-$a->strings["Warning"] = "";
-$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "";
-$a->strings["This addon is not functional on your server."] = "";
-$a->strings["Information"] = "";
-$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
-$a->strings["Submit"] = "";
-$a->strings["Default avatar image"] = "";
-$a->strings["Select default avatar image if none was found. See README"] = "";
 $a->strings["Libravatar settings updated."] = "Libravatar instellingen opgeslagen";
diff --git a/libravatar/lang/pl/strings.php b/libravatar/lang/pl/strings.php
index 4607670f0..2aa11809a 100644
--- a/libravatar/lang/pl/strings.php
+++ b/libravatar/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Nie można zainstalować dodatku Libravatar. <br>Wymaga PHP> = 5.3";
diff --git a/libravatar/lang/pt-br/strings.php b/libravatar/lang/pt-br/strings.php
index 9688c2ae5..fc7591cbe 100644
--- a/libravatar/lang/pt-br/strings.php
+++ b/libravatar/lang/pt-br/strings.php
@@ -2,21 +2,11 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Não foi possível instalar o Libravatar.<br>Ele requer PHP >= 5.3";
-$a->strings["generic profile image"] = "";
-$a->strings["random geometric pattern"] = "";
 $a->strings["monster face"] = "careta";
-$a->strings["computer generated face"] = "";
 $a->strings["retro arcade style face"] = "rosto de personagem de fliperama";
-$a->strings["Warning"] = "";
-$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "";
-$a->strings["This addon is not functional on your server."] = "";
-$a->strings["Information"] = "";
-$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
 $a->strings["Submit"] = "Enviar";
-$a->strings["Default avatar image"] = "";
-$a->strings["Select default avatar image if none was found. See README"] = "";
-$a->strings["Libravatar settings updated."] = "";
diff --git a/libravatar/lang/ro/strings.php b/libravatar/lang/ro/strings.php
index 61764cb36..e552914fc 100644
--- a/libravatar/lang/ro/strings.php
+++ b/libravatar/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "NU s-a putut instala Libravatar cu succes.<br>Acesta necesită PHP >= 5.3";
diff --git a/ljpost/lang/C/messages.po b/ljpost/lang/C/messages.po
index 9baae18eb..6ee7e27c2 100644
--- a/ljpost/lang/C/messages.po
+++ b/ljpost/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,26 +21,26 @@ msgstr ""
 msgid "Post to LiveJournal"
 msgstr ""
 
-#: ljpost.php:70
+#: ljpost.php:73
 msgid "LiveJournal Post Settings"
 msgstr ""
 
-#: ljpost.php:72
+#: ljpost.php:75
 msgid "Enable LiveJournal Post Addon"
 msgstr ""
 
-#: ljpost.php:77
+#: ljpost.php:80
 msgid "LiveJournal username"
 msgstr ""
 
-#: ljpost.php:82
+#: ljpost.php:85
 msgid "LiveJournal password"
 msgstr ""
 
-#: ljpost.php:87
+#: ljpost.php:90
 msgid "Post to LiveJournal by default"
 msgstr ""
 
-#: ljpost.php:93
-msgid "Submit"
+#: ljpost.php:96
+msgid "Save Settings"
 msgstr ""
diff --git a/ljpost/lang/cs/strings.php b/ljpost/lang/cs/strings.php
index d2c833d97..74bacf1e8 100644
--- a/ljpost/lang/cs/strings.php
+++ b/ljpost/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["Post to LiveJournal"] = "Poslat na LiveJournal";
diff --git a/ljpost/lang/de/strings.php b/ljpost/lang/de/strings.php
index e6b9c8481..a6145fe55 100644
--- a/ljpost/lang/de/strings.php
+++ b/ljpost/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to LiveJournal"] = "In LiveJournal veröffentlichen.";
diff --git a/ljpost/lang/es/strings.php b/ljpost/lang/es/strings.php
index 10092765f..225dfd106 100644
--- a/ljpost/lang/es/strings.php
+++ b/ljpost/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to LiveJournal"] = "Publicar en LiveJournal";
diff --git a/ljpost/lang/fi-fi/strings.php b/ljpost/lang/fi-fi/strings.php
index e03e6ba33..6279bd973 100644
--- a/ljpost/lang/fi-fi/strings.php
+++ b/ljpost/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to LiveJournal"] = "Lähetä LiveJournaliin";
diff --git a/ljpost/lang/it/strings.php b/ljpost/lang/it/strings.php
index 54f5fac58..aadebe8a2 100644
--- a/ljpost/lang/it/strings.php
+++ b/ljpost/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to LiveJournal"] = "Invia a LiveJournal";
diff --git a/ljpost/lang/nl/strings.php b/ljpost/lang/nl/strings.php
index d9ed23601..5ae4bbed2 100644
--- a/ljpost/lang/nl/strings.php
+++ b/ljpost/lang/nl/strings.php
@@ -3,13 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to LiveJournal"] = "Plaatsen op LiveJournal";
 $a->strings["LiveJournal Post Settings"] = "LiveJournal Post instellingen";
 $a->strings["Enable LiveJournal Post Addon"] = "LiveJournal Post inschakelen";
-$a->strings["LiveJournal username"] = "";
-$a->strings["LiveJournal password"] = "";
 $a->strings["Post to LiveJournal by default"] = "Plaatsen op Livejournal als standaard instellen ";
-$a->strings["Submit"] = "";
diff --git a/ljpost/lang/pl/strings.php b/ljpost/lang/pl/strings.php
index 85c6e3a11..efb97fcd3 100644
--- a/ljpost/lang/pl/strings.php
+++ b/ljpost/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Insanejournal"] = "Opublikuj w Insanejournal";
diff --git a/ljpost/lang/pt-br/strings.php b/ljpost/lang/pt-br/strings.php
index ddc091a40..542d2854e 100644
--- a/ljpost/lang/pt-br/strings.php
+++ b/ljpost/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Post to LiveJournal"] = "Publicar no LiveJournal";
diff --git a/ljpost/lang/ro/strings.php b/ljpost/lang/ro/strings.php
index b65c77549..d44dbcaf6 100644
--- a/ljpost/lang/ro/strings.php
+++ b/ljpost/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Post to LiveJournal"] = "Postați pe LiveJournal";
diff --git a/mahjongg/lang/C/messages.po b/mahjongg/lang/C/messages.po
deleted file mode 100644
index e69de29bb..000000000
diff --git a/mailstream/lang/C/messages.po b/mailstream/lang/C/messages.po
index 80344780c..1a5e293c1 100644
--- a/mailstream/lang/C/messages.po
+++ b/mailstream/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-11 19:13+0100\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,80 +17,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mailstream.php:77
+#: mailstream.php:66
 msgid "From Address"
 msgstr ""
 
-#: mailstream.php:79
+#: mailstream.php:68
 msgid "Email address that stream items will appear to be from."
 msgstr ""
 
-#: mailstream.php:82 mailstream.php:380
+#: mailstream.php:71 mailstream.php:382
 msgid "Save Settings"
 msgstr ""
 
-#: mailstream.php:223
+#: mailstream.php:225
 msgid "Re:"
 msgstr ""
 
-#: mailstream.php:231
+#: mailstream.php:233
 msgid "Friendica post"
 msgstr ""
 
-#: mailstream.php:234
+#: mailstream.php:236
 msgid "Diaspora post"
 msgstr ""
 
-#: mailstream.php:244
+#: mailstream.php:246
 msgid "Feed item"
 msgstr ""
 
-#: mailstream.php:247
+#: mailstream.php:249
 msgid "Email"
 msgstr ""
 
-#: mailstream.php:249
+#: mailstream.php:251
 msgid "Friendica Item"
 msgstr ""
 
-#: mailstream.php:293
+#: mailstream.php:296
 msgid "Upstream"
 msgstr ""
 
-#: mailstream.php:294
+#: mailstream.php:297
 msgid "Local"
 msgstr ""
 
-#: mailstream.php:362
+#: mailstream.php:364
 msgid "Enabled"
 msgstr ""
 
-#: mailstream.php:366
+#: mailstream.php:368
 msgid "Email Address"
 msgstr ""
 
-#: mailstream.php:368
+#: mailstream.php:370
 msgid "Leave blank to use your account email address"
 msgstr ""
 
-#: mailstream.php:371
+#: mailstream.php:373
 msgid "Exclude Likes"
 msgstr ""
 
-#: mailstream.php:373
+#: mailstream.php:375
 msgid "Check this to omit mailing \"Like\" notifications"
 msgstr ""
 
-#: mailstream.php:376
+#: mailstream.php:378
 msgid "Attach Images"
 msgstr ""
 
-#: mailstream.php:378
+#: mailstream.php:380
 msgid ""
 "Download images in posts and attach them to the email.  Useful for reading "
 "email while offline."
 msgstr ""
 
-#: mailstream.php:379
+#: mailstream.php:381
 msgid "Mail Stream Settings"
 msgstr ""
diff --git a/mailstream/lang/cs/strings.php b/mailstream/lang/cs/strings.php
index fd36cca49..1525bfb63 100644
--- a/mailstream/lang/cs/strings.php
+++ b/mailstream/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["From Address"] = "Adresa odesílatele";
diff --git a/mailstream/lang/de/strings.php b/mailstream/lang/de/strings.php
index 3f946a487..53620d18a 100644
--- a/mailstream/lang/de/strings.php
+++ b/mailstream/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["From Address"] = "Absender";
diff --git a/mailstream/lang/en-gb/strings.php b/mailstream/lang/en-gb/strings.php
index b42a42a1c..6b3c74b4b 100644
--- a/mailstream/lang/en-gb/strings.php
+++ b/mailstream/lang/en-gb/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["From Address"] = "From address";
diff --git a/mailstream/lang/es/strings.php b/mailstream/lang/es/strings.php
index 8a2a4faf3..507f32d6b 100644
--- a/mailstream/lang/es/strings.php
+++ b/mailstream/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["From Address"] = "Desde Dirección";
diff --git a/mailstream/lang/fi-fi/strings.php b/mailstream/lang/fi-fi/strings.php
index 641fd3d4e..167e7341b 100644
--- a/mailstream/lang/fi-fi/strings.php
+++ b/mailstream/lang/fi-fi/strings.php
@@ -2,25 +2,19 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["From Address"] = "Lähettäjä";
-$a->strings["Email address that stream items will appear to be from."] = "";
 $a->strings["Save Settings"] = "Tallenna asetukset";
 $a->strings["Re:"] = "Koskien";
 $a->strings["Friendica post"] = "Friendica -julkaisu";
 $a->strings["Diaspora post"] = "Diaspora -julkaisu";
-$a->strings["Feed item"] = "";
 $a->strings["Email"] = "Sähköposti";
 $a->strings["Friendica Item"] = "Friendica -kohde";
-$a->strings["Upstream"] = "";
 $a->strings["Local"] = "Paikallinen";
 $a->strings["Enabled"] = "Käytössä";
 $a->strings["Email Address"] = "Sähköpostiosoite";
-$a->strings["Leave blank to use your account email address"] = "";
-$a->strings["Exclude Likes"] = "";
-$a->strings["Check this to omit mailing \"Like\" notifications"] = "";
 $a->strings["Attach Images"] = "Liitä kuvia";
-$a->strings["Download images in posts and attach them to the email.  Useful for reading email while offline."] = "";
 $a->strings["Mail Stream Settings"] = "Mail Stream -asetukset";
diff --git a/mailstream/lang/fr/strings.php b/mailstream/lang/fr/strings.php
index 13892f616..471b3b193 100644
--- a/mailstream/lang/fr/strings.php
+++ b/mailstream/lang/fr/strings.php
@@ -2,21 +2,18 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["From Address"] = "Depuis l'adresse";
-$a->strings["Email address that stream items will appear to be from."] = "";
 $a->strings["Save Settings"] = "Sauvegarder les paramètres";
 $a->strings["Re:"] = "Re :";
 $a->strings["Friendica post"] = "Message Friendica";
 $a->strings["Diaspora post"] = "Message Diaspora";
-$a->strings["Feed item"] = "";
 $a->strings["Email"] = "Courriel";
 $a->strings["Friendica Item"] = "Élément de Friendica";
-$a->strings["Upstream"] = "";
 $a->strings["Local"] = "Local";
 $a->strings["Email Address"] = "Adresse de courriel";
-$a->strings["Leave blank to use your account email address"] = "";
 $a->strings["Enabled"] = "Activer";
 $a->strings["Mail Stream Settings"] = "Paramètres de Mail Stream";
diff --git a/mailstream/lang/it/strings.php b/mailstream/lang/it/strings.php
index a6a482876..e402a8aac 100644
--- a/mailstream/lang/it/strings.php
+++ b/mailstream/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["From Address"] = "Indirizzo di invio";
diff --git a/mailstream/lang/nl/strings.php b/mailstream/lang/nl/strings.php
index 2a675073a..31832dd56 100644
--- a/mailstream/lang/nl/strings.php
+++ b/mailstream/lang/nl/strings.php
@@ -3,25 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["From Address"] = "Van Adres";
 $a->strings["Email address that stream items will appear to be from."] = "E-mail adres waarvan stream items komen ";
 $a->strings["Save Settings"] = "Instellingen opslaan";
-$a->strings["Re:"] = "";
-$a->strings["Friendica post"] = "";
-$a->strings["Diaspora post"] = "";
-$a->strings["Feed item"] = "";
-$a->strings["Email"] = "";
-$a->strings["Friendica Item"] = "";
-$a->strings["Upstream"] = "";
-$a->strings["Local"] = "";
 $a->strings["Enabled"] = "Ingeschakeld";
-$a->strings["Email Address"] = "";
-$a->strings["Leave blank to use your account email address"] = "";
-$a->strings["Exclude Likes"] = "";
-$a->strings["Check this to omit mailing \"Like\" notifications"] = "";
-$a->strings["Attach Images"] = "";
-$a->strings["Download images in posts and attach them to the email.  Useful for reading email while offline."] = "";
-$a->strings["Mail Stream Settings"] = "";
diff --git a/mailstream/lang/pl/strings.php b/mailstream/lang/pl/strings.php
index 88b0006ea..2e7565a12 100644
--- a/mailstream/lang/pl/strings.php
+++ b/mailstream/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["From Address"] = "Z adresu";
diff --git a/mailstream/lang/ro/strings.php b/mailstream/lang/ro/strings.php
index 6a02d65f7..092d16c21 100644
--- a/mailstream/lang/ro/strings.php
+++ b/mailstream/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["From Address"] = "Adresa sursă";
diff --git a/markdown/lang/C/messages.po b/markdown/lang/C/messages.po
index b2ce51ed4..c8b8219cc 100644
--- a/markdown/lang/C/messages.po
+++ b/markdown/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-26 10:04+0000\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,19 +17,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: markdown.php:32
+#: markdown.php:30
 msgid "Markdown"
 msgstr ""
 
-#: markdown.php:33
+#: markdown.php:31
 msgid "Enable Markdown parsing"
 msgstr ""
 
-#: markdown.php:33
+#: markdown.php:31
 msgid ""
 "If enabled, self created items will additionally be parsed via Markdown."
 msgstr ""
 
-#: markdown.php:34
+#: markdown.php:32
 msgid "Save Settings"
 msgstr ""
diff --git a/markdown/lang/cs/strings.php b/markdown/lang/cs/strings.php
index b9340b9a0..ecabc3fe0 100644
--- a/markdown/lang/cs/strings.php
+++ b/markdown/lang/cs/strings.php
@@ -3,10 +3,8 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Markdown"] = "Markdown";
-$a->strings["Enable Markdown parsing"] = "";
-$a->strings["If enabled, self created items will additionally be parsed via Markdown."] = "";
 $a->strings["Save Settings"] = "Uložit nastavení";
diff --git a/markdown/lang/de/strings.php b/markdown/lang/de/strings.php
index d3d08fe05..ddc1ab2bb 100644
--- a/markdown/lang/de/strings.php
+++ b/markdown/lang/de/strings.php
@@ -3,10 +3,9 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Markdown"] = "Markdown";
 $a->strings["Enable Markdown parsing"] = "Verwende Markdown Formatierung";
-$a->strings["If enabled, self created items will additionally be parsed via Markdown."] = "Wenn diese Option aktiviert ist, werden alle deine neu erstellten Beiträge beim Senden zusätzlich zu BBCode auch Markdown Formatierungen angewandt.";
 $a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/markdown/lang/en-gb/strings.php b/markdown/lang/en-gb/strings.php
index 1834ba019..dd2729820 100644
--- a/markdown/lang/en-gb/strings.php
+++ b/markdown/lang/en-gb/strings.php
@@ -3,10 +3,9 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->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/markdown/lang/it/strings.php b/markdown/lang/it/strings.php
index ebb93a456..dd906d9de 100644
--- a/markdown/lang/it/strings.php
+++ b/markdown/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Markdown"] = "Markdown";
diff --git a/markdown/lang/pl/strings.php b/markdown/lang/pl/strings.php
index bbfa44b6f..6063d2b30 100644
--- a/markdown/lang/pl/strings.php
+++ b/markdown/lang/pl/strings.php
@@ -3,10 +3,9 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Markdown"] = "Markdown";
 $a->strings["Enable Markdown parsing"] = "Włącz analizę Markdown";
-$a->strings["If enabled, self created items will additionally be parsed via Markdown."] = "Jeśli ta opcja jest włączona, utworzone przez ciebie elementy zostaną dodatkowo przeanalizowane poprzez Markdown.";
 $a->strings["Save Settings"] = "Zapisz Ustawienia";
diff --git a/markdown/lang/ru/strings.php b/markdown/lang/ru/strings.php
index 95c6c82e9..ebc7ea1ab 100644
--- a/markdown/lang/ru/strings.php
+++ b/markdown/lang/ru/strings.php
@@ -3,10 +3,9 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Markdown"] = "Markdown";
 $a->strings["Enable Markdown parsing"] = "Включить форматирование Markdown";
-$a->strings["If enabled, self created items will additionally be parsed via Markdown."] = "Если включено, то созданные вами записи будут дополнительно форматироваться в соответствии с разметкой Markdown.";
 $a->strings["Save Settings"] = "Сохранить настройки";
diff --git a/mathjax/lang/C/messages.po b/mathjax/lang/C/messages.po
index 59a5b574b..96d5e2c37 100644
--- a/mathjax/lang/C/messages.po
+++ b/mathjax/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,35 +17,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mathjax.php:36
-msgid "Settings"
-msgstr ""
-
-#: mathjax.php:37
+#: mathjax.php:43
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
 "syntax surrounded by the usual $$ or an eqnarray block in the postings of "
 "your wall,network tab and private mail."
 msgstr ""
 
-#: mathjax.php:38
+#: mathjax.php:44
 msgid "Use the MathJax renderer"
 msgstr ""
 
-#: mathjax.php:42
-msgid "Submit"
-msgstr ""
-
-#: mathjax.php:66
-msgid "Settings updated."
-msgstr ""
-
-#: mathjax.php:75
-msgid "MathJax Base URL"
-msgstr ""
-
-#: mathjax.php:75
-msgid ""
-"The URL for the javascript file that should be included to use MathJax. Can "
-"be either the MathJax CDN or another installation of MathJax."
+#: mathjax.php:45
+msgid "Save Settings"
 msgstr ""
diff --git a/mathjax/lang/cs/strings.php b/mathjax/lang/cs/strings.php
index e2d95b452..8b94e6564 100644
--- a/mathjax/lang/cs/strings.php
+++ b/mathjax/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["Settings"] = "Nastavení";
diff --git a/mathjax/lang/de/strings.php b/mathjax/lang/de/strings.php
index a1ac6f451..fbfd33971 100644
--- a/mathjax/lang/de/strings.php
+++ b/mathjax/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Settings"] = "Einstellungen";
diff --git a/mathjax/lang/es/strings.php b/mathjax/lang/es/strings.php
index c2edd566e..78b5e6794 100644
--- a/mathjax/lang/es/strings.php
+++ b/mathjax/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Settings"] = "Ajustes";
diff --git a/mathjax/lang/fi-fi/strings.php b/mathjax/lang/fi-fi/strings.php
index 4a4759b6b..e2c9593e5 100644
--- a/mathjax/lang/fi-fi/strings.php
+++ b/mathjax/lang/fi-fi/strings.php
@@ -2,13 +2,10 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Settings"] = "Asetukset";
-$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "";
-$a->strings["Use the MathJax renderer"] = "";
 $a->strings["Submit"] = "Lähetä";
 $a->strings["Settings updated."] = "Asetukset päivitetty.";
-$a->strings["MathJax Base URL"] = "";
-$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "";
diff --git a/mathjax/lang/it/strings.php b/mathjax/lang/it/strings.php
index 174393389..c612dfb7a 100644
--- a/mathjax/lang/it/strings.php
+++ b/mathjax/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Settings"] = "Impostazioni";
diff --git a/mathjax/lang/nl/strings.php b/mathjax/lang/nl/strings.php
index b7506ec86..8873e0fa0 100644
--- a/mathjax/lang/nl/strings.php
+++ b/mathjax/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Settings"] = "Instellingen";
diff --git a/mathjax/lang/pl/strings.php b/mathjax/lang/pl/strings.php
index e41e98c00..8a9d4020d 100644
--- a/mathjax/lang/pl/strings.php
+++ b/mathjax/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Settings"] = "Ustawienia";
diff --git a/mathjax/lang/ro/strings.php b/mathjax/lang/ro/strings.php
index 98b38cf01..401c86854 100644
--- a/mathjax/lang/ro/strings.php
+++ b/mathjax/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Settings"] = "Configurări";
diff --git a/mathjax/lang/zh-cn/strings.php b/mathjax/lang/zh-cn/strings.php
index 05103a5db..f60e9fc20 100644
--- a/mathjax/lang/zh-cn/strings.php
+++ b/mathjax/lang/zh-cn/strings.php
@@ -2,13 +2,11 @@
 
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
-	return 0;;
+	$n = intval($n);
+	return intval(0);
 }}
 ;
 $a->strings["Settings"] = "设置";
-$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "";
 $a->strings["Use the MathJax renderer"] = "使用 MathJax 渲染";
 $a->strings["Submit"] = "提交";
 $a->strings["Settings updated."] = "设置已更新";
-$a->strings["MathJax Base URL"] = "";
-$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "";
diff --git a/membersince/lang/C/messages.po b/membersince/lang/C/messages.po
index fc125bc58..031f2ed92 100644
--- a/membersince/lang/C/messages.po
+++ b/membersince/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: membersince.php:18
+#: membersince.php:37 membersince.php:52
 msgid "Member since:"
 msgstr ""
diff --git a/morechoice/lang/C/messages.po b/morechoice/lang/C/messages.po
index ac0af5614..3d1d75a89 100644
--- a/morechoice/lang/C/messages.po
+++ b/morechoice/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-07 15:04+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,322 +17,322 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: morechoice.php:34
+#: morechoice.php:22
 msgid "Androgyne"
 msgstr ""
 
-#: morechoice.php:35
+#: morechoice.php:23
 msgid "Bear"
 msgstr ""
 
-#: morechoice.php:36
+#: morechoice.php:24
 msgid "Bigender"
 msgstr ""
 
-#: morechoice.php:37
+#: morechoice.php:25
 msgid "Cross dresser"
 msgstr ""
 
-#: morechoice.php:38
+#: morechoice.php:26
 msgid "Drag queen"
 msgstr ""
 
-#: morechoice.php:39
+#: morechoice.php:27
 msgid "Eunuch"
 msgstr ""
 
-#: morechoice.php:40
+#: morechoice.php:28
 msgid "Faux queen"
 msgstr ""
 
-#: morechoice.php:41
+#: morechoice.php:29
 msgid "Gender fluid"
 msgstr ""
 
-#: morechoice.php:42
+#: morechoice.php:30
 msgid "Kathoey"
 msgstr ""
 
-#: morechoice.php:43
+#: morechoice.php:31
 msgid "Lady"
 msgstr ""
 
-#: morechoice.php:44
+#: morechoice.php:32
 msgid "Lipstick lesbian"
 msgstr ""
 
-#: morechoice.php:45
+#: morechoice.php:33
 msgid "Metrosexual"
 msgstr ""
 
-#: morechoice.php:46
+#: morechoice.php:34
 msgid "Monk"
 msgstr ""
 
-#: morechoice.php:47
+#: morechoice.php:35
 msgid "Nun"
 msgstr ""
 
-#: morechoice.php:48
+#: morechoice.php:36
 msgid "Soft butch"
 msgstr ""
 
-#: morechoice.php:49
+#: morechoice.php:37
 msgid "Stone femme"
 msgstr ""
 
-#: morechoice.php:50
+#: morechoice.php:38
 msgid "Tomboy"
 msgstr ""
 
-#: morechoice.php:51
+#: morechoice.php:39
 msgid "Transman"
 msgstr ""
 
-#: morechoice.php:52
+#: morechoice.php:40
 msgid "Transwoman"
 msgstr ""
 
-#: morechoice.php:53
+#: morechoice.php:41
 msgid "Transvesti"
 msgstr ""
 
-#: morechoice.php:54
+#: morechoice.php:42
 msgid "Trigender"
 msgstr ""
 
-#: morechoice.php:55
+#: morechoice.php:43
 msgid "Can't remember"
 msgstr ""
 
-#: morechoice.php:56
+#: morechoice.php:44
 msgid "Hard to tell these days"
 msgstr ""
 
-#: morechoice.php:60
+#: morechoice.php:48
 msgid "Girls with big tits"
 msgstr ""
 
-#: morechoice.php:61
+#: morechoice.php:49
 msgid "Millionaires"
 msgstr ""
 
-#: morechoice.php:62
+#: morechoice.php:50
 msgid "Guys with big schlongs"
 msgstr ""
 
-#: morechoice.php:63
+#: morechoice.php:51
 msgid "Easy women"
 msgstr ""
 
-#: morechoice.php:64
+#: morechoice.php:52
 msgid "People with impaired mobility"
 msgstr ""
 
-#: morechoice.php:65
+#: morechoice.php:53
 msgid "Amputees"
 msgstr ""
 
-#: morechoice.php:66
+#: morechoice.php:54
 msgid "Statues, mannequins and immobility"
 msgstr ""
 
-#: morechoice.php:67
+#: morechoice.php:55
 msgid "Pain"
 msgstr ""
 
-#: morechoice.php:68
+#: morechoice.php:56
 msgid "Trans men"
 msgstr ""
 
-#: morechoice.php:69
+#: morechoice.php:57
 msgid "Older women"
 msgstr ""
 
-#: morechoice.php:70
+#: morechoice.php:58
 msgid "Asphyxiation"
 msgstr ""
 
-#: morechoice.php:71
+#: morechoice.php:59
 msgid "In public"
 msgstr ""
 
-#: morechoice.php:72
+#: morechoice.php:60
 msgid "In danger"
 msgstr ""
 
-#: morechoice.php:73
+#: morechoice.php:61
 msgid "Pretending to be male"
 msgstr ""
 
-#: morechoice.php:74
+#: morechoice.php:62
 msgid "Pretending to be female"
 msgstr ""
 
-#: morechoice.php:75
+#: morechoice.php:63
 msgid "Breats"
 msgstr ""
 
-#: morechoice.php:76
+#: morechoice.php:64
 msgid "Scat"
 msgstr ""
 
-#: morechoice.php:77
+#: morechoice.php:65
 msgid "Crying"
 msgstr ""
 
-#: morechoice.php:78
+#: morechoice.php:66
 msgid "Nappies/Diapers"
 msgstr ""
 
-#: morechoice.php:79
+#: morechoice.php:67
 msgid "Trees"
 msgstr ""
 
-#: morechoice.php:80
+#: morechoice.php:68
 msgid "Vomit"
 msgstr ""
 
-#: morechoice.php:81
+#: morechoice.php:69
 msgid "Murder"
 msgstr ""
 
-#: morechoice.php:82
+#: morechoice.php:70
 msgid "Fat people"
 msgstr ""
 
-#: morechoice.php:83
+#: morechoice.php:71
 msgid "Feet"
 msgstr ""
 
-#: morechoice.php:84
+#: morechoice.php:72
 msgid "Covered in insects"
 msgstr ""
 
-#: morechoice.php:85
+#: morechoice.php:73
 msgid "Turning a human being into furniture"
 msgstr ""
 
-#: morechoice.php:86
+#: morechoice.php:74
 msgid "Elderly people"
 msgstr ""
 
-#: morechoice.php:87
+#: morechoice.php:75
 msgid "Transgender people"
 msgstr ""
 
-#: morechoice.php:88
+#: morechoice.php:76
 msgid "Criminals"
 msgstr ""
 
-#: morechoice.php:89
+#: morechoice.php:77
 msgid "Stealing"
 msgstr ""
 
-#: morechoice.php:90
+#: morechoice.php:78
 msgid "Breast milk"
 msgstr ""
 
-#: morechoice.php:91
+#: morechoice.php:79
 msgid "Immersing genitals in liquids"
 msgstr ""
 
-#: morechoice.php:92
+#: morechoice.php:80
 msgid "Giants"
 msgstr ""
 
-#: morechoice.php:93
+#: morechoice.php:81
 msgid "Masochism"
 msgstr ""
 
-#: morechoice.php:94
+#: morechoice.php:82
 msgid "Cars"
 msgstr ""
 
-#: morechoice.php:95
+#: morechoice.php:83
 msgid "Menstruation"
 msgstr ""
 
-#: morechoice.php:96
+#: morechoice.php:84
 msgid "Mucus"
 msgstr ""
 
-#: morechoice.php:97
+#: morechoice.php:85
 msgid "Obscene language"
 msgstr ""
 
-#: morechoice.php:98
+#: morechoice.php:86
 msgid "Noses"
 msgstr ""
 
-#: morechoice.php:99
+#: morechoice.php:87
 msgid "Navels"
 msgstr ""
 
-#: morechoice.php:100
+#: morechoice.php:88
 msgid "Corpses"
 msgstr ""
 
-#: morechoice.php:101
+#: morechoice.php:89
 msgid "Smells"
 msgstr ""
 
-#: morechoice.php:102
+#: morechoice.php:90
 msgid "Buttocks"
 msgstr ""
 
-#: morechoice.php:103
+#: morechoice.php:91
 msgid "Nonliving objects"
 msgstr ""
 
-#: morechoice.php:104
+#: morechoice.php:92
 msgid "Sleeping people"
 msgstr ""
 
-#: morechoice.php:105
+#: morechoice.php:93
 msgid "Urination"
 msgstr ""
 
-#: morechoice.php:106
+#: morechoice.php:94
 msgid "Eating people"
 msgstr ""
 
-#: morechoice.php:107
+#: morechoice.php:95
 msgid "Being eaten"
 msgstr ""
 
-#: morechoice.php:108
+#: morechoice.php:96
 msgid "Animals"
 msgstr ""
 
-#: morechoice.php:109
+#: morechoice.php:97
 msgid "I'd rather just have some chocolate"
 msgstr ""
 
-#: morechoice.php:113
+#: morechoice.php:101
 msgid "Married to my job"
 msgstr ""
 
-#: morechoice.php:114
+#: morechoice.php:102
 msgid "Polygamist"
 msgstr ""
 
-#: morechoice.php:115
+#: morechoice.php:103
 msgid "Half married"
 msgstr ""
 
-#: morechoice.php:116
+#: morechoice.php:104
 msgid "Living in the past"
 msgstr ""
 
-#: morechoice.php:117
+#: morechoice.php:105
 msgid "Pretending to be over my ex"
 msgstr ""
 
-#: morechoice.php:118
+#: morechoice.php:106
 msgid "Hurt in the past"
 msgstr ""
 
-#: morechoice.php:119
+#: morechoice.php:107
 msgid "Wallowing in self-pity"
 msgstr ""
diff --git a/morechoice/lang/cs/strings.php b/morechoice/lang/cs/strings.php
index 55bcbd4d4..55921be8f 100644
--- a/morechoice/lang/cs/strings.php
+++ b/morechoice/lang/cs/strings.php
@@ -3,30 +3,21 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Androgyne"] = "Androgyn";
 $a->strings["Bear"] = "Medvěd";
 $a->strings["Bigender"] = "Bigender";
 $a->strings["Cross dresser"] = "Crossdresser";
-$a->strings["Drag queen"] = "";
 $a->strings["Eunuch"] = "Eunuch";
-$a->strings["Faux queen"] = "";
-$a->strings["Gender fluid"] = "";
-$a->strings["Kathoey"] = "";
 $a->strings["Lady"] = "Dáma";
-$a->strings["Lipstick lesbian"] = "";
 $a->strings["Metrosexual"] = "Metrosexuál";
 $a->strings["Monk"] = "Mnich";
 $a->strings["Nun"] = "Jeptiška";
-$a->strings["Soft butch"] = "";
-$a->strings["Stone femme"] = "";
-$a->strings["Tomboy"] = "";
 $a->strings["Transman"] = "Transmuž";
 $a->strings["Transwoman"] = "Transžena";
 $a->strings["Transvesti"] = "Transvestita";
-$a->strings["Trigender"] = "";
 $a->strings["Can't remember"] = "Nepamatuju si";
 $a->strings["Hard to tell these days"] = "Těžké říct touhle dobou";
 $a->strings["Girls with big tits"] = "Holky s velkýma kozama";
@@ -39,13 +30,10 @@ $a->strings["Statues, mannequins and immobility"] = "Sochy, figuríny a nepohybl
 $a->strings["Pain"] = "Bolest";
 $a->strings["Trans men"] = "Transmuži";
 $a->strings["Older women"] = "Starší ženy";
-$a->strings["Asphyxiation"] = "";
 $a->strings["In public"] = "Na veřejnosti";
 $a->strings["In danger"] = "V nebezpečí";
 $a->strings["Pretending to be male"] = "Předstírají, že jsou muži";
 $a->strings["Pretending to be female"] = "Předstírají, že jsou ženy";
-$a->strings["Breats"] = "";
-$a->strings["Scat"] = "";
 $a->strings["Crying"] = "Pláčí";
 $a->strings["Nappies/Diapers"] = "Plenky";
 $a->strings["Trees"] = "Stromy";
@@ -59,30 +47,22 @@ $a->strings["Elderly people"] = "Postarší lidé";
 $a->strings["Transgender people"] = "Transgenderoví lidé";
 $a->strings["Criminals"] = "Zločinci";
 $a->strings["Stealing"] = "Kradou";
-$a->strings["Breast milk"] = "";
-$a->strings["Immersing genitals in liquids"] = "";
 $a->strings["Giants"] = "Obři";
 $a->strings["Masochism"] = "Masochismus";
 $a->strings["Cars"] = "Auto";
 $a->strings["Menstruation"] = "Menstruace";
-$a->strings["Mucus"] = "";
 $a->strings["Obscene language"] = "Sprostý jazyk";
 $a->strings["Noses"] = "Nosy";
 $a->strings["Navels"] = "Pupky";
 $a->strings["Corpses"] = "Mrtvoly";
 $a->strings["Smells"] = "Pachy";
-$a->strings["Buttocks"] = "";
 $a->strings["Nonliving objects"] = "Neživoucí předměty";
 $a->strings["Sleeping people"] = "Spící lidé";
 $a->strings["Urination"] = "Močení";
 $a->strings["Eating people"] = "Žerou lidi";
-$a->strings["Being eaten"] = "";
 $a->strings["Animals"] = "Zvířata";
 $a->strings["I'd rather just have some chocolate"] = "Radši bych si prostě dal čokoládu";
-$a->strings["Married to my job"] = "";
 $a->strings["Polygamist"] = "Polygamist(k)a";
 $a->strings["Half married"] = "Napůl ženatý/vdaná";
 $a->strings["Living in the past"] = "Žiju v minulosti";
-$a->strings["Pretending to be over my ex"] = "";
 $a->strings["Hurt in the past"] = "Ublížen v minulosti";
-$a->strings["Wallowing in self-pity"] = "";
diff --git a/morechoice/lang/de/strings.php b/morechoice/lang/de/strings.php
index cf64f1f9a..5cb82912d 100644
--- a/morechoice/lang/de/strings.php
+++ b/morechoice/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Androgyne"] = "Androgyn";
diff --git a/morechoice/lang/en-gb/strings.php b/morechoice/lang/en-gb/strings.php
index 18b50b606..69b06aa84 100644
--- a/morechoice/lang/en-gb/strings.php
+++ b/morechoice/lang/en-gb/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Androgyne"] = "Androgyne";
diff --git a/morechoice/lang/fr/strings.php b/morechoice/lang/fr/strings.php
index 7d57e3be5..41e955141 100644
--- a/morechoice/lang/fr/strings.php
+++ b/morechoice/lang/fr/strings.php
@@ -3,26 +3,18 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Androgyne"] = "Androgyne";
 $a->strings["Bear"] = "Ours";
 $a->strings["Bigender"] = "Bigenre";
-$a->strings["Cross dresser"] = "";
 $a->strings["Drag queen"] = "drag queen";
 $a->strings["Eunuch"] = "eunuque";
-$a->strings["Faux queen"] = "";
 $a->strings["Gender fluid"] = "genre fluide";
-$a->strings["Kathoey"] = "";
-$a->strings["Lady"] = "";
-$a->strings["Lipstick lesbian"] = "";
 $a->strings["Metrosexual"] = "métrosexuel";
 $a->strings["Monk"] = "moine";
 $a->strings["Nun"] = "religieuse";
-$a->strings["Soft butch"] = "";
-$a->strings["Stone femme"] = "";
-$a->strings["Tomboy"] = "";
 $a->strings["Transman"] = "homme trans";
 $a->strings["Transwoman"] = "femme trans";
 $a->strings["Transvesti"] = "travesti";
@@ -31,58 +23,8 @@ $a->strings["Can't remember"] = "Ne se rappelle pas";
 $a->strings["Hard to tell these days"] = "Difficile à dire en ce moment";
 $a->strings["Girls with big tits"] = "Filles à gros seins";
 $a->strings["Millionaires"] = "Millionnaires";
-$a->strings["Guys with big schlongs"] = "";
 $a->strings["Easy women"] = "Femmes faciles";
 $a->strings["People with impaired mobility"] = "Personnes à mobilité réduite";
 $a->strings["Amputees"] = "Amputés";
-$a->strings["Statues, mannequins and immobility"] = "";
 $a->strings["Pain"] = "Douleur";
 $a->strings["Trans men"] = "Hommes trans";
-$a->strings["Older women"] = "";
-$a->strings["Asphyxiation"] = "";
-$a->strings["In public"] = "";
-$a->strings["In danger"] = "";
-$a->strings["Pretending to be male"] = "";
-$a->strings["Pretending to be female"] = "";
-$a->strings["Breats"] = "";
-$a->strings["Scat"] = "";
-$a->strings["Crying"] = "";
-$a->strings["Nappies/Diapers"] = "";
-$a->strings["Trees"] = "";
-$a->strings["Vomit"] = "";
-$a->strings["Murder"] = "";
-$a->strings["Fat people"] = "";
-$a->strings["Feet"] = "";
-$a->strings["Covered in insects"] = "";
-$a->strings["Turning a human being into furniture"] = "";
-$a->strings["Elderly people"] = "";
-$a->strings["Transgender people"] = "";
-$a->strings["Criminals"] = "";
-$a->strings["Stealing"] = "";
-$a->strings["Breast milk"] = "";
-$a->strings["Immersing genitals in liquids"] = "";
-$a->strings["Giants"] = "";
-$a->strings["Masochism"] = "";
-$a->strings["Cars"] = "";
-$a->strings["Menstruation"] = "";
-$a->strings["Mucus"] = "";
-$a->strings["Obscene language"] = "";
-$a->strings["Noses"] = "";
-$a->strings["Navels"] = "";
-$a->strings["Corpses"] = "";
-$a->strings["Smells"] = "";
-$a->strings["Buttocks"] = "";
-$a->strings["Nonliving objects"] = "";
-$a->strings["Sleeping people"] = "";
-$a->strings["Urination"] = "";
-$a->strings["Eating people"] = "";
-$a->strings["Being eaten"] = "";
-$a->strings["Animals"] = "";
-$a->strings["I'd rather just have some chocolate"] = "";
-$a->strings["Married to my job"] = "";
-$a->strings["Polygamist"] = "";
-$a->strings["Half married"] = "";
-$a->strings["Living in the past"] = "";
-$a->strings["Pretending to be over my ex"] = "";
-$a->strings["Hurt in the past"] = "";
-$a->strings["Wallowing in self-pity"] = "";
diff --git a/morechoice/lang/it/strings.php b/morechoice/lang/it/strings.php
index 470ade1f0..0f1759880 100644
--- a/morechoice/lang/it/strings.php
+++ b/morechoice/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Androgyne"] = "Androgino";
diff --git a/morechoice/lang/nl/strings.php b/morechoice/lang/nl/strings.php
index fd9e160f7..507381da1 100644
--- a/morechoice/lang/nl/strings.php
+++ b/morechoice/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Androgyne"] = "Dubbel geslacht";
@@ -13,7 +13,6 @@ $a->strings["Cross dresser"] = "Gekleed als het ander";
 $a->strings["Drag queen"] = "Travestiet";
 $a->strings["Eunuch"] = "Castraat";
 $a->strings["Faux queen"] = "Fout";
-$a->strings["Gender fluid"] = "";
 $a->strings["Kathoey"] = "Tussen man en vrouw";
 $a->strings["Lady"] = "Trotse vrouw";
 $a->strings["Lipstick lesbian"] = "Lesbienne-vrouw";
@@ -25,7 +24,6 @@ $a->strings["Stone femme"] = "Butch en femme";
 $a->strings["Tomboy"] = "Tomboy";
 $a->strings["Transman"] = "Transman";
 $a->strings["Transwoman"] = "Transvrouw";
-$a->strings["Transvesti"] = "";
 $a->strings["Trigender"] = "Drieslacht";
 $a->strings["Can't remember"] = "Kan ik mij niet meer herinneren";
 $a->strings["Hard to tell these days"] = "Moeilijk te zeggen vandaag";
diff --git a/morechoice/lang/pl/strings.php b/morechoice/lang/pl/strings.php
index 1c6eeb81f..fe7a28e8d 100644
--- a/morechoice/lang/pl/strings.php
+++ b/morechoice/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Androgyne"] = "Androgyniczny";
diff --git a/morepokes/lang/C/messages.po b/morepokes/lang/C/messages.po
index 950ce98d9..aa2a269b2 100644
--- a/morepokes/lang/C/messages.po
+++ b/morepokes/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/morepokes/lang/cs/strings.php b/morepokes/lang/cs/strings.php
index 86114ca6b..8428e39e2 100644
--- a/morepokes/lang/cs/strings.php
+++ b/morepokes/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["bitchslap"] = "dát facku";
diff --git a/morepokes/lang/de/strings.php b/morepokes/lang/de/strings.php
index 1aa170323..aafd47f6b 100644
--- a/morepokes/lang/de/strings.php
+++ b/morepokes/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["bitchslap"] = "ohrfeigen";
diff --git a/morepokes/lang/en-gb/strings.php b/morepokes/lang/en-gb/strings.php
index d4724ee1b..b2fd1efca 100644
--- a/morepokes/lang/en-gb/strings.php
+++ b/morepokes/lang/en-gb/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["bitchslap"] = "bitch-slap";
diff --git a/morepokes/lang/es/strings.php b/morepokes/lang/es/strings.php
index 345427f65..c49436654 100644
--- a/morepokes/lang/es/strings.php
+++ b/morepokes/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["bitchslap"] = "bofetada";
diff --git a/morepokes/lang/fi-fi/strings.php b/morepokes/lang/fi-fi/strings.php
index 8ba1a4439..49b72f0a9 100644
--- a/morepokes/lang/fi-fi/strings.php
+++ b/morepokes/lang/fi-fi/strings.php
@@ -2,31 +2,20 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
-$a->strings["bitchslap"] = "";
-$a->strings["bitchslapped"] = "";
 $a->strings["shag"] = "pane";
 $a->strings["shagged"] = "pani";
-$a->strings["do something obscenely biological to"] = "";
-$a->strings["did something obscenely biological to"] = "";
-$a->strings["point out the poke feature to"] = "";
-$a->strings["pointed out the poke feature to"] = "";
-$a->strings["declare undying love for"] = "";
-$a->strings["declared undying love for"] = "";
 $a->strings["patent"] = "patentoi";
 $a->strings["patented"] = "patentoi";
 $a->strings["stroke beard"] = "silitä partaa";
 $a->strings["stroked their beard at"] = "silitti partaa";
-$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "";
-$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "";
 $a->strings["hug"] = "halaa";
 $a->strings["hugged"] = "halasi";
 $a->strings["kiss"] = "suutele";
 $a->strings["kissed"] = "pussasi";
-$a->strings["raise eyebrows at"] = "";
-$a->strings["raised their eyebrows at"] = "";
 $a->strings["insult"] = "loukkaa";
 $a->strings["insulted"] = "loukkasi";
 $a->strings["praise"] = "kehu";
@@ -35,8 +24,6 @@ $a->strings["be dubious of"] = "epäile";
 $a->strings["was dubious of"] = "epäili";
 $a->strings["eat"] = "syö";
 $a->strings["ate"] = "söi";
-$a->strings["giggle and fawn at"] = "";
-$a->strings["giggled and fawned at"] = "";
 $a->strings["doubt"] = "epäile";
 $a->strings["doubted"] = "epäili";
 $a->strings["glare"] = "mulkoile";
diff --git a/morepokes/lang/it/strings.php b/morepokes/lang/it/strings.php
index 0ba63a0a9..992259bcf 100644
--- a/morepokes/lang/it/strings.php
+++ b/morepokes/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["bitchslap"] = "schiaffeggia";
diff --git a/morepokes/lang/nl/strings.php b/morepokes/lang/nl/strings.php
index 55c582cbf..b560b9d7d 100644
--- a/morepokes/lang/nl/strings.php
+++ b/morepokes/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["bitchslap"] = "Kaakslag";
diff --git a/morepokes/lang/pl/strings.php b/morepokes/lang/pl/strings.php
index 0edb6560e..cfd98be04 100644
--- a/morepokes/lang/pl/strings.php
+++ b/morepokes/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["bitchslap"] = "spoliczkować";
diff --git a/morepokes/lang/ro/strings.php b/morepokes/lang/ro/strings.php
index 3af705299..905464283 100644
--- a/morepokes/lang/ro/strings.php
+++ b/morepokes/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["bitchslap"] = "palmuire-javră";
diff --git a/namethingy/lang/C/messages.po b/namethingy/lang/C/messages.po
deleted file mode 100644
index e69de29bb..000000000
diff --git a/newmemberwidget/lang/C/messages.po b/newmemberwidget/lang/C/messages.po
index d69b29e39..1e7d608a7 100644
--- a/newmemberwidget/lang/C/messages.po
+++ b/newmemberwidget/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-01 14:12+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,57 +17,57 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: newmemberwidget.php:21
+#: newmemberwidget.php:29
 msgid "New Member"
 msgstr ""
 
-#: newmemberwidget.php:22
+#: newmemberwidget.php:30
 msgid "Tips for New Members"
 msgstr ""
 
-#: newmemberwidget.php:24
+#: newmemberwidget.php:33
 msgid "Global Support Forum"
 msgstr ""
 
-#: newmemberwidget.php:26
+#: newmemberwidget.php:37
 msgid "Local Support Forum"
 msgstr ""
 
-#: newmemberwidget.php:49
+#: newmemberwidget.php:65
 msgid "Save Settings"
 msgstr ""
 
-#: newmemberwidget.php:50
+#: newmemberwidget.php:66
 msgid "Message"
 msgstr ""
 
-#: newmemberwidget.php:50
+#: newmemberwidget.php:66
 msgid "Your message for new members. You can use bbcode here."
 msgstr ""
 
-#: newmemberwidget.php:51
+#: newmemberwidget.php:67
 msgid "Add a link to global support forum"
 msgstr ""
 
-#: newmemberwidget.php:51
+#: newmemberwidget.php:67
 msgid "Should a link to the global support forum be displayed?"
 msgstr ""
 
-#: newmemberwidget.php:52
+#: newmemberwidget.php:68
 msgid "Add a link to the local support forum"
 msgstr ""
 
-#: newmemberwidget.php:52
+#: newmemberwidget.php:68
 msgid ""
-"If you have a local support forum and wand to have a link displayed in the "
+"If you have a local support forum and want to have a link displayed in the "
 "widget, check this box."
 msgstr ""
 
-#: newmemberwidget.php:53
+#: newmemberwidget.php:69
 msgid "Name of the local support group"
 msgstr ""
 
-#: newmemberwidget.php:53
+#: newmemberwidget.php:69
 msgid ""
 "If you checked the above, specify the <em>nickname</em> of the local support "
 "group here (i.e. helpers)"
diff --git a/newmemberwidget/lang/cs/strings.php b/newmemberwidget/lang/cs/strings.php
index 30fed02c5..fe120bb30 100644
--- a/newmemberwidget/lang/cs/strings.php
+++ b/newmemberwidget/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["New Member"] = "Nový člen";
diff --git a/newmemberwidget/lang/de/strings.php b/newmemberwidget/lang/de/strings.php
index 77f5ad629..425cf30e7 100644
--- a/newmemberwidget/lang/de/strings.php
+++ b/newmemberwidget/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["New Member"] = "Neue Nutzer";
diff --git a/newmemberwidget/lang/es/strings.php b/newmemberwidget/lang/es/strings.php
index de5df04f1..97686bae8 100644
--- a/newmemberwidget/lang/es/strings.php
+++ b/newmemberwidget/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["New Member"] = "Nuevo Miembro";
diff --git a/newmemberwidget/lang/et/strings.php b/newmemberwidget/lang/et/strings.php
index e05637669..f61849644 100644
--- a/newmemberwidget/lang/et/strings.php
+++ b/newmemberwidget/lang/et/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_et")) {
 function string_plural_select_et($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["New Member"] = "Uus liige";
@@ -12,10 +12,3 @@ $a->strings["Global Support Forum"] = "Globaalne tugifoorum";
 $a->strings["Local Support Forum"] = "Lokaalne tugifoorum";
 $a->strings["Save Settings"] = "Salvesta sätted";
 $a->strings["Message"] = "Sõnum";
-$a->strings["Your message for new members. You can use bbcode here."] = "";
-$a->strings["Add a link to global support forum"] = "";
-$a->strings["Should a link to the global support forum be displayed?"] = "";
-$a->strings["Add a link to the local support forum"] = "";
-$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "";
-$a->strings["Name of the local support group"] = "";
-$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "";
diff --git a/newmemberwidget/lang/fi-fi/strings.php b/newmemberwidget/lang/fi-fi/strings.php
index 02e8ce303..71ece029f 100644
--- a/newmemberwidget/lang/fi-fi/strings.php
+++ b/newmemberwidget/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["New Member"] = "Uusi jäsen";
@@ -11,10 +12,6 @@ $a->strings["Global Support Forum"] = "Maailmanlaajuinen tukifoorumi";
 $a->strings["Local Support Forum"] = "Paikallinen tukifoorumi";
 $a->strings["Save Settings"] = "Tallenna asetukset";
 $a->strings["Message"] = "Viesti";
-$a->strings["Your message for new members. You can use bbcode here."] = "";
 $a->strings["Add a link to global support forum"] = "Lisää linkki maailmanlaajuiseen tukifoorumiin";
-$a->strings["Should a link to the global support forum be displayed?"] = "";
 $a->strings["Add a link to the local support forum"] = "Lisää linkki paikalliseen tukifoorumiin";
-$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "";
 $a->strings["Name of the local support group"] = "Paikallisen tukifoorumin nimi";
-$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "";
diff --git a/newmemberwidget/lang/it/strings.php b/newmemberwidget/lang/it/strings.php
index 6138ea6a1..3fc6e5cc8 100644
--- a/newmemberwidget/lang/it/strings.php
+++ b/newmemberwidget/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["New Member"] = "Nuovi Utenti";
diff --git a/newmemberwidget/lang/nl/strings.php b/newmemberwidget/lang/nl/strings.php
index 90e69ce36..9b38bf0f5 100644
--- a/newmemberwidget/lang/nl/strings.php
+++ b/newmemberwidget/lang/nl/strings.php
@@ -3,19 +3,9 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["New Member"] = "Nieuw lid";
 $a->strings["Tips for New Members"] = "Tips voor nieuwe leden";
-$a->strings["Global Support Forum"] = "";
-$a->strings["Local Support Forum"] = "";
 $a->strings["Save Settings"] = "Instellingen opslaan";
-$a->strings["Message"] = "";
-$a->strings["Your message for new members. You can use bbcode here."] = "";
-$a->strings["Add a link to global support forum"] = "";
-$a->strings["Should a link to the global support forum be displayed?"] = "";
-$a->strings["Add a link to the local support forum"] = "";
-$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "";
-$a->strings["Name of the local support group"] = "";
-$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "";
diff --git a/newmemberwidget/lang/pl/strings.php b/newmemberwidget/lang/pl/strings.php
index a58f34ef4..8405d7892 100644
--- a/newmemberwidget/lang/pl/strings.php
+++ b/newmemberwidget/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["New Member"] = "Nowy Użytkownik";
diff --git a/newmemberwidget/lang/pt-br/strings.php b/newmemberwidget/lang/pt-br/strings.php
index a6fb624ce..e873efe6a 100644
--- a/newmemberwidget/lang/pt-br/strings.php
+++ b/newmemberwidget/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["New Member"] = "Novo Membro";
diff --git a/newmemberwidget/lang/ro/strings.php b/newmemberwidget/lang/ro/strings.php
index 0a00d1a6d..b3cf874b0 100644
--- a/newmemberwidget/lang/ro/strings.php
+++ b/newmemberwidget/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["New Member"] = "Membru Nou";
diff --git a/newmemberwidget/lang/ru/strings.php b/newmemberwidget/lang/ru/strings.php
index 6ef208522..fe80f37ed 100644
--- a/newmemberwidget/lang/ru/strings.php
+++ b/newmemberwidget/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["New Member"] = "Новичок";
diff --git a/notifyall/lang/C/messages.po b/notifyall/lang/C/messages.po
index 66e2a4d2e..81f2d784f 100644
--- a/notifyall/lang/C/messages.po
+++ b/notifyall/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-14 16:41+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: notifyall.php:26
-msgid "Send email to all members"
-msgstr ""
-
-#: notifyall.php:42
+#: NotifyAllEmail.php:40
 #, php-format
 msgid "%s Administrator"
 msgstr ""
 
-#: notifyall.php:44
+#: NotifyAllEmail.php:42
 #, php-format
 msgid "%1$s, %2$s Administrator"
 msgstr ""
 
-#: notifyall.php:60
+#: notifyall.php:22
+msgid "Send email to all members"
+msgstr ""
+
+#: notifyall.php:49
 msgid "No recipients found."
 msgstr ""
 
-#: notifyall.php:78
+#: notifyall.php:59
 msgid "Emails sent"
 msgstr ""
 
-#: notifyall.php:86
+#: notifyall.php:69
 msgid "Send email to all members of this Friendica instance."
 msgstr ""
 
-#: notifyall.php:91
+#: notifyall.php:74
 msgid "Message subject"
 msgstr ""
 
-#: notifyall.php:92
+#: notifyall.php:75
 msgid "Test mode (only send to administrator)"
 msgstr ""
 
-#: notifyall.php:93
+#: notifyall.php:76
 msgid "Submit"
 msgstr ""
diff --git a/notifyall/lang/cs/strings.php b/notifyall/lang/cs/strings.php
index e01528ceb..387aa29a9 100644
--- a/notifyall/lang/cs/strings.php
+++ b/notifyall/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Send email to all members"] = "Odeslat e-mail všem členům";
diff --git a/notifyall/lang/de/strings.php b/notifyall/lang/de/strings.php
index 9c92b42e8..b46e127af 100644
--- a/notifyall/lang/de/strings.php
+++ b/notifyall/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Send email to all members"] = "Sende eine E-Mail an alle Nutzer der Seite";
diff --git a/notifyall/lang/es/strings.php b/notifyall/lang/es/strings.php
index 312a6acd8..0aee142d2 100644
--- a/notifyall/lang/es/strings.php
+++ b/notifyall/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Send email to all members"] = "Enviar email a todos los miembros";
diff --git a/notifyall/lang/fi-fi/strings.php b/notifyall/lang/fi-fi/strings.php
index 1c467153a..7292d09f0 100644
--- a/notifyall/lang/fi-fi/strings.php
+++ b/notifyall/lang/fi-fi/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Send email to all members"] = "Lähetä sähköposti kaikille jäsenille";
@@ -11,7 +11,5 @@ $a->strings["%s Administrator"] = "%s-ylläpitäjä";
 $a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s-ylläpitäjä";
 $a->strings["No recipients found."] = "Vastaanottajaa ei löytynyt.";
 $a->strings["Emails sent"] = "Sähköpostit lähetetty";
-$a->strings["Send email to all members of this Friendica instance."] = "";
 $a->strings["Message subject"] = "Viestin aihe";
-$a->strings["Test mode (only send to administrator)"] = "";
 $a->strings["Submit"] = "Lähetä";
diff --git a/notifyall/lang/fr/strings.php b/notifyall/lang/fr/strings.php
index b0fbefa30..6b78241c8 100644
--- a/notifyall/lang/fr/strings.php
+++ b/notifyall/lang/fr/strings.php
@@ -2,12 +2,11 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Send email to all members"] = "Envoyer un courriel à tous les membres";
-$a->strings["%s Administrator"] = "";
-$a->strings["%1\$s, %2\$s Administrator"] = "";
 $a->strings["No recipients found."] = "Aucun destinataire trouvé.";
 $a->strings["Emails sent"] = "Courriels envoyés";
 $a->strings["Send email to all members of this Friendica instance."] = "Envoyer un courriel à tous les membres de cet instance Friendica.";
diff --git a/notifyall/lang/it/strings.php b/notifyall/lang/it/strings.php
index c47067b6b..e43291a3a 100644
--- a/notifyall/lang/it/strings.php
+++ b/notifyall/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Send email to all members"] = "Invia email a tutti i membri";
diff --git a/notifyall/lang/nl/strings.php b/notifyall/lang/nl/strings.php
index 78c6488d7..4aabe231d 100644
--- a/notifyall/lang/nl/strings.php
+++ b/notifyall/lang/nl/strings.php
@@ -3,15 +3,9 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Send email to all members"] = "Stuur e-mail naar alle leden";
 $a->strings["%s Administrator"] = "%s Beheerder";
 $a->strings["%1\$s, %2\$s Administrator"] = "%1\$s%2\$s Beheerder";
-$a->strings["No recipients found."] = "";
-$a->strings["Emails sent"] = "";
-$a->strings["Send email to all members of this Friendica instance."] = "";
-$a->strings["Message subject"] = "";
-$a->strings["Test mode (only send to administrator)"] = "";
-$a->strings["Submit"] = "";
diff --git a/notifyall/lang/pl/strings.php b/notifyall/lang/pl/strings.php
index 38a91bb0d..8b3ed887f 100644
--- a/notifyall/lang/pl/strings.php
+++ b/notifyall/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Send email to all members"] = "Wyślij e-mail do wszystkich członków";
@@ -10,7 +11,6 @@ $a->strings["%s Administrator"] = "%s Administrator";
 $a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Administrator";
 $a->strings["No recipients found."] = "Nie znaleziono adresatów.";
 $a->strings["Emails sent"] = "Wysłane wiadomości e-mail";
-$a->strings["Send email to all members of this Friendica instance."] = "Wyślij wiadomość e-mail do wszystkich członków tej instancji Friendica.";
 $a->strings["Message subject"] = "Temat wiadomości";
 $a->strings["Test mode (only send to administrator)"] = "Tryb testowy (wysyłany tylko do administratora)";
 $a->strings["Submit"] = "Zatwierdź";
diff --git a/notifyall/lang/pt-br/strings.php b/notifyall/lang/pt-br/strings.php
index 7df5beec9..4ea5dd39d 100644
--- a/notifyall/lang/pt-br/strings.php
+++ b/notifyall/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Send email to all members"] = "Enviar e-mail para todos os membros";
diff --git a/notifyall/lang/ru/strings.php b/notifyall/lang/ru/strings.php
index 4d394daef..ef92ce08c 100644
--- a/notifyall/lang/ru/strings.php
+++ b/notifyall/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Send email to all members"] = "Послать почту всем пользователям";
diff --git a/notimeline/lang/C/messages.po b/notimeline/lang/C/messages.po
index 76a4fcd97..8e99fda1a 100644
--- a/notimeline/lang/C/messages.po
+++ b/notimeline/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,18 +17,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: notimeline.php:32
-msgid "No Timeline settings updated."
-msgstr ""
-
-#: notimeline.php:56
+#: notimeline.php:48
 msgid "No Timeline Settings"
 msgstr ""
 
-#: notimeline.php:58
+#: notimeline.php:50
 msgid "Disable Archive selector on profile wall"
 msgstr ""
 
-#: notimeline.php:64
-msgid "Submit"
+#: notimeline.php:56
+msgid "Save Settings"
 msgstr ""
diff --git a/notimeline/lang/cs/strings.php b/notimeline/lang/cs/strings.php
index c3b6c081c..f0dfbe21a 100644
--- a/notimeline/lang/cs/strings.php
+++ b/notimeline/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["No Timeline settings updated."] = "Nastavení No Timeline aktualizováno.";
diff --git a/notimeline/lang/de/strings.php b/notimeline/lang/de/strings.php
index 85459dacb..44aff163c 100644
--- a/notimeline/lang/de/strings.php
+++ b/notimeline/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["No Timeline settings updated."] = "Keine Timeline-Einstellungen aktualisiert.";
diff --git a/notimeline/lang/es/strings.php b/notimeline/lang/es/strings.php
index ec69f6ff7..c51e14318 100644
--- a/notimeline/lang/es/strings.php
+++ b/notimeline/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["No Timeline settings updated."] = "Ningún ajuste de Línea de Tiempo actualizado";
diff --git a/notimeline/lang/fi-fi/strings.php b/notimeline/lang/fi-fi/strings.php
index 226884936..9148c2d03 100644
--- a/notimeline/lang/fi-fi/strings.php
+++ b/notimeline/lang/fi-fi/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["No Timeline settings updated."] = "No Timeline -asetukset päivitetty";
 $a->strings["No Timeline Settings"] = "No Timeline -asetukset";
-$a->strings["Disable Archive selector on profile wall"] = "";
 $a->strings["Submit"] = "Lähetä";
diff --git a/notimeline/lang/it/strings.php b/notimeline/lang/it/strings.php
index cb5be5115..5297c6de8 100644
--- a/notimeline/lang/it/strings.php
+++ b/notimeline/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["No Timeline settings updated."] = "Impostazioni \"No Timeline\" aggiornate.";
diff --git a/notimeline/lang/nl/strings.php b/notimeline/lang/nl/strings.php
index 4e113f31a..76ad2b9cd 100644
--- a/notimeline/lang/nl/strings.php
+++ b/notimeline/lang/nl/strings.php
@@ -3,10 +3,8 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["No Timeline settings updated."] = "Geen tijdlijn instellingen opgeslagen";
 $a->strings["No Timeline Settings"] = "No Timeline instellingen";
-$a->strings["Disable Archive selector on profile wall"] = "";
-$a->strings["Submit"] = "";
diff --git a/notimeline/lang/pl/strings.php b/notimeline/lang/pl/strings.php
index 8e7aa6bf4..d98731f0f 100644
--- a/notimeline/lang/pl/strings.php
+++ b/notimeline/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["No Timeline settings updated."] = "Nie zaktualizowano ustawień osi czasu.";
diff --git a/notimeline/lang/ro/strings.php b/notimeline/lang/ro/strings.php
index ea9956740..971fb04c5 100644
--- a/notimeline/lang/ro/strings.php
+++ b/notimeline/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["No Timeline settings updated."] = "Configurările pentru Lipsă Cronologie, au fost actualizate.";
diff --git a/notimeline/lang/zh-cn/strings.php b/notimeline/lang/zh-cn/strings.php
index c4b2a7947..70f0e214a 100644
--- a/notimeline/lang/zh-cn/strings.php
+++ b/notimeline/lang/zh-cn/strings.php
@@ -3,10 +3,9 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["No Timeline settings updated."] = "时间轴设置未更新。";
 $a->strings["No Timeline Settings"] = "无时间轴设置";
-$a->strings["Disable Archive selector on profile wall"] = "";
 $a->strings["Submit"] = "提交";
diff --git a/nsfw/lang/C/messages.po b/nsfw/lang/C/messages.po
index 7d83e15e2..77297a3a4 100644
--- a/nsfw/lang/C/messages.po
+++ b/nsfw/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: nsfw.php:77 nsfw.php:81
+#: nsfw.php:68 nsfw.php:72
 msgid "Content Filter (NSFW and more)"
 msgstr ""
 
-#: nsfw.php:85
+#: nsfw.php:76
 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 "
@@ -29,32 +29,28 @@ msgid ""
 "is also useful for hiding irrelevant or annoying content from direct view."
 msgstr ""
 
-#: nsfw.php:86
+#: nsfw.php:77
 msgid "Enable Content filter"
 msgstr ""
 
-#: nsfw.php:89
+#: nsfw.php:80
 msgid "Comma separated list of keywords to hide"
 msgstr ""
 
-#: nsfw.php:93
+#: nsfw.php:84
 msgid "Save Settings"
 msgstr ""
 
-#: nsfw.php:94
+#: nsfw.php:85
 msgid "Use /expression/ to provide regular expressions"
 msgstr ""
 
-#: nsfw.php:109
-msgid "NSFW Settings saved."
-msgstr ""
-
-#: nsfw.php:162
+#: nsfw.php:152
 #, php-format
 msgid "Filtered tag: %s"
 msgstr ""
 
-#: nsfw.php:164
+#: nsfw.php:154
 #, php-format
 msgid "Filtered word: %s"
 msgstr ""
diff --git a/nsfw/lang/cs/strings.php b/nsfw/lang/cs/strings.php
index a783951f0..42f941c4f 100644
--- a/nsfw/lang/cs/strings.php
+++ b/nsfw/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Content Filter (NSFW and more)"] = "Filtr obsahu (citlivý obsah a další)";
diff --git a/nsfw/lang/de/strings.php b/nsfw/lang/de/strings.php
index e1d04ad17..dde95d3f5 100644
--- a/nsfw/lang/de/strings.php
+++ b/nsfw/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Content Filter (NSFW and more)"] = "Inhaltsfilter (NSFW und mehr)";
diff --git a/nsfw/lang/en-gb/strings.php b/nsfw/lang/en-gb/strings.php
index a7ace5257..5745bd524 100644
--- a/nsfw/lang/en-gb/strings.php
+++ b/nsfw/lang/en-gb/strings.php
@@ -2,14 +2,12 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
-$a->strings["Content Filter (NSFW and more)"] = "";
-$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."] = "";
 $a->strings["Enable Content filter"] = "Enable content filter";
 $a->strings["Comma separated list of keywords to hide"] = "Comma separated list of keywords";
-$a->strings["Save Settings"] = "";
 $a->strings["Use /expression/ to provide regular expressions"] = "Use /expression/ for regular expressions.";
 $a->strings["NSFW Settings saved."] = "NSFW settings saved.";
 $a->strings["%s - Click to open/close"] = "%s - Reveal/hide";
diff --git a/nsfw/lang/en-us/strings.php b/nsfw/lang/en-us/strings.php
index 294cbbd64..b9c47bc30 100644
--- a/nsfw/lang/en-us/strings.php
+++ b/nsfw/lang/en-us/strings.php
@@ -2,14 +2,12 @@
 
 if(! function_exists("string_plural_select_en_us")) {
 function string_plural_select_en_us($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
-$a->strings["Content Filter (NSFW and more)"] = "";
-$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."] = "";
 $a->strings["Enable Content filter"] = "Enable content filter";
 $a->strings["Comma separated list of keywords to hide"] = "Comma separated list of keywords";
-$a->strings["Save Settings"] = "";
 $a->strings["Use /expression/ to provide regular expressions"] = "Use /expression/ for regular expressions.";
 $a->strings["NSFW Settings saved."] = "NSFW settings saved.";
 $a->strings["%s - Click to open/close"] = "%s - Reveal/hide";
diff --git a/nsfw/lang/es/strings.php b/nsfw/lang/es/strings.php
index 75d3211df..c85f227be 100644
--- a/nsfw/lang/es/strings.php
+++ b/nsfw/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Configuración \"No apto para trabajar\" (Filtro genérico de contenido)";
diff --git a/nsfw/lang/fi-fi/strings.php b/nsfw/lang/fi-fi/strings.php
index 2afd44f49..a6a3ea591 100644
--- a/nsfw/lang/fi-fi/strings.php
+++ b/nsfw/lang/fi-fi/strings.php
@@ -3,15 +3,12 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Content Filter (NSFW and more)"] = "Sisällönsuodatin (NSFW yms.)";
-$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."] = "";
 $a->strings["Enable Content filter"] = "Ota sisällönsuodatin käyttöön";
-$a->strings["Comma separated list of keywords to hide"] = "";
 $a->strings["Save Settings"] = "Tallenna asetukset";
-$a->strings["Use /expression/ to provide regular expressions"] = "";
 $a->strings["NSFW Settings saved."] = "NSFW-asetukset tallennettu.";
 $a->strings["Filtered tag: %s"] = "Suodatettu tunniste: %s";
 $a->strings["Filtered word: %s"] = "Suodatettu sana: %s";
diff --git a/nsfw/lang/it/strings.php b/nsfw/lang/it/strings.php
index 69d9e287d..b926b32aa 100644
--- a/nsfw/lang/it/strings.php
+++ b/nsfw/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Content Filter (NSFW and more)"] = "Filtro Contenuto (NSFW e altro)";
diff --git a/nsfw/lang/nl/strings.php b/nsfw/lang/nl/strings.php
index 83dc72413..7ae93a14f 100644
--- a/nsfw/lang/nl/strings.php
+++ b/nsfw/lang/nl/strings.php
@@ -3,15 +3,11 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Content Filter (NSFW and more)"] = "Inhoud filter (NSFW en meer)";
 $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."] = "Deze add-on zoekt naar gespecificeerde woorden / tekst in berichten en vouwt ze samen. Het kan worden gebruikt om inhoud te filteren die is getagd met bijvoorbeeld #NSFW die op bepaalde tijden of plaatsen als ongepast kan worden beschouwd, zoals op het werk. Het is ook handig om irrelevante of irritante inhoud voor direct zicht te verbergen.";
 $a->strings["Enable Content filter"] = "Content filter inschakelen";
-$a->strings["Comma separated list of keywords to hide"] = "";
 $a->strings["Save Settings"] = "Instellingen opslaan";
-$a->strings["Use /expression/ to provide regular expressions"] = "";
 $a->strings["NSFW Settings saved."] = "NSFW instellingen opgeslagen";
-$a->strings["Filtered tag: %s"] = "";
-$a->strings["Filtered word: %s"] = "";
diff --git a/nsfw/lang/pl/strings.php b/nsfw/lang/pl/strings.php
index e749b72d4..b678db641 100644
--- a/nsfw/lang/pl/strings.php
+++ b/nsfw/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Content Filter (NSFW and more)"] = "Filtr zawartości (NSFW i więcej)";
diff --git a/nsfw/lang/pt-br/strings.php b/nsfw/lang/pt-br/strings.php
index 21a814923..267c82754 100644
--- a/nsfw/lang/pt-br/strings.php
+++ b/nsfw/lang/pt-br/strings.php
@@ -2,14 +2,9 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
-$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "";
-$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "";
 $a->strings["Enable Content filter"] = "Habilitar filtro de conteúdo";
-$a->strings["Comma separated list of keywords to hide"] = "";
 $a->strings["Submit"] = "Enviar";
-$a->strings["Use /expression/ to provide regular expressions"] = "";
-$a->strings["NSFW Settings saved."] = "";
-$a->strings["%s - Click to open/close"] = "";
diff --git a/nsfw/lang/ro/strings.php b/nsfw/lang/ro/strings.php
index f03f490f8..b7316c72d 100644
--- a/nsfw/lang/ro/strings.php
+++ b/nsfw/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Nesigur Pentru Lucru (Filtrare de Conținut pentru Uz General )";
diff --git a/nsfw/lang/ru/strings.php b/nsfw/lang/ru/strings.php
index d16d1195d..e3f6e64b6 100644
--- a/nsfw/lang/ru/strings.php
+++ b/nsfw/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Content Filter (NSFW and more)"] = "Фильтр контента (NSFW и прочее)";
diff --git a/nsfw/lang/zh-cn/strings.php b/nsfw/lang/zh-cn/strings.php
index 4aaae05b6..fe684f48d 100644
--- a/nsfw/lang/zh-cn/strings.php
+++ b/nsfw/lang/zh-cn/strings.php
@@ -3,11 +3,10 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Content Filter (NSFW and more)"] = "内容过滤 ( NSFW 及其他更多)";
-$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."] = "";
 $a->strings["Enable Content filter"] = "启用内容过滤";
 $a->strings["Comma separated list of keywords to hide"] = "以逗号分隔需隐藏关键字列表";
 $a->strings["Save Settings"] = "保存设置";
diff --git a/numfriends/lang/C/messages.po b/numfriends/lang/C/messages.po
index 91af964d5..7036f840c 100644
--- a/numfriends/lang/C/messages.po
+++ b/numfriends/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,18 +17,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: numfriends.php:46
-msgid "Numfriends settings updated."
-msgstr ""
-
-#: numfriends.php:77
+#: numfriends.php:59
 msgid "Numfriends Settings"
 msgstr ""
 
-#: numfriends.php:79
+#: numfriends.php:61
 msgid "How many contacts to display on profile sidebar"
 msgstr ""
 
-#: numfriends.php:85
-msgid "Submit"
+#: numfriends.php:67
+msgid "Save Settings"
 msgstr ""
diff --git a/numfriends/lang/cs/strings.php b/numfriends/lang/cs/strings.php
index e85650718..54d9d0ed2 100644
--- a/numfriends/lang/cs/strings.php
+++ b/numfriends/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Numfriends settings updated."] = "Nastavení Numfriends aktualizováno";
diff --git a/numfriends/lang/de/strings.php b/numfriends/lang/de/strings.php
index c77ab53e3..64462bf64 100644
--- a/numfriends/lang/de/strings.php
+++ b/numfriends/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Numfriends settings updated."] = "Numfriends Einstellungen aktualisiert";
diff --git a/numfriends/lang/es/strings.php b/numfriends/lang/es/strings.php
index a06fbcf36..27a0c24af 100644
--- a/numfriends/lang/es/strings.php
+++ b/numfriends/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Numfriends settings updated."] = "Ajustes de Numfriends actualizados.";
diff --git a/numfriends/lang/fi-fi/strings.php b/numfriends/lang/fi-fi/strings.php
index 029928a09..4472733d0 100644
--- a/numfriends/lang/fi-fi/strings.php
+++ b/numfriends/lang/fi-fi/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Numfriends settings updated."] = "Numfriends -asetukset päivitetty.";
diff --git a/numfriends/lang/fr/strings.php b/numfriends/lang/fr/strings.php
index 84ec8c8d1..00b35f1f5 100644
--- a/numfriends/lang/fr/strings.php
+++ b/numfriends/lang/fr/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Numfriends settings updated."] = "Configuration de Numfriends mise à jour.";
diff --git a/numfriends/lang/it/strings.php b/numfriends/lang/it/strings.php
index c1ab0ada0..1b850f580 100644
--- a/numfriends/lang/it/strings.php
+++ b/numfriends/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Numfriends settings updated."] = "Impostazioni \"Numfriends' aggiornate.";
diff --git a/numfriends/lang/nl/strings.php b/numfriends/lang/nl/strings.php
index 7ad90c3f0..fcbe4f774 100644
--- a/numfriends/lang/nl/strings.php
+++ b/numfriends/lang/nl/strings.php
@@ -3,10 +3,8 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Numfriends settings updated."] = "Numfriends instellingen opgeslagen";
 $a->strings["Numfriends Settings"] = "Numfriends instellingen";
-$a->strings["How many contacts to display on profile sidebar"] = "";
-$a->strings["Submit"] = "";
diff --git a/numfriends/lang/pl/strings.php b/numfriends/lang/pl/strings.php
index 949fbc5b8..824809b58 100644
--- a/numfriends/lang/pl/strings.php
+++ b/numfriends/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Numfriends settings updated."] = "Zaktualizowano ustawienia Numfriends.";
diff --git a/numfriends/lang/ro/strings.php b/numfriends/lang/ro/strings.php
index 7ee199fe9..1b8aff79f 100644
--- a/numfriends/lang/ro/strings.php
+++ b/numfriends/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Numfriends settings updated."] = "Configurările NumFriends au fost actualizate.";
diff --git a/numfriends/lang/ru/strings.php b/numfriends/lang/ru/strings.php
index 0b92ac938..e896f9998 100644
--- a/numfriends/lang/ru/strings.php
+++ b/numfriends/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Numfriends settings updated."] = "Настройки Numfriends обновлены.";
diff --git a/openstreetmap/lang/C/messages.po b/openstreetmap/lang/C/messages.po
index 040503b4b..6424eff55 100644
--- a/openstreetmap/lang/C/messages.po
+++ b/openstreetmap/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,28 +17,47 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: openstreetmap.php:94
+#: openstreetmap.php:167
+msgid "View Larger"
+msgstr ""
+
+#: openstreetmap.php:194
 msgid "Submit"
 msgstr ""
 
-#: openstreetmap.php:95
+#: openstreetmap.php:195
 msgid "Tile Server URL"
 msgstr ""
 
-#: openstreetmap.php:95
+#: openstreetmap.php:195
 msgid ""
 "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
-"\">public tile servers</a>"
+"\" rel=\"noopener noreferrer\">public tile servers</a>"
 msgstr ""
 
-#: openstreetmap.php:96
+#: openstreetmap.php:196
+msgid "Nominatim (reverse geocoding) Server URL"
+msgstr ""
+
+#: openstreetmap.php:196
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target="
+"\"_blank\" rel=\"noopener noreferrer\">Nominatim servers</a>"
+msgstr ""
+
+#: openstreetmap.php:197
 msgid "Default zoom"
 msgstr ""
 
-#: openstreetmap.php:96
-msgid "The default zoom level. (1:world, 18:highest)"
+#: openstreetmap.php:197
+msgid ""
+"The default zoom level. (1:world, 18:highest, also depends on tile server)"
 msgstr ""
 
-#: openstreetmap.php:104
-msgid "Settings updated."
+#: openstreetmap.php:198
+msgid "Include marker on map"
+msgstr ""
+
+#: openstreetmap.php:198
+msgid "Include a marker on the map."
 msgstr ""
diff --git a/openstreetmap/lang/cs/strings.php b/openstreetmap/lang/cs/strings.php
index fbfec1945..2ebdccaba 100644
--- a/openstreetmap/lang/cs/strings.php
+++ b/openstreetmap/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["Submit"] = "Odeslat";
diff --git a/openstreetmap/lang/de/strings.php b/openstreetmap/lang/de/strings.php
index b3bbbb22a..d1ac99199 100644
--- a/openstreetmap/lang/de/strings.php
+++ b/openstreetmap/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Submit"] = "Senden";
diff --git a/openstreetmap/lang/es/strings.php b/openstreetmap/lang/es/strings.php
index d8a59d0e0..24ff8660f 100644
--- a/openstreetmap/lang/es/strings.php
+++ b/openstreetmap/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Submit"] = "Enviar";
diff --git a/openstreetmap/lang/fi-fi/strings.php b/openstreetmap/lang/fi-fi/strings.php
index 62c6e54c3..b6a712318 100644
--- a/openstreetmap/lang/fi-fi/strings.php
+++ b/openstreetmap/lang/fi-fi/strings.php
@@ -3,12 +3,10 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Submit"] = "Lähetä";
-$a->strings["Tile Server URL"] = "";
-$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "";
 $a->strings["Default zoom"] = "Oletuszoomaus";
 $a->strings["The default zoom level. (1:world, 18:highest)"] = "Oletuszoomaustaso (1: kaukaisin, 18: läheisin)";
 $a->strings["Settings updated."] = "Asetukset päivitetty";
diff --git a/openstreetmap/lang/fr/strings.php b/openstreetmap/lang/fr/strings.php
index cdd98efc3..badde35c8 100644
--- a/openstreetmap/lang/fr/strings.php
+++ b/openstreetmap/lang/fr/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Submit"] = "Envoyer";
diff --git a/openstreetmap/lang/is/strings.php b/openstreetmap/lang/is/strings.php
index d14a77135..464c4531f 100644
--- a/openstreetmap/lang/is/strings.php
+++ b/openstreetmap/lang/is/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return ($n % 10 != 1 || $n % 100 == 11);;
+	return intval($n % 10 != 1 || $n % 100 == 11);
 }}
 ;
 $a->strings["Submit"] = "Senda inn";
diff --git a/openstreetmap/lang/it/strings.php b/openstreetmap/lang/it/strings.php
index f85b520bf..efe652c6e 100644
--- a/openstreetmap/lang/it/strings.php
+++ b/openstreetmap/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Submit"] = "Invia";
diff --git a/openstreetmap/lang/nl/strings.php b/openstreetmap/lang/nl/strings.php
index 6d3e5b23f..2a7255ab0 100644
--- a/openstreetmap/lang/nl/strings.php
+++ b/openstreetmap/lang/nl/strings.php
@@ -3,12 +3,9 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Submit"] = "Opslaan";
 $a->strings["Tile Server URL"] = "URL met kaarttegels";
-$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "";
-$a->strings["Default zoom"] = "";
-$a->strings["The default zoom level. (1:world, 18:highest)"] = "";
 $a->strings["Settings updated."] = "Instellingen opgeslagen";
diff --git a/openstreetmap/lang/pl/strings.php b/openstreetmap/lang/pl/strings.php
index 630cb92c5..97d5a0cb7 100644
--- a/openstreetmap/lang/pl/strings.php
+++ b/openstreetmap/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Submit"] = "Zatwierdź";
diff --git a/openstreetmap/lang/pt-br/strings.php b/openstreetmap/lang/pt-br/strings.php
index ac18fd0db..ced07ab67 100644
--- a/openstreetmap/lang/pt-br/strings.php
+++ b/openstreetmap/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Submit"] = "Enviar";
diff --git a/openstreetmap/lang/ro/strings.php b/openstreetmap/lang/ro/strings.php
index 83700eede..7152ac9a4 100644
--- a/openstreetmap/lang/ro/strings.php
+++ b/openstreetmap/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Submit"] = "Trimite";
diff --git a/pageheader/lang/C/messages.po b/pageheader/lang/C/messages.po
index f8958d2fa..2965e53d6 100644
--- a/pageheader/lang/C/messages.po
+++ b/pageheader/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-11 18:52+0100\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,24 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pageheader.php:53
+#: pageheader.php:36
 msgid "\"pageheader\" Settings"
 msgstr ""
 
-#: pageheader.php:54
+#: pageheader.php:37
 msgid "Message"
 msgstr ""
 
-#: pageheader.php:54
+#: pageheader.php:37
 msgid ""
 "Message to display on every page on this server (or put a pageheader.html "
 "file in your docroot)"
 msgstr ""
 
-#: pageheader.php:55
+#: pageheader.php:38
 msgid "Save Settings"
 msgstr ""
-
-#: pageheader.php:69
-msgid "pageheader Settings saved."
-msgstr ""
diff --git a/pageheader/lang/cs/strings.php b/pageheader/lang/cs/strings.php
index a32e5ed7a..107e27a49 100644
--- a/pageheader/lang/cs/strings.php
+++ b/pageheader/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["\"pageheader\" Settings"] = "Nastavení záhlaví stránky";
diff --git a/pageheader/lang/de/strings.php b/pageheader/lang/de/strings.php
index c0bfeee4c..8364c278b 100644
--- a/pageheader/lang/de/strings.php
+++ b/pageheader/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen";
diff --git a/pageheader/lang/en-gb/strings.php b/pageheader/lang/en-gb/strings.php
index d81a110ff..bd2a18e3b 100644
--- a/pageheader/lang/en-gb/strings.php
+++ b/pageheader/lang/en-gb/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"pageheader\" Settings"] = "Pageheader settings";
diff --git a/pageheader/lang/es/strings.php b/pageheader/lang/es/strings.php
index 254c0f6a7..65efe2ba5 100644
--- a/pageheader/lang/es/strings.php
+++ b/pageheader/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"pageheader\" Settings"] = "Ajustes de \"pageheader\"";
diff --git a/pageheader/lang/fi-fi/strings.php b/pageheader/lang/fi-fi/strings.php
index cef521e2d..48b75df04 100644
--- a/pageheader/lang/fi-fi/strings.php
+++ b/pageheader/lang/fi-fi/strings.php
@@ -2,11 +2,11 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"pageheader\" Settings"] = "\"pageheader\" -asetukset";
 $a->strings["Message"] = "Viesti";
-$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "";
 $a->strings["Save Settings"] = "Tallenna asetukset";
 $a->strings["pageheader Settings saved."] = "pageheader -asetukset tallennettu.";
diff --git a/pageheader/lang/fr/strings.php b/pageheader/lang/fr/strings.php
index 01d90072e..122c833be 100644
--- a/pageheader/lang/fr/strings.php
+++ b/pageheader/lang/fr/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["\"pageheader\" Settings"] = "Paramètres de la page d'en-tête";
diff --git a/pageheader/lang/it/strings.php b/pageheader/lang/it/strings.php
index e81ef80d7..c743cd1d1 100644
--- a/pageheader/lang/it/strings.php
+++ b/pageheader/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"pageheader\" Settings"] = "Impostazioni \"Intestazione pagina\"";
diff --git a/pageheader/lang/nl/strings.php b/pageheader/lang/nl/strings.php
index 3d6e2df75..b0576d9c6 100644
--- a/pageheader/lang/nl/strings.php
+++ b/pageheader/lang/nl/strings.php
@@ -3,11 +3,9 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"pageheader\" Settings"] = "\"pageheader\" instellingen";
-$a->strings["Message"] = "";
-$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "";
 $a->strings["Save Settings"] = "Instellingen opslaan";
 $a->strings["pageheader Settings saved."] = "Pageheader instellingen opgeslagen.";
diff --git a/pageheader/lang/pl/strings.php b/pageheader/lang/pl/strings.php
index db2737b26..7b2838047 100644
--- a/pageheader/lang/pl/strings.php
+++ b/pageheader/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["\"pageheader\" Settings"] = "Ustawienia \"nagłówek strony\"";
diff --git a/pageheader/lang/ro/strings.php b/pageheader/lang/ro/strings.php
index cdcce6166..97c55e439 100644
--- a/pageheader/lang/ro/strings.php
+++ b/pageheader/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["\"pageheader\" Settings"] = "Configurări \"Pageheader\"";
diff --git a/pageheader/lang/ru/strings.php b/pageheader/lang/ru/strings.php
index 39e28e218..a3dfd070d 100644
--- a/pageheader/lang/ru/strings.php
+++ b/pageheader/lang/ru/strings.php
@@ -3,10 +3,9 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
-$a->strings["\"pageheader\" Settings"] = "";
 $a->strings["Message"] = "Сообщение";
 $a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "Сообщение для отображения на каждой странице этого сервера (или поместите файл pageheader.html в корневую папку веб-сервера)";
 $a->strings["Save Settings"] = "Сохранить настройки";
diff --git a/piwik/lang/C/messages.po b/piwik/lang/C/messages.po
index cadacb405..5a078056a 100644
--- a/piwik/lang/C/messages.po
+++ b/piwik/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-19 10:42+0100\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: piwik.php:94
+#: piwik.php:87
 msgid ""
 "This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> "
 "analytics tool."
 msgstr ""
 
-#: piwik.php:97
+#: piwik.php:90
 #, php-format
 msgid ""
 "If you do not want that your visits are logged in this way you <a "
@@ -31,32 +31,28 @@ msgid ""
 "visits of the site</a> (opt-out)."
 msgstr ""
 
-#: piwik.php:104
+#: piwik.php:97
 msgid "Save Settings"
 msgstr ""
 
-#: piwik.php:105
+#: piwik.php:98
 msgid "Matomo (Piwik) Base URL"
 msgstr ""
 
-#: piwik.php:105
+#: piwik.php:98
 msgid ""
 "Absolute path to your Matomo (Piwik) installation. (without protocol (http/"
 "s), with trailing slash)"
 msgstr ""
 
-#: piwik.php:106
+#: piwik.php:99
 msgid "Site ID"
 msgstr ""
 
-#: piwik.php:107
+#: piwik.php:100
 msgid "Show opt-out cookie link?"
 msgstr ""
 
-#: piwik.php:108
+#: piwik.php:101
 msgid "Asynchronous tracking"
 msgstr ""
-
-#: piwik.php:120
-msgid "Settings updated."
-msgstr ""
diff --git a/piwik/lang/cs/strings.php b/piwik/lang/cs/strings.php
index 6c46466dc..d987ce212 100644
--- a/piwik/lang/cs/strings.php
+++ b/piwik/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool."] = "Tato webová stránka je sledována pomocí nástroje pro analýzu <a href='http://www.matomo.org'>Matomo</a>.";
diff --git a/piwik/lang/de/strings.php b/piwik/lang/de/strings.php
index 32e2e6cfd..212ecb1b4 100644
--- a/piwik/lang/de/strings.php
+++ b/piwik/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool."] = "Diese Website benutzt <a href='http://www.matomo.org'>Matomo</a>, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe.";
diff --git a/piwik/lang/en-gb/strings.php b/piwik/lang/en-gb/strings.php
index 667d92186..4d698f94d 100644
--- a/piwik/lang/en-gb/strings.php
+++ b/piwik/lang/en-gb/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool."] = "This website is tracking, using the <a href='http://www.matomo.org'>Matomo</a> analytics tool.";
diff --git a/piwik/lang/es/strings.php b/piwik/lang/es/strings.php
index 96a61a4ab..dcbebfb25 100644
--- a/piwik/lang/es/strings.php
+++ b/piwik/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Esta página es rastreada usando la herramienta analítica <a href='http://www.piwik.org'>Piwik</a>.";
diff --git a/piwik/lang/fi-fi/strings.php b/piwik/lang/fi-fi/strings.php
index 8e5278c3e..27262e20a 100644
--- a/piwik/lang/fi-fi/strings.php
+++ b/piwik/lang/fi-fi/strings.php
@@ -2,15 +2,10 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
-$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "";
-$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "";
 $a->strings["Save Settings"] = "Tallenna asetukset";
-$a->strings["Piwik Base URL"] = "";
-$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "";
-$a->strings["Site ID"] = "";
-$a->strings["Show opt-out cookie link?"] = "";
 $a->strings["Asynchronous tracking"] = "Asynkroninen seuranta";
 $a->strings["Settings updated."] = "Asetukset päivitetty.";
diff --git a/piwik/lang/fr/strings.php b/piwik/lang/fr/strings.php
index a62c77ea1..6e2498381 100644
--- a/piwik/lang/fr/strings.php
+++ b/piwik/lang/fr/strings.php
@@ -2,14 +2,13 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Ce site web utilise <a href='http://www.piwik.org'>Piwik</a> en tant qu'outil d'analyses.";
-$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "";
 $a->strings["Save Settings"] = "Sauvegarder les paramètres";
 $a->strings["Piwik Base URL"] = "URL de base de Piwik";
-$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "";
 $a->strings["Site ID"] = "ID du site";
 $a->strings["Show opt-out cookie link?"] = "Montrer le lien d'opt-out pour les cookies ?";
 $a->strings["Asynchronous tracking"] = "Suivi asynchrone";
diff --git a/piwik/lang/it/strings.php b/piwik/lang/it/strings.php
index e523a69dc..94395d70e 100644
--- a/piwik/lang/it/strings.php
+++ b/piwik/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool."] = "Questo sito è monitorato con lo strumento di analisi <a href='http://www.matomo.org'>Matomo</a>.";
diff --git a/piwik/lang/nl/strings.php b/piwik/lang/nl/strings.php
index c0a7cecc0..3122d040d 100644
--- a/piwik/lang/nl/strings.php
+++ b/piwik/lang/nl/strings.php
@@ -3,15 +3,9 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Deze website word gevolgd door <a href='http://www.piwik.org'>Piwik</a> analytics";
-$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "";
 $a->strings["Save Settings"] = "Instellingen opslaan";
-$a->strings["Piwik Base URL"] = "";
-$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "";
-$a->strings["Site ID"] = "";
-$a->strings["Show opt-out cookie link?"] = "";
-$a->strings["Asynchronous tracking"] = "";
 $a->strings["Settings updated."] = "Instellingen opgeslagen";
diff --git a/piwik/lang/pl/strings.php b/piwik/lang/pl/strings.php
index 0a05fc1ca..b8e918b2b 100644
--- a/piwik/lang/pl/strings.php
+++ b/piwik/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool."] = "Ta strona internetowa jest śledzona za pomocą narzędzia analitycznego <a href='http://www.matomo.org'>Matomo</a>.";
diff --git a/piwik/lang/ro/strings.php b/piwik/lang/ro/strings.php
index 7b3f04b14..0b9f4580d 100644
--- a/piwik/lang/ro/strings.php
+++ b/piwik/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Acest site web este contorizat folosind instrumentul analitic <a href='http://www.piwik.org'>Piwik</a>.";
diff --git a/piwik/lang/zh-cn/strings.php b/piwik/lang/zh-cn/strings.php
index ad99b3649..544703dc3 100644
--- a/piwik/lang/zh-cn/strings.php
+++ b/piwik/lang/zh-cn/strings.php
@@ -2,15 +2,11 @@
 
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
-	return 0;;
+	$n = intval($n);
+	return intval(0);
 }}
 ;
 $a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "此网站用 <a href='http://www.piwik.org'>Piwik</a> 追踪分析工具。";
-$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "";
 $a->strings["Save Settings"] = "保存设置";
-$a->strings["Piwik Base URL"] = "";
-$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "";
-$a->strings["Site ID"] = "";
-$a->strings["Show opt-out cookie link?"] = "";
 $a->strings["Asynchronous tracking"] = "异步追踪";
 $a->strings["Settings updated."] = "设置已更新。";
diff --git a/planets/lang/C/messages.po b/planets/lang/C/messages.po
index f0773cc27..f69141dbb 100644
--- a/planets/lang/C/messages.po
+++ b/planets/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: planets.php:150
+#: planets.php:131 planets.php:135
+msgid "Planets"
+msgstr ""
+
+#: planets.php:139
 msgid "Planets Settings"
 msgstr ""
 
-#: planets.php:152
+#: planets.php:141
 msgid "Enable Planets Addon"
 msgstr ""
 
-#: planets.php:158
-msgid "Submit"
+#: planets.php:147
+msgid "Save Settings"
 msgstr ""
diff --git a/planets/lang/cs/strings.php b/planets/lang/cs/strings.php
index d0b883d2f..c63b3112a 100644
--- a/planets/lang/cs/strings.php
+++ b/planets/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Planets Settings"] = "Nastavení Planets";
diff --git a/planets/lang/de/strings.php b/planets/lang/de/strings.php
index 653d025b9..3104631af 100644
--- a/planets/lang/de/strings.php
+++ b/planets/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Planets Settings"] = "Planeten Einstellungen";
diff --git a/planets/lang/es/strings.php b/planets/lang/es/strings.php
index 2fd5ed903..bf83956b4 100644
--- a/planets/lang/es/strings.php
+++ b/planets/lang/es/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Planets Settings"] = "Ajustes de Planets";
-$a->strings["Enable Planets Addon"] = "Habilite el addon Planets";
+$a->strings["Enable Planets Addon"] = "Habilite eladdonPlanets";
 $a->strings["Submit"] = "Enviar";
diff --git a/planets/lang/fi-fi/strings.php b/planets/lang/fi-fi/strings.php
index c33c09ee7..572283f76 100644
--- a/planets/lang/fi-fi/strings.php
+++ b/planets/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Planets Settings"] = "Planets -asetukset";
diff --git a/planets/lang/it/strings.php b/planets/lang/it/strings.php
index 1b5aaa91b..871365282 100644
--- a/planets/lang/it/strings.php
+++ b/planets/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Planets Settings"] = "Impostazioni \"Pianeti\"";
diff --git a/planets/lang/nl/strings.php b/planets/lang/nl/strings.php
index 0c681407a..7651f195e 100644
--- a/planets/lang/nl/strings.php
+++ b/planets/lang/nl/strings.php
@@ -3,9 +3,8 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Planets Settings"] = "Planets instellingen";
 $a->strings["Enable Planets Addon"] = "Planets Addon inschakelen";
-$a->strings["Submit"] = "";
diff --git a/planets/lang/pl/strings.php b/planets/lang/pl/strings.php
index 61b08753b..e9d7c3e60 100644
--- a/planets/lang/pl/strings.php
+++ b/planets/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Planets Settings"] = "Ustawienia Planet";
diff --git a/planets/lang/ro/strings.php b/planets/lang/ro/strings.php
index 19a2e3dee..cf237857e 100644
--- a/planets/lang/ro/strings.php
+++ b/planets/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Planets Settings"] = "Configurări Planets";
diff --git a/public_server/lang/C/messages.po b/public_server/lang/C/messages.po
index 045ddc393..5994deb55 100644
--- a/public_server/lang/C/messages.po
+++ b/public_server/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,20 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: public_server.php:62
+#: public_server.php:64
 msgid "Administrator"
 msgstr ""
 
-#: public_server.php:126
+#: public_server.php:118
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr ""
 
-#: public_server.php:127
+#: public_server.php:119
 msgid "Your Friendica account is about to expire."
 msgstr ""
 
-#: public_server.php:128
+#: public_server.php:120
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -38,3 +38,11 @@ msgid ""
 "Your account on %2$s will expire in less than five days. You may keep your "
 "account by logging in at least once every 30 days"
 msgstr ""
+
+#: public_server.php:158
+msgid "Save Settings"
+msgstr ""
+
+#: public_server.php:160
+msgid "Set any of these options to 0 to deactivate it."
+msgstr ""
diff --git a/public_server/lang/cs/strings.php b/public_server/lang/cs/strings.php
index 0d6c5118e..aab14c344 100644
--- a/public_server/lang/cs/strings.php
+++ b/public_server/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Administrator"] = "Administrátor";
diff --git a/public_server/lang/de/strings.php b/public_server/lang/de/strings.php
index 09b3f2a1b..f2fb0fd04 100644
--- a/public_server/lang/de/strings.php
+++ b/public_server/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Administrator"] = "Administrator";
diff --git a/public_server/lang/es/strings.php b/public_server/lang/es/strings.php
index fa1db55a4..dc5610736 100644
--- a/public_server/lang/es/strings.php
+++ b/public_server/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Administrator"] = "Administrador";
diff --git a/public_server/lang/fi-fi/strings.php b/public_server/lang/fi-fi/strings.php
index 2d81c8839..9d26813f5 100644
--- a/public_server/lang/fi-fi/strings.php
+++ b/public_server/lang/fi-fi/strings.php
@@ -3,10 +3,9 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Administrator"] = "Ylläpitäjä";
 $a->strings["Your account on %s will expire in a few days."] = "%s -tilisi vanhenee muutaman päivän kuluttua.";
 $a->strings["Your Friendica account is about to expire."] = "Friendica-tilisi umpeutuu kohta.";
-$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "";
diff --git a/public_server/lang/it/strings.php b/public_server/lang/it/strings.php
index 9fa926d6b..a20c43892 100644
--- a/public_server/lang/it/strings.php
+++ b/public_server/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Administrator"] = "Amministratore";
diff --git a/public_server/lang/nl/strings.php b/public_server/lang/nl/strings.php
index e7ec47428..acfd9a186 100644
--- a/public_server/lang/nl/strings.php
+++ b/public_server/lang/nl/strings.php
@@ -3,10 +3,8 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Administrator"] = "Beheerder";
 $a->strings["Your account on %s will expire in a few days."] = "Uw account op %s zal over enkele dagen vervallen";
-$a->strings["Your Friendica account is about to expire."] = "";
-$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "";
diff --git a/public_server/lang/pl/strings.php b/public_server/lang/pl/strings.php
index 489f356fa..86f60efe9 100644
--- a/public_server/lang/pl/strings.php
+++ b/public_server/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Administrator"] = "Administrator";
diff --git a/public_server/lang/pt-br/strings.php b/public_server/lang/pt-br/strings.php
index 86bd24ad5..a51db42bd 100644
--- a/public_server/lang/pt-br/strings.php
+++ b/public_server/lang/pt-br/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
-$a->strings["Administrator"] = "";
 $a->strings["Your account on %s will expire in a few days."] = "Sua conta do %s vai expirar em alguns dias.";
 $a->strings["Your Friendica account is about to expire."] = "Sua conta no Friendica está prestes a expirar.";
 $a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Olá, %1\$s,\n\nSua conta no %2\$s vai expirar em menos de cinco dias. Para manter sua conta, lembre-se de entrar pelo menos uma vez a cada 30 dias.";
diff --git a/public_server/lang/ro/strings.php b/public_server/lang/ro/strings.php
index 3ab2356a3..d90425c87 100644
--- a/public_server/lang/ro/strings.php
+++ b/public_server/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Administrator"] = "Administrator";
diff --git a/public_server/lang/zh-cn/strings.php b/public_server/lang/zh-cn/strings.php
index f50a58344..62b2bd310 100644
--- a/public_server/lang/zh-cn/strings.php
+++ b/public_server/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Administrator"] = "管理员";
diff --git a/pumpio/lang/C/messages.po b/pumpio/lang/C/messages.po
index a35f0410a..1fe269e99 100644
--- a/pumpio/lang/C/messages.po
+++ b/pumpio/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,84 +17,76 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pumpio.php:38
+#: pumpio.php:54
 msgid "Permission denied."
 msgstr ""
 
-#: pumpio.php:124
+#: pumpio.php:149
 #, php-format
 msgid "Unable to register the client at the pump.io server '%s'."
 msgstr ""
 
-#: pumpio.php:164
+#: pumpio.php:189
 msgid "You are now authenticated to pumpio."
 msgstr ""
 
-#: pumpio.php:165
+#: pumpio.php:190
 msgid "return to the connector page"
 msgstr ""
 
-#: pumpio.php:183
+#: pumpio.php:210
 msgid "Post to pumpio"
 msgstr ""
 
-#: pumpio.php:221 pumpio.php:225
+#: pumpio.php:251 pumpio.php:255
 msgid "Pump.io Import/Export/Mirror"
 msgstr ""
 
-#: pumpio.php:229
+#: pumpio.php:259
 msgid "pump.io username (without the servername)"
 msgstr ""
 
-#: pumpio.php:234
+#: pumpio.php:264
 msgid "pump.io servername (without \"http://\" or \"https://\" )"
 msgstr ""
 
-#: pumpio.php:246
+#: pumpio.php:275
 msgid "Authenticate your pump.io connection"
 msgstr ""
 
-#: pumpio.php:250
+#: pumpio.php:279
 msgid "Import the remote timeline"
 msgstr ""
 
-#: pumpio.php:255
+#: pumpio.php:284
 msgid "Enable pump.io Post Addon"
 msgstr ""
 
-#: pumpio.php:260
+#: pumpio.php:289
 msgid "Post to pump.io by default"
 msgstr ""
 
-#: pumpio.php:265
+#: pumpio.php:294
 msgid "Should posts be public?"
 msgstr ""
 
-#: pumpio.php:270
+#: pumpio.php:299
 msgid "Mirror all public posts"
 msgstr ""
 
-#: pumpio.php:275
+#: pumpio.php:304
 msgid "Check to delete this preset"
 msgstr ""
 
-#: pumpio.php:285
+#: pumpio.php:314
 msgid "Save Settings"
 msgstr ""
 
-#: pumpio.php:515
-msgid "Pump.io post failed. Queued for retry."
-msgstr ""
-
-#: pumpio.php:587
-msgid "Pump.io like failed. Queued for retry."
-msgstr ""
-
-#: pumpio.php:875
+#: pumpio.php:981
 msgid "status"
 msgstr ""
 
-#: pumpio.php:879
+#: pumpio.php:985
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
diff --git a/pumpio/lang/cs/strings.php b/pumpio/lang/cs/strings.php
index 1462bf5fb..ee1432411 100644
--- a/pumpio/lang/cs/strings.php
+++ b/pumpio/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Permission denied."] = "Přístup odmítnut.";
diff --git a/pumpio/lang/de/strings.php b/pumpio/lang/de/strings.php
index 4f2c8c88a..15da31169 100644
--- a/pumpio/lang/de/strings.php
+++ b/pumpio/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Zugriff verweigert.";
diff --git a/pumpio/lang/es/strings.php b/pumpio/lang/es/strings.php
index df9630b22..b251a779e 100644
--- a/pumpio/lang/es/strings.php
+++ b/pumpio/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Permiso denegado.";
diff --git a/pumpio/lang/fi-fi/strings.php b/pumpio/lang/fi-fi/strings.php
index cd409e190..baee12a8b 100644
--- a/pumpio/lang/fi-fi/strings.php
+++ b/pumpio/lang/fi-fi/strings.php
@@ -3,26 +3,18 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Lupa kielletty.";
-$a->strings["Unable to register the client at the pump.io server '%s'."] = "";
-$a->strings["You are now authenticated to pumpio."] = "";
-$a->strings["return to the connector page"] = "";
 $a->strings["Post to pumpio"] = "Lähetä pump.ioon";
-$a->strings["Pump.io Import/Export/Mirror"] = "";
 $a->strings["pump.io username (without the servername)"] = "pump.io käyttäjätunnus (ilman palvelinnimeä)";
 $a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "pump.io palvelinnimi (ilman \"http://\" tai \"https://\" )";
-$a->strings["Authenticate your pump.io connection"] = "";
 $a->strings["Import the remote timeline"] = "Tuo etäaikajana";
 $a->strings["Enable pump.io Post Addon"] = "Ota pump.io -viestilisäosa käyttöön";
 $a->strings["Post to pump.io by default"] = "Lähetä pump.iohon oletuksena";
-$a->strings["Should posts be public?"] = "";
 $a->strings["Mirror all public posts"] = "Peilaa kaikki julkiset julkaisut";
-$a->strings["Check to delete this preset"] = "";
 $a->strings["Save Settings"] = "Tallenna asetukset";
 $a->strings["Pump.io post failed. Queued for retry."] = "Pump.io -julkaisu epäonnistui. Jonossa uudelleenyritykseen.";
 $a->strings["Pump.io like failed. Queued for retry."] = "Pump.io -tykkäys epäonnistui. Jonossa uudelleenyritykseen.";
 $a->strings["status"] = "tila";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "";
diff --git a/pumpio/lang/fr/strings.php b/pumpio/lang/fr/strings.php
index 3e69c2728..0540808ce 100644
--- a/pumpio/lang/fr/strings.php
+++ b/pumpio/lang/fr/strings.php
@@ -2,26 +2,17 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Permission denied."] = "Permission refusée.";
-$a->strings["Unable to register the client at the pump.io server '%s'."] = "";
 $a->strings["You are now authenticated to pumpio."] = "Vous êtes maintenant authentifié sur pump.io.";
 $a->strings["return to the connector page"] = "Retourner à la page du connecteur";
 $a->strings["Post to pumpio"] = "Publier sur pump.io";
-$a->strings["Pump.io Import/Export/Mirror"] = "";
 $a->strings["pump.io username (without the servername)"] = "Nom d'utilisateur pump.io (sans le nom du serveur)";
-$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "";
-$a->strings["Authenticate your pump.io connection"] = "";
 $a->strings["Import the remote timeline"] = "Importer la timeline distante";
-$a->strings["Enable pump.io Post Addon"] = "";
 $a->strings["Post to pump.io by default"] = "Publier sur pump.io par défaut";
 $a->strings["Should posts be public?"] = "Les messages devraient être publiques ?";
-$a->strings["Mirror all public posts"] = "";
-$a->strings["Check to delete this preset"] = "";
 $a->strings["Save Settings"] = "Sauvegarder les paramètres";
-$a->strings["Pump.io post failed. Queued for retry."] = "";
-$a->strings["Pump.io like failed. Queued for retry."] = "";
 $a->strings["status"] = "statut";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "";
diff --git a/pumpio/lang/it/strings.php b/pumpio/lang/it/strings.php
index 86b7ed292..1948862be 100644
--- a/pumpio/lang/it/strings.php
+++ b/pumpio/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Permesso negato.";
diff --git a/pumpio/lang/nl/strings.php b/pumpio/lang/nl/strings.php
index 61297c4f1..1e50700b3 100644
--- a/pumpio/lang/nl/strings.php
+++ b/pumpio/lang/nl/strings.php
@@ -3,26 +3,12 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Toegang geweigerd.";
 $a->strings["Unable to register the client at the pump.io server '%s'."] = "Niet mogelijk om uw client te registreren op pump.io server '%s'";
-$a->strings["You are now authenticated to pumpio."] = "";
-$a->strings["return to the connector page"] = "";
-$a->strings["Post to pumpio"] = "";
 $a->strings["Pump.io Import/Export/Mirror"] = "Pump.io Import/Exporteren/Spiegelen";
-$a->strings["pump.io username (without the servername)"] = "";
-$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "";
-$a->strings["Authenticate your pump.io connection"] = "";
-$a->strings["Import the remote timeline"] = "";
 $a->strings["Enable pump.io Post Addon"] = "Pump.io Post Addon inschakelen";
 $a->strings["Post to pump.io by default"] = "Plaatsen op pump.io als standaard instellen ";
-$a->strings["Should posts be public?"] = "";
-$a->strings["Mirror all public posts"] = "";
-$a->strings["Check to delete this preset"] = "";
 $a->strings["Save Settings"] = "Instellingen opslaan";
-$a->strings["Pump.io post failed. Queued for retry."] = "";
-$a->strings["Pump.io like failed. Queued for retry."] = "";
-$a->strings["status"] = "";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "";
diff --git a/pumpio/lang/pl/strings.php b/pumpio/lang/pl/strings.php
index a7868f062..0cb696d27 100644
--- a/pumpio/lang/pl/strings.php
+++ b/pumpio/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Permission denied."] = "Odmowa dostępu.";
diff --git a/pumpio/lang/pt-br/strings.php b/pumpio/lang/pt-br/strings.php
index e93516b46..b9ab2d764 100644
--- a/pumpio/lang/pt-br/strings.php
+++ b/pumpio/lang/pt-br/strings.php
@@ -2,26 +2,19 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Permission denied."] = "Permissão negada.";
-$a->strings["Unable to register the client at the pump.io server '%s'."] = "";
 $a->strings["You are now authenticated to pumpio."] = "Você se autenticou no Pump.io.";
 $a->strings["return to the connector page"] = "voltar à página de conectores";
 $a->strings["Post to pumpio"] = "Publicar no Pump.io";
-$a->strings["Pump.io Import/Export/Mirror"] = "";
 $a->strings["pump.io username (without the servername)"] = "Nome de usuário no pump.io (sem o nome do servidor)";
-$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "";
-$a->strings["Authenticate your pump.io connection"] = "";
 $a->strings["Import the remote timeline"] = "Importar a linha do tempo remota";
 $a->strings["Enable pump.io Post Addon"] = "Habilitar plug-in para publicar no Pump.io";
 $a->strings["Post to pump.io by default"] = "Publicar no Pump.io por padrão";
-$a->strings["Should posts be public?"] = "";
-$a->strings["Mirror all public posts"] = "";
-$a->strings["Check to delete this preset"] = "";
 $a->strings["Save Settings"] = "Salvar Configurações";
 $a->strings["Pump.io post failed. Queued for retry."] = "Falha ao publicar no Pump.io. Na fila para tentar novamente.";
 $a->strings["Pump.io like failed. Queued for retry."] = "Falha ao curtir no Pump.io. Na fila para tentar novamente.";
-$a->strings["status"] = "";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s curtiu o %3\$s de %2\$s";
diff --git a/pumpio/lang/ro/strings.php b/pumpio/lang/ro/strings.php
index b0ee9a25c..22e4b882f 100644
--- a/pumpio/lang/ro/strings.php
+++ b/pumpio/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Permission denied."] = "Permisiune refuzată.";
diff --git a/qcomment/lang/C/messages.po b/qcomment/lang/C/messages.po
index a55cd9eec..a76eea1f9 100644
--- a/qcomment/lang/C/messages.po
+++ b/qcomment/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,36 +17,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: qcomment.php:51
+#: qcomment.php:42
 msgid ":-)"
 msgstr ""
 
-#: qcomment.php:51
+#: qcomment.php:42
 msgid ":-("
 msgstr ""
 
-#: qcomment.php:51
+#: qcomment.php:42
 msgid "lol"
 msgstr ""
 
-#: qcomment.php:54
+#: qcomment.php:47
 msgid "Quick Comment Settings"
 msgstr ""
 
-#: qcomment.php:56
+#: qcomment.php:48
 msgid ""
 "Quick comments are found near comment boxes, sometimes hidden. Click them to "
 "provide simple replies."
 msgstr ""
 
-#: qcomment.php:57
+#: qcomment.php:49
+msgid "Save Settings"
+msgstr ""
+
+#: qcomment.php:50
 msgid "Enter quick comments, one per line"
 msgstr ""
-
-#: qcomment.php:61
-msgid "Submit"
-msgstr ""
-
-#: qcomment.php:75
-msgid "Quick Comment settings saved."
-msgstr ""
diff --git a/qcomment/lang/cs/strings.php b/qcomment/lang/cs/strings.php
index b37a8d2b8..ffc3ac4c9 100644
--- a/qcomment/lang/cs/strings.php
+++ b/qcomment/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings[":-)"] = ":-)";
diff --git a/qcomment/lang/de/strings.php b/qcomment/lang/de/strings.php
index 09356851c..3fa229cf3 100644
--- a/qcomment/lang/de/strings.php
+++ b/qcomment/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings[":-)"] = ":-)";
diff --git a/qcomment/lang/es/strings.php b/qcomment/lang/es/strings.php
index ce1e3bf19..71df6bcc4 100644
--- a/qcomment/lang/es/strings.php
+++ b/qcomment/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings[":-)"] = ":-)";
diff --git a/qcomment/lang/fi-fi/strings.php b/qcomment/lang/fi-fi/strings.php
index 99c218b0f..c0565acfa 100644
--- a/qcomment/lang/fi-fi/strings.php
+++ b/qcomment/lang/fi-fi/strings.php
@@ -2,14 +2,14 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings[":-)"] = ":-)";
 $a->strings[":-("] = ":-(";
 $a->strings["lol"] = "lol";
 $a->strings["Quick Comment Settings"] = "Quick Comment -asetukset";
-$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "";
 $a->strings["Enter quick comments, one per line"] = "Syötä kommentit, yksi riviä kohden:";
 $a->strings["Submit"] = "Lähetä";
 $a->strings["Quick Comment settings saved."] = "Quick Comment -asetukset tallennettu.";
diff --git a/qcomment/lang/it/strings.php b/qcomment/lang/it/strings.php
index 059cb0984..07843d44d 100644
--- a/qcomment/lang/it/strings.php
+++ b/qcomment/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings[":-)"] = ":-)";
diff --git a/qcomment/lang/nl/strings.php b/qcomment/lang/nl/strings.php
index 647aae18d..4582a0823 100644
--- a/qcomment/lang/nl/strings.php
+++ b/qcomment/lang/nl/strings.php
@@ -3,14 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings[":-)"] = ":-)";
 $a->strings[":-("] = ":-(";
-$a->strings["lol"] = "";
 $a->strings["Quick Comment Settings"] = "Snelle reactie instellingen";
-$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "";
-$a->strings["Enter quick comments, one per line"] = "";
-$a->strings["Submit"] = "";
 $a->strings["Quick Comment settings saved."] = "Snelle Reactie instellingen opgeslagen";
diff --git a/qcomment/lang/pl/strings.php b/qcomment/lang/pl/strings.php
index 20742b167..377e7df67 100644
--- a/qcomment/lang/pl/strings.php
+++ b/qcomment/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings[":-)"] = ":-)";
@@ -10,6 +11,5 @@ $a->strings[":-("] = ":-(";
 $a->strings["lol"] = "lol";
 $a->strings["Quick Comment Settings"] = "Ustawienia szybkiego komentowania";
 $a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Szybkie komentarze znajdują się w pobliżu pól komentarza, czasami są ukryte. Kliknij je, aby zapewnić proste odpowiedzi.";
-$a->strings["Enter quick comments, one per line"] = "";
 $a->strings["Submit"] = "Wyślij";
 $a->strings["Quick Comment settings saved."] = "Zapisano szybkie ustawienia komentarzy.";
diff --git a/qcomment/lang/pt-br/strings.php b/qcomment/lang/pt-br/strings.php
index 87f7a76e1..72bf63b0c 100644
--- a/qcomment/lang/pt-br/strings.php
+++ b/qcomment/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings[":-)"] = ":-)";
diff --git a/qcomment/lang/ro/strings.php b/qcomment/lang/ro/strings.php
index 65b9a5d43..1ad8018fc 100644
--- a/qcomment/lang/ro/strings.php
+++ b/qcomment/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings[":-)"] = ":-)";
diff --git a/qcomment/lang/ru/strings.php b/qcomment/lang/ru/strings.php
index 5bc45e559..262250fad 100644
--- a/qcomment/lang/ru/strings.php
+++ b/qcomment/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings[":-)"] = ":-)";
diff --git a/randplace/lang/C/messages.po b/randplace/lang/C/messages.po
index 3d2ed587b..419123e4b 100644
--- a/randplace/lang/C/messages.po
+++ b/randplace/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: randplace.php:169
+#: randplace.php:166
 msgid "Randplace Settings"
 msgstr ""
 
-#: randplace.php:171
+#: randplace.php:168
 msgid "Enable Randplace Addon"
 msgstr ""
 
-#: randplace.php:177
-msgid "Submit"
+#: randplace.php:174
+msgid "Save Settings"
 msgstr ""
diff --git a/randplace/lang/cs/strings.php b/randplace/lang/cs/strings.php
index 1095d55ff..cc9768b3b 100644
--- a/randplace/lang/cs/strings.php
+++ b/randplace/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Randplace Settings"] = "Randplace Nastavení";
diff --git a/randplace/lang/de/strings.php b/randplace/lang/de/strings.php
index 5a5b69f32..63ca2ef6b 100644
--- a/randplace/lang/de/strings.php
+++ b/randplace/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Randplace Settings"] = "Randplace-Einstellungen";
diff --git a/randplace/lang/es/strings.php b/randplace/lang/es/strings.php
index b196c6b89..bca4bca5c 100644
--- a/randplace/lang/es/strings.php
+++ b/randplace/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Randplace Settings"] = "Ajustes de Randplace";
diff --git a/randplace/lang/fi-fi/strings.php b/randplace/lang/fi-fi/strings.php
index 188f99159..6f96f0d90 100644
--- a/randplace/lang/fi-fi/strings.php
+++ b/randplace/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Randplace Settings"] = "Randplace -asetukset";
diff --git a/randplace/lang/it/strings.php b/randplace/lang/it/strings.php
index 1a26d7770..1a38cd291 100644
--- a/randplace/lang/it/strings.php
+++ b/randplace/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Randplace Settings"] = "Impostazioni \"Posizione casuale\"";
diff --git a/randplace/lang/nl/strings.php b/randplace/lang/nl/strings.php
index 392e25b8b..f0b1e68db 100644
--- a/randplace/lang/nl/strings.php
+++ b/randplace/lang/nl/strings.php
@@ -3,9 +3,8 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Randplace Settings"] = "Randplace instellingen";
 $a->strings["Enable Randplace Addon"] = "Randplace Addon inschakelen";
-$a->strings["Submit"] = "";
diff --git a/randplace/lang/pl/strings.php b/randplace/lang/pl/strings.php
index 582d0a10b..fb3ae8090 100644
--- a/randplace/lang/pl/strings.php
+++ b/randplace/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Randplace Settings"] = "Ustawienia Randplace";
diff --git a/randplace/lang/ro/strings.php b/randplace/lang/ro/strings.php
index 81607079b..2ee58b6b7 100644
--- a/randplace/lang/ro/strings.php
+++ b/randplace/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Randplace Settings"] = "Configurări Randplace";
diff --git a/randplace/lang/zh-cn/strings.php b/randplace/lang/zh-cn/strings.php
index 1a756fc49..0ba637f8d 100644
--- a/randplace/lang/zh-cn/strings.php
+++ b/randplace/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Randplace Settings"] = "随机站点设置";
diff --git a/remote_permissions/lang/C/messages.po b/remote_permissions/lang/C/messages.po
index cfb874d5d..093751a59 100644
--- a/remote_permissions/lang/C/messages.po
+++ b/remote_permissions/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,22 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: remote_permissions.php:45
+#: remote_permissions.php:44
 msgid "Remote Permissions Settings"
 msgstr ""
 
-#: remote_permissions.php:46
+#: remote_permissions.php:45
 msgid ""
 "Allow recipients of your private posts to see the other recipients of the "
 "posts"
 msgstr ""
 
-#: remote_permissions.php:48 remote_permissions.php:196
-msgid "Submit"
-msgstr ""
-
-#: remote_permissions.php:58
-msgid "Remote Permissions settings updated."
+#: remote_permissions.php:47 remote_permissions.php:196
+msgid "Save Settings"
 msgstr ""
 
 #: remote_permissions.php:124
@@ -62,7 +58,3 @@ msgstr ""
 #: remote_permissions.php:198
 msgid "Each user chooses whether his/her posts show the post recipients"
 msgstr ""
-
-#: remote_permissions.php:205
-msgid "Settings updated."
-msgstr ""
diff --git a/remote_permissions/lang/cs/strings.php b/remote_permissions/lang/cs/strings.php
index 5ca17b282..978873daa 100644
--- a/remote_permissions/lang/cs/strings.php
+++ b/remote_permissions/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Remote Permissions Settings"] = "Nastavení Vzdálených oprávnění";
diff --git a/remote_permissions/lang/de/strings.php b/remote_permissions/lang/de/strings.php
index 141dd6ce6..6b054e9fe 100644
--- a/remote_permissions/lang/de/strings.php
+++ b/remote_permissions/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Remote Permissions Settings"] = "Entfernte Privatsphäreneinstellungen";
diff --git a/remote_permissions/lang/es/strings.php b/remote_permissions/lang/es/strings.php
index 6a3d42f0c..1168b1077 100644
--- a/remote_permissions/lang/es/strings.php
+++ b/remote_permissions/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Remote Permissions Settings"] = "Ajustes de Permisos Remotos";
diff --git a/remote_permissions/lang/fi-fi/strings.php b/remote_permissions/lang/fi-fi/strings.php
index 05f18162b..1bafb7739 100644
--- a/remote_permissions/lang/fi-fi/strings.php
+++ b/remote_permissions/lang/fi-fi/strings.php
@@ -2,18 +2,12 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Remote Permissions Settings"] = "Remote Permissions -asetukset";
-$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
 $a->strings["Submit"] = "Lähetä";
 $a->strings["Remote Permissions settings updated."] = "Remote Pemissions -asetukset päivitetty.";
 $a->strings["Visible to:"] = "Näkyvyys:";
-$a->strings["Visible to"] = "";
-$a->strings["may only be a partial list"] = "";
-$a->strings["Global"] = "";
-$a->strings["The posts of every user on this server show the post recipients"] = "";
-$a->strings["Individual"] = "";
-$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
 $a->strings["Settings updated."] = "Asetukset päivitetty.";
diff --git a/remote_permissions/lang/it/strings.php b/remote_permissions/lang/it/strings.php
index a872e7797..a7f64c4ac 100644
--- a/remote_permissions/lang/it/strings.php
+++ b/remote_permissions/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Remote Permissions Settings"] = "Impostazioni Permissi Remoti";
diff --git a/remote_permissions/lang/nl/strings.php b/remote_permissions/lang/nl/strings.php
index cb29d66e7..2cb76c0d0 100644
--- a/remote_permissions/lang/nl/strings.php
+++ b/remote_permissions/lang/nl/strings.php
@@ -3,18 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Remote Permissions Settings"] = "Instellingen voor toegang op afstand";
 $a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Ontvangers van private berichten toestaan andere ontvangers te bekijken";
-$a->strings["Submit"] = "";
 $a->strings["Remote Permissions settings updated."] = "Toegang op afstand instellingen opgeslagen";
-$a->strings["Visible to:"] = "";
-$a->strings["Visible to"] = "";
-$a->strings["may only be a partial list"] = "";
-$a->strings["Global"] = "";
-$a->strings["The posts of every user on this server show the post recipients"] = "";
-$a->strings["Individual"] = "";
-$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
 $a->strings["Settings updated."] = "Instellingen opgeslagen";
diff --git a/remote_permissions/lang/pl/strings.php b/remote_permissions/lang/pl/strings.php
index 7af64153f..cd18169ed 100644
--- a/remote_permissions/lang/pl/strings.php
+++ b/remote_permissions/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Remote Permissions Settings"] = "Ustawienia uprawnień zdalnych";
diff --git a/remote_permissions/lang/ro/strings.php b/remote_permissions/lang/ro/strings.php
index 9a68662a6..bb5ac0e42 100644
--- a/remote_permissions/lang/ro/strings.php
+++ b/remote_permissions/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Remote Permissions Settings"] = "Configurări Permisiuni la Distanță";
diff --git a/rendertime/lang/C/messages.po b/rendertime/lang/C/messages.po
index ed61f81f7..c96c596f5 100644
--- a/rendertime/lang/C/messages.po
+++ b/rendertime/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,9 +17,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: rendertime.php:29
+#: rendertime.php:36
 #, php-format
 msgid ""
-"Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, "
-"Other: %s, Total: %s"
+"Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: "
+"%s, Total: %s"
+msgstr ""
+
+#: rendertime.php:53
+#, php-format
+msgid "Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s"
 msgstr ""
diff --git a/rendertime/lang/cs/strings.php b/rendertime/lang/cs/strings.php
index 151316c1b..9b45e4399 100644
--- a/rendertime/lang/cs/strings.php
+++ b/rendertime/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Výkonnost: Databáze: %s, Síť: %s, Rendering: %s, Parser: %s, I/O: %s, Ostatní: %s, Celkem: %s";
diff --git a/rendertime/lang/de/strings.php b/rendertime/lang/de/strings.php
index f591a702a..68c134203 100644
--- a/rendertime/lang/de/strings.php
+++ b/rendertime/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Performance: Datenbank: %s, Netzwerk: %s, Rendering: %s, Parser: %s, I/O: %s, Anderes: %s, Gesamt: %s";
diff --git a/rendertime/lang/es/strings.php b/rendertime/lang/es/strings.php
index 1cd57a0b0..0efb7ba9e 100644
--- a/rendertime/lang/es/strings.php
+++ b/rendertime/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Cumplimiento: Base de datos: %s, Red: %s, Renderizado: %s, Analizador: %s, I/O: %s, Otro: %s, Total: %s";
diff --git a/rendertime/lang/fi-fi/strings.php b/rendertime/lang/fi-fi/strings.php
index 47c2a91b5..b63941582 100644
--- a/rendertime/lang/fi-fi/strings.php
+++ b/rendertime/lang/fi-fi/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
-$a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "";
diff --git a/rendertime/lang/fr/strings.php b/rendertime/lang/fr/strings.php
index b806c8f3a..f8ecf19ce 100644
--- a/rendertime/lang/fr/strings.php
+++ b/rendertime/lang/fr/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Performances: Base de données : %s, Réseau : %s, Rendu : %s, Parser : %s, Entrées/sorties : %s, Autre : %s, Total : %s";
diff --git a/rendertime/lang/it/strings.php b/rendertime/lang/it/strings.php
index ad0c22d4d..1b1987ec9 100644
--- a/rendertime/lang/it/strings.php
+++ b/rendertime/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s";
diff --git a/rendertime/lang/nl/strings.php b/rendertime/lang/nl/strings.php
index 55e9f35f0..36200568d 100644
--- a/rendertime/lang/nl/strings.php
+++ b/rendertime/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Prestaties: Database: %s, Netwerk: %s, Weergave: %s, Verwerken: %s, Input/Output: %s, Andere: %s, Totaal: %s";
diff --git a/rendertime/lang/pl/strings.php b/rendertime/lang/pl/strings.php
index fed1242e1..4f96e4631 100644
--- a/rendertime/lang/pl/strings.php
+++ b/rendertime/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Wydajność: Baza danych: %s, Sieć: %s, Renderowanie: %s, Analizator składni: %s, I/O: %s, Inne: %s, Razem: %s";
diff --git a/rendertime/lang/ro/strings.php b/rendertime/lang/ro/strings.php
index 2d3fd76a0..6088e92a4 100644
--- a/rendertime/lang/ro/strings.php
+++ b/rendertime/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Performantă: Baza de Date: %s, Rețea: %s, Procesare: %s, Analizator: %s, I/O: %s Altele: %s, Total: %s";
diff --git a/rendertime/lang/zh-cn/strings.php b/rendertime/lang/zh-cn/strings.php
index 639560cb8..2b47f701b 100644
--- a/rendertime/lang/zh-cn/strings.php
+++ b/rendertime/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "性能：数据库：%s ，网络：%s ，渲染：%s ，分析器：%s ，I/O：%s ，其他：%s ，总计：%s";
diff --git a/securemail/lang/C/messages.po b/securemail/lang/C/messages.po
index e61f2879b..7cb81e20f 100644
--- a/securemail/lang/C/messages.po
+++ b/securemail/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-11 21:14+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,38 +17,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: securemail.php:53
+#: securemail.php:51
 msgid "\"Secure Mail\" Settings"
 msgstr ""
 
-#: securemail.php:54
+#: securemail.php:52
 msgid "Save Settings"
 msgstr ""
 
-#: securemail.php:55 securemail.php:76
+#: securemail.php:53 securemail.php:80
 msgid "Save and send test"
 msgstr ""
 
-#: securemail.php:56
+#: securemail.php:54
 msgid "Enable Secure Mail"
 msgstr ""
 
-#: securemail.php:57
+#: securemail.php:55
 msgid "Public key"
 msgstr ""
 
-#: securemail.php:57
+#: securemail.php:55
 msgid "Your public PGP key, ascii armored format"
 msgstr ""
 
-#: securemail.php:74
-msgid "Secure Mail Settings saved."
-msgstr ""
-
-#: securemail.php:111
+#: securemail.php:88
 msgid "Test email sent"
 msgstr ""
 
-#: securemail.php:113
+#: securemail.php:90
 msgid "There was an error sending the test email"
 msgstr ""
diff --git a/securemail/lang/cs/strings.php b/securemail/lang/cs/strings.php
index 36d7313d3..992c83215 100644
--- a/securemail/lang/cs/strings.php
+++ b/securemail/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["\"Secure Mail\" Settings"] = "Nastavení \"Secure Mail\"";
diff --git a/securemail/lang/de/strings.php b/securemail/lang/de/strings.php
index 65767eff1..0a315d481 100644
--- a/securemail/lang/de/strings.php
+++ b/securemail/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Secure Mail\" Settings"] = "\"Secure Mail\" Einstellungen";
diff --git a/securemail/lang/et/strings.php b/securemail/lang/et/strings.php
index d2547c40f..964897cd2 100644
--- a/securemail/lang/et/strings.php
+++ b/securemail/lang/et/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_et")) {
 function string_plural_select_et($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Secure Mail\" Settings"] = "\"Turvaline Meil\" sätted";
@@ -11,7 +11,6 @@ $a->strings["Save Settings"] = "Salvesta sätted";
 $a->strings["Save and send test"] = "Salvesta ja saada testmeil";
 $a->strings["Enable Secure Mail"] = "Aktiveeri Turvaline meil";
 $a->strings["Public key"] = "Avalik võti";
-$a->strings["Your public PGP key, ascii armored format"] = "";
 $a->strings["Secure Mail Settings saved."] = "Turvalise Meili sätted salvestatud.";
 $a->strings["Test email sent"] = "Testmeil saadetud";
 $a->strings["There was an error sending the test email"] = "Testmeili saatmisel ilmnes viga";
diff --git a/securemail/lang/fi-fi/strings.php b/securemail/lang/fi-fi/strings.php
index 182cb173b..d7e3e4fb4 100644
--- a/securemail/lang/fi-fi/strings.php
+++ b/securemail/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Secure Mail\" Settings"] = "Secure Mail -asetukset";
@@ -10,7 +11,6 @@ $a->strings["Save Settings"] = "Tallenna asetukset";
 $a->strings["Save and send test"] = "Tallenna ja lähetä koeviesti";
 $a->strings["Enable Secure Mail"] = "Ota Secure Mail käyttöön";
 $a->strings["Public key"] = "Julkinen avain";
-$a->strings["Your public PGP key, ascii armored format"] = "";
 $a->strings["Secure Mail Settings saved."] = "Secure Mail -asetukset tallennettu.";
 $a->strings["Test email sent"] = "Koeviesti lähetetty";
 $a->strings["There was an error sending the test email"] = "Testisähköpostin lähetyksessä tapahtui virhe";
diff --git a/securemail/lang/it/strings.php b/securemail/lang/it/strings.php
index 2435bfba3..2536894b1 100644
--- a/securemail/lang/it/strings.php
+++ b/securemail/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Secure Mail\" Settings"] = "Impostazioni Secure Mail";
diff --git a/securemail/lang/nl/strings.php b/securemail/lang/nl/strings.php
index 6ba0a76fb..a56afeec3 100644
--- a/securemail/lang/nl/strings.php
+++ b/securemail/lang/nl/strings.php
@@ -3,15 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Secure Mail\" Settings"] = "\"Secure Mail\" instellingen";
 $a->strings["Save Settings"] = "Instellingen opslaan";
-$a->strings["Save and send test"] = "";
 $a->strings["Enable Secure Mail"] = "Secure Mail inschakelen";
-$a->strings["Public key"] = "";
-$a->strings["Your public PGP key, ascii armored format"] = "";
 $a->strings["Secure Mail Settings saved."] = "Secure Mail instellingen opgeslagen";
-$a->strings["Test email sent"] = "";
-$a->strings["There was an error sending the test email"] = "";
diff --git a/securemail/lang/pl/strings.php b/securemail/lang/pl/strings.php
index 7b66d591b..ea72b8707 100644
--- a/securemail/lang/pl/strings.php
+++ b/securemail/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["\"Secure Mail\" Settings"] = "Ustawienia \"Bezpieczna poczta\"";
diff --git a/securemail/lang/zh-cn/strings.php b/securemail/lang/zh-cn/strings.php
index 7e5d3b6d9..710463894 100644
--- a/securemail/lang/zh-cn/strings.php
+++ b/securemail/lang/zh-cn/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
-	return 0;;
+	$n = intval($n);
+	return intval(0);
 }}
 ;
 $a->strings["\"Secure Mail\" Settings"] = "“加密邮件”设置";
diff --git a/showmore/lang/C/messages.po b/showmore/lang/C/messages.po
index 63891ead1..2060eb1ab 100644
--- a/showmore/lang/C/messages.po
+++ b/showmore/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,26 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: showmore.php:41 showmore.php:45
+#: showmore.php:35 showmore.php:39
 msgid "\"Show more\" Settings"
 msgstr ""
 
-#: showmore.php:50
+#: showmore.php:44
 msgid "Enable Show More"
 msgstr ""
 
-#: showmore.php:53
+#: showmore.php:47
 msgid "Cutting posts after how much characters"
 msgstr ""
 
-#: showmore.php:57
+#: showmore.php:51
 msgid "Save Settings"
 msgstr ""
 
-#: showmore.php:74
-msgid "Show More Settings saved."
-msgstr ""
-
-#: showmore.php:134
+#: showmore.php:129
 msgid "show more"
 msgstr ""
diff --git a/showmore/lang/cs/strings.php b/showmore/lang/cs/strings.php
index 1b82b570b..45b896304 100644
--- a/showmore/lang/cs/strings.php
+++ b/showmore/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["\"Show more\" Settings"] = "Nastavení \"Show more\"";
diff --git a/showmore/lang/de/strings.php b/showmore/lang/de/strings.php
index f4df3488f..f37131c07 100644
--- a/showmore/lang/de/strings.php
+++ b/showmore/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen";
diff --git a/showmore/lang/en-gb/strings.php b/showmore/lang/en-gb/strings.php
index 87f88ef5d..c2c111745 100644
--- a/showmore/lang/en-gb/strings.php
+++ b/showmore/lang/en-gb/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Show more\" Settings"] = "Show More";
diff --git a/showmore/lang/es/strings.php b/showmore/lang/es/strings.php
index 16ceaf564..ee0018243 100644
--- a/showmore/lang/es/strings.php
+++ b/showmore/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Show more\" Settings"] = "Ajustes de \"Mostrar más\"";
diff --git a/showmore/lang/et/strings.php b/showmore/lang/et/strings.php
index 1b14dd967..c612865a7 100644
--- a/showmore/lang/et/strings.php
+++ b/showmore/lang/et/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_et")) {
 function string_plural_select_et($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Show more\" Settings"] = "Näita rohkem sätteid";
diff --git a/showmore/lang/fi-fi/strings.php b/showmore/lang/fi-fi/strings.php
index b6c771b8c..5cb55768e 100644
--- a/showmore/lang/fi-fi/strings.php
+++ b/showmore/lang/fi-fi/strings.php
@@ -2,12 +2,12 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Show more\" Settings"] = "Show more -asetukset";
 $a->strings["Enable Show More"] = "Ota Show More käyttöön";
-$a->strings["Cutting posts after how much characters"] = "";
 $a->strings["Save Settings"] = "Tallenna asetukset";
 $a->strings["Show More Settings saved."] = "Show More -asetukset tallennettu";
 $a->strings["show more"] = "näytä lisää";
diff --git a/showmore/lang/it/strings.php b/showmore/lang/it/strings.php
index c6ed91bf5..4d7090518 100644
--- a/showmore/lang/it/strings.php
+++ b/showmore/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Show more\" Settings"] = "Impostazioni \"Mostra altro\"";
diff --git a/showmore/lang/nl/strings.php b/showmore/lang/nl/strings.php
index f65d2a0e0..ed55863c4 100644
--- a/showmore/lang/nl/strings.php
+++ b/showmore/lang/nl/strings.php
@@ -3,12 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Show more\" Settings"] = "\"Toon meer\" instellingen";
 $a->strings["Enable Show More"] = "Toon meer inschakelen";
-$a->strings["Cutting posts after how much characters"] = "";
 $a->strings["Save Settings"] = "Instellingen opslaan";
 $a->strings["Show More Settings saved."] = "Toon meer instellingen opgeslagen.";
-$a->strings["show more"] = "";
diff --git a/showmore/lang/pl/strings.php b/showmore/lang/pl/strings.php
index eca7dd85f..30bf34d7d 100644
--- a/showmore/lang/pl/strings.php
+++ b/showmore/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["\"Show more\" Settings"] = "Ustawienia \"Pokaż więcej\"";
diff --git a/showmore/lang/pt-br/strings.php b/showmore/lang/pt-br/strings.php
index 05f2b0702..1203cbe91 100644
--- a/showmore/lang/pt-br/strings.php
+++ b/showmore/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["\"Show more\" Settings"] = "Configurações de \"Mostrar mais\"";
diff --git a/showmore/lang/ro/strings.php b/showmore/lang/ro/strings.php
index a7c119926..989cb501d 100644
--- a/showmore/lang/ro/strings.php
+++ b/showmore/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["\"Show more\" Settings"] = "Configurări \"Afișează mai mult\"";
diff --git a/showmore/lang/ru/strings.php b/showmore/lang/ru/strings.php
index a643b0289..2ef98b18d 100644
--- a/showmore/lang/ru/strings.php
+++ b/showmore/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["\"Show more\" Settings"] = "Настройки \"показать ещё\"";
diff --git a/showmore/lang/zh-cn/strings.php b/showmore/lang/zh-cn/strings.php
index dc840894a..ca2349e61 100644
--- a/showmore/lang/zh-cn/strings.php
+++ b/showmore/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["\"Show more\" Settings"] = "“显示更多”设置";
diff --git a/showmore_dyn/lang/C/messages.po b/showmore_dyn/lang/C/messages.po
index c91cb1d05..4bf4c94ff 100644
--- a/showmore_dyn/lang/C/messages.po
+++ b/showmore_dyn/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-31 09:16-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/smiley_pack/lang/C/messages.po b/smiley_pack/lang/C/messages.po
deleted file mode 100644
index e69de29bb..000000000
diff --git a/smileybutton/lang/C/messages.po b/smileybutton/lang/C/messages.po
deleted file mode 100644
index 7c32045e6..000000000
--- a/smileybutton/lang/C/messages.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# ADDON smileybutton
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica smileybutton addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: smileybutton.php:269
-msgid "Smileybutton settings"
-msgstr ""
-
-#: smileybutton.php:272
-msgid "You can hide the button and show the smilies directly."
-msgstr ""
-
-#: smileybutton.php:274
-msgid "Hide the button"
-msgstr ""
-
-#: smileybutton.php:281
-msgid "Save Settings"
-msgstr ""
diff --git a/smileybutton/lang/cs/strings.php b/smileybutton/lang/cs/strings.php
index e66f3401d..046998158 100644
--- a/smileybutton/lang/cs/strings.php
+++ b/smileybutton/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["Smileybutton settings"] = "Smileybutton nastavení";
diff --git a/smileybutton/lang/de/strings.php b/smileybutton/lang/de/strings.php
index 8abea8e56..0c1bf3081 100644
--- a/smileybutton/lang/de/strings.php
+++ b/smileybutton/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Smileybutton settings"] = "Smileybutton Einstellungen";
diff --git a/smileybutton/lang/es/strings.php b/smileybutton/lang/es/strings.php
index 96a6cc10a..b294fd0d9 100644
--- a/smileybutton/lang/es/strings.php
+++ b/smileybutton/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Smileybutton settings"] = "Ajustes de Smileybutton";
diff --git a/smileybutton/lang/et/strings.php b/smileybutton/lang/et/strings.php
index fe8cdb9f6..b39400cab 100644
--- a/smileybutton/lang/et/strings.php
+++ b/smileybutton/lang/et/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_et")) {
 function string_plural_select_et($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Smileybutton settings"] = "SmileyNupu sätted";
diff --git a/smileybutton/lang/fi-fi/strings.php b/smileybutton/lang/fi-fi/strings.php
index f131c9cf1..16480ffae 100644
--- a/smileybutton/lang/fi-fi/strings.php
+++ b/smileybutton/lang/fi-fi/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Smileybutton settings"] = "Smileybutton -asetukset";
-$a->strings["You can hide the button and show the smilies directly."] = "";
 $a->strings["Hide the button"] = "Piilota nappi";
 $a->strings["Save Settings"] = "Tallenna asetukset";
diff --git a/smileybutton/lang/fr/strings.php b/smileybutton/lang/fr/strings.php
index 92033bec8..81f71a1ac 100644
--- a/smileybutton/lang/fr/strings.php
+++ b/smileybutton/lang/fr/strings.php
@@ -3,10 +3,8 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["Smileybutton settings"] = "Paramètres du bouton des Smileys";
-$a->strings["You can hide the button and show the smilies directly."] = "";
 $a->strings["Hide the button"] = "Cacher le bouton";
-$a->strings["Save Settings"] = "";
diff --git a/smileybutton/lang/nl/strings.php b/smileybutton/lang/nl/strings.php
index 19a76fd4b..ac3cc666d 100644
--- a/smileybutton/lang/nl/strings.php
+++ b/smileybutton/lang/nl/strings.php
@@ -3,10 +3,8 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Smileybutton settings"] = "Smileybutton instellingen";
-$a->strings["You can hide the button and show the smilies directly."] = "";
-$a->strings["Hide the button"] = "";
 $a->strings["Save Settings"] = "Instellingen opslaan";
diff --git a/smileybutton/lang/pl/strings.php b/smileybutton/lang/pl/strings.php
index 9741c36f3..f02941205 100644
--- a/smileybutton/lang/pl/strings.php
+++ b/smileybutton/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Smileybutton settings"] = "Ustawienia Przycisku Buźka";
diff --git a/smileybutton/lang/ro/strings.php b/smileybutton/lang/ro/strings.php
index 2a330a471..eb8fbbdb1 100644
--- a/smileybutton/lang/ro/strings.php
+++ b/smileybutton/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Smileybutton settings"] = "Configurări Smileybutton";
diff --git a/smileybutton/lang/zh-cn/strings.php b/smileybutton/lang/zh-cn/strings.php
index 1fd0c133e..86a9d758f 100644
--- a/smileybutton/lang/zh-cn/strings.php
+++ b/smileybutton/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Smileybutton settings"] = "表情按钮设置";
diff --git a/smilies_adult/lang/C/messages.po b/smilies_adult/lang/C/messages.po
deleted file mode 100644
index e69de29bb..000000000
diff --git a/sniper/lang/C/messages.po b/sniper/lang/C/messages.po
deleted file mode 100644
index e69de29bb..000000000
diff --git a/startpage/lang/C/messages.po b/startpage/lang/C/messages.po
index 4c2b8a1df..1636361ef 100644
--- a/startpage/lang/C/messages.po
+++ b/startpage/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: startpage.php:83
-msgid "Startpage Settings"
+#: startpage.php:74 startpage.php:78
+msgid "Startpage"
 msgstr ""
 
-#: startpage.php:85
+#: startpage.php:81
 msgid "Home page to load after login  - leave blank for profile wall"
 msgstr ""
 
-#: startpage.php:88
+#: startpage.php:84
 msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
 msgstr ""
 
-#: startpage.php:92
-msgid "Submit"
+#: startpage.php:88
+msgid "Save Settings"
 msgstr ""
diff --git a/startpage/lang/cs/strings.php b/startpage/lang/cs/strings.php
index c0f194387..b68be94c4 100644
--- a/startpage/lang/cs/strings.php
+++ b/startpage/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Startpage Settings"] = "Nastavení startovní stránky";
diff --git a/startpage/lang/de/strings.php b/startpage/lang/de/strings.php
index 326b58cef..d7d26e64a 100644
--- a/startpage/lang/de/strings.php
+++ b/startpage/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Startpage Settings"] = "Startseiten-Einstellungen";
diff --git a/startpage/lang/es/strings.php b/startpage/lang/es/strings.php
index bbd8aedd4..24485e72d 100644
--- a/startpage/lang/es/strings.php
+++ b/startpage/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Startpage Settings"] = "Ajustes de Startpage";
diff --git a/startpage/lang/fi-fi/strings.php b/startpage/lang/fi-fi/strings.php
index 53c954abc..9ef23e906 100644
--- a/startpage/lang/fi-fi/strings.php
+++ b/startpage/lang/fi-fi/strings.php
@@ -2,10 +2,9 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Startpage Settings"] = "Startpage -asetukset";
-$a->strings["Home page to load after login  - leave blank for profile wall"] = "";
-$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
 $a->strings["Submit"] = "Lähetä";
diff --git a/startpage/lang/fr/strings.php b/startpage/lang/fr/strings.php
index d3d3f9b92..995cdd6c5 100644
--- a/startpage/lang/fr/strings.php
+++ b/startpage/lang/fr/strings.php
@@ -2,10 +2,9 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Startpage Settings"] = "Paramètres de Startpage";
-$a->strings["Home page to load after login  - leave blank for profile wall"] = "";
-$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
 $a->strings["Submit"] = "Envoyer";
diff --git a/startpage/lang/is/strings.php b/startpage/lang/is/strings.php
index afd3d84a0..703fc6e2f 100644
--- a/startpage/lang/is/strings.php
+++ b/startpage/lang/is/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return ($n % 10 != 1 || $n % 100 == 11);;
+	return intval($n % 10 != 1 || $n % 100 == 11);
 }}
 ;
 $a->strings["Startpage Settings"] = "Stillingar upphafssíðu";
diff --git a/startpage/lang/it/strings.php b/startpage/lang/it/strings.php
index 0226f923d..92183531c 100644
--- a/startpage/lang/it/strings.php
+++ b/startpage/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Startpage Settings"] = "Impostazioni Startpage";
diff --git a/startpage/lang/nl/strings.php b/startpage/lang/nl/strings.php
index 6521128b5..19d78596b 100644
--- a/startpage/lang/nl/strings.php
+++ b/startpage/lang/nl/strings.php
@@ -3,10 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Startpage Settings"] = "Startpagina instellingen";
-$a->strings["Home page to load after login  - leave blank for profile wall"] = "";
-$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
-$a->strings["Submit"] = "";
diff --git a/startpage/lang/pl/strings.php b/startpage/lang/pl/strings.php
index e0b868ba6..4c7ba5eb2 100644
--- a/startpage/lang/pl/strings.php
+++ b/startpage/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Startpage Settings"] = "Ustawienia strony startowej";
diff --git a/startpage/lang/ro/strings.php b/startpage/lang/ro/strings.php
index 701b5f9a8..a25abea96 100644
--- a/startpage/lang/ro/strings.php
+++ b/startpage/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Startpage"] = "Startpage";
diff --git a/startpage/lang/zh-cn/strings.php b/startpage/lang/zh-cn/strings.php
index 45d71c360..71b26d7ae 100644
--- a/startpage/lang/zh-cn/strings.php
+++ b/startpage/lang/zh-cn/strings.php
@@ -3,10 +3,8 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Startpage Settings"] = "首页设置";
-$a->strings["Home page to load after login  - leave blank for profile wall"] = "";
-$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
 $a->strings["Submit"] = "提交";
diff --git a/statusnet/lang/C/messages.po b/statusnet/lang/C/messages.po
index 4c762b481..d5bce1410 100644
--- a/statusnet/lang/C/messages.po
+++ b/statusnet/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-27 07:21+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,49 +17,45 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: statusnet.php:151
+#: statusnet.php:95
 msgid "Post to GNU Social"
 msgstr ""
 
-#: statusnet.php:196
+#: statusnet.php:146
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr ""
 
-#: statusnet.php:225
+#: statusnet.php:175
 msgid "We could not contact the GNU Social API with the Path you entered."
 msgstr ""
 
-#: statusnet.php:259
-msgid "GNU Social settings updated."
-msgstr ""
-
-#: statusnet.php:294 statusnet.php:298
+#: statusnet.php:248 statusnet.php:252
 msgid "GNU Social Import/Export/Mirror"
 msgstr ""
 
-#: statusnet.php:313
+#: statusnet.php:267
 msgid "Globally Available GNU Social OAuthKeys"
 msgstr ""
 
-#: statusnet.php:314
+#: statusnet.php:268
 msgid ""
 "There are preconfigured OAuth key pairs for some GNU Social servers "
 "available. If you are using one of them, please use these credentials. If "
 "not feel free to connect to any other GNU Social instance (see below)."
 msgstr ""
 
-#: statusnet.php:320 statusnet.php:337 statusnet.php:364 statusnet.php:371
-#: statusnet.php:416 statusnet.php:699
+#: statusnet.php:274 statusnet.php:291 statusnet.php:318 statusnet.php:325
+#: statusnet.php:372 statusnet.php:698
 msgid "Save Settings"
 msgstr ""
 
-#: statusnet.php:322
+#: statusnet.php:276
 msgid "Provide your own OAuth Credentials"
 msgstr ""
 
-#: statusnet.php:323
+#: statusnet.php:277
 msgid ""
 "No consumer key pair for GNU Social found. Register your Friendica Account "
 "as an desktop client on your GNU Social account, copy the consumer key pair "
@@ -68,19 +64,19 @@ msgid ""
 "Friendica installation at your favorited GNU Social installation."
 msgstr ""
 
-#: statusnet.php:325
+#: statusnet.php:279
 msgid "OAuth Consumer Key"
 msgstr ""
 
-#: statusnet.php:328
+#: statusnet.php:282
 msgid "OAuth Consumer Secret"
 msgstr ""
 
-#: statusnet.php:331 statusnet.php:679 statusnet.php:691
+#: statusnet.php:285 statusnet.php:678 statusnet.php:690
 msgid "Base API Path (remember the trailing /)"
 msgstr ""
 
-#: statusnet.php:356
+#: statusnet.php:310
 msgid ""
 "To connect to your GNU Social account click the button below to get a "
 "security code from GNU Social which you have to copy into the input box "
@@ -88,38 +84,38 @@ msgid ""
 "posted to GNU Social."
 msgstr ""
 
-#: statusnet.php:357
+#: statusnet.php:311
 msgid "Log in with GNU Social"
 msgstr ""
 
-#: statusnet.php:359
+#: statusnet.php:313
 msgid "Copy the security code from GNU Social here"
 msgstr ""
 
-#: statusnet.php:365
+#: statusnet.php:319
 msgid "Cancel Connection Process"
 msgstr ""
 
-#: statusnet.php:367
+#: statusnet.php:321
 msgid "Current GNU Social API is"
 msgstr ""
 
-#: statusnet.php:368
+#: statusnet.php:322
 msgid "Cancel GNU Social Connection"
 msgstr ""
 
-#: statusnet.php:379
+#: statusnet.php:334
 msgid "Currently connected to: "
 msgstr ""
 
-#: statusnet.php:380
+#: statusnet.php:336
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated GNU Social account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: statusnet.php:382
+#: statusnet.php:338
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -127,47 +123,47 @@ msgid ""
 "informing the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: statusnet.php:385
+#: statusnet.php:341
 msgid "Allow posting to GNU Social"
 msgstr ""
 
-#: statusnet.php:388
+#: statusnet.php:344
 msgid "Send public postings to GNU Social by default"
 msgstr ""
 
-#: statusnet.php:392
+#: statusnet.php:348
 msgid ""
 "Mirror all posts from GNU Social that are no replies or repeated messages"
 msgstr ""
 
-#: statusnet.php:398
+#: statusnet.php:354
 msgid "Import the remote timeline"
 msgstr ""
 
-#: statusnet.php:402
+#: statusnet.php:358
 msgid "Disabled"
 msgstr ""
 
-#: statusnet.php:403
+#: statusnet.php:359
 msgid "Full Timeline"
 msgstr ""
 
-#: statusnet.php:404
+#: statusnet.php:360
 msgid "Only Mentions"
 msgstr ""
 
-#: statusnet.php:413
+#: statusnet.php:369
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: statusnet.php:690
+#: statusnet.php:689
 msgid "Site name"
 msgstr ""
 
-#: statusnet.php:692
+#: statusnet.php:691
 msgid "Consumer Secret"
 msgstr ""
 
-#: statusnet.php:693
+#: statusnet.php:692
 msgid "Consumer Key"
 msgstr ""
diff --git a/statusnet/lang/cs/strings.php b/statusnet/lang/cs/strings.php
index 3bf9180df..a4f082599 100644
--- a/statusnet/lang/cs/strings.php
+++ b/statusnet/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to GNU Social"] = "Poslat na GNU social";
diff --git a/statusnet/lang/de/strings.php b/statusnet/lang/de/strings.php
index 2c2873faa..be7f8fd4b 100644
--- a/statusnet/lang/de/strings.php
+++ b/statusnet/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to GNU Social"] = "Auf GNU Social veröffentlichen";
diff --git a/statusnet/lang/es/strings.php b/statusnet/lang/es/strings.php
index d33fa0fd3..557b7cc7e 100644
--- a/statusnet/lang/es/strings.php
+++ b/statusnet/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to GNU Social"] = "Publicar en GNU Social";
diff --git a/statusnet/lang/fi-fi/strings.php b/statusnet/lang/fi-fi/strings.php
index 2dc699ead..cc88ad836 100644
--- a/statusnet/lang/fi-fi/strings.php
+++ b/statusnet/lang/fi-fi/strings.php
@@ -3,39 +3,23 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to GNU Social"] = "Lähetä GNU Socialiin";
 $a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Ota yhteyttä sivuston ylläpitäjään.<br />API URL-osoite on virheellinen.";
-$a->strings["We could not contact the GNU Social API with the Path you entered."] = "";
 $a->strings["GNU Social settings updated."] = "GNU Social -asetukset päivitetty.";
 $a->strings["GNU Social Import/Export/Mirror"] = "GNU social tuonti/vienti/peili";
-$a->strings["Globally Available GNU Social OAuthKeys"] = "";
-$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "";
 $a->strings["Save Settings"] = "Tallenna asetukset";
-$a->strings["Provide your own OAuth Credentials"] = "";
-$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "";
 $a->strings["OAuth Consumer Key"] = "OAuth kuluttajan avain";
 $a->strings["OAuth Consumer Secret"] = "OAuth kuluttajasalaisuus";
-$a->strings["Base API Path (remember the trailing /)"] = "";
-$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "";
 $a->strings["Log in with GNU Social"] = "Kirjaudu sisään GNU socialilla";
-$a->strings["Copy the security code from GNU Social here"] = "";
-$a->strings["Cancel Connection Process"] = "";
-$a->strings["Current GNU Social API is"] = "";
-$a->strings["Cancel GNU Social Connection"] = "";
-$a->strings["Currently connected to: "] = "";
-$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
 $a->strings["Allow posting to GNU Social"] = "Salli julkaisut GNU socialiin";
 $a->strings["Send public postings to GNU Social by default"] = "Lähetä oletuksena kaikki julkiset julkaisut GNU socialiin";
 $a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "Peilaa kaikki julkaisut GNU socialista jotka eivät ole vastauksia tai toistettuja viestejä";
 $a->strings["Import the remote timeline"] = "Tuo etäaikajana";
 $a->strings["Disabled"] = "Poistettu käytöstä";
 $a->strings["Full Timeline"] = "Koko aikajana";
-$a->strings["Only Mentions"] = "";
-$a->strings["Clear OAuth configuration"] = "";
 $a->strings["Site name"] = "Sivuston nimi";
 $a->strings["Consumer Secret"] = "Kuluttajasalaisuus";
 $a->strings["Consumer Key"] = "Kuluttajan avain";
diff --git a/statusnet/lang/fr/strings.php b/statusnet/lang/fr/strings.php
index c70d012c3..44afea015 100644
--- a/statusnet/lang/fr/strings.php
+++ b/statusnet/lang/fr/strings.php
@@ -2,39 +2,19 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Post to GNU Social"] = "Publier sur GNU Social";
 $a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Merci de contacter l'administrateur du site.<br />L'URL d'API fournie est invalide.";
-$a->strings["We could not contact the GNU Social API with the Path you entered."] = "";
 $a->strings["GNU Social settings updated."] = "Paramètres du GNU Social mis à jour.";
-$a->strings["GNU Social Import/Export/Mirror"] = "";
-$a->strings["Globally Available GNU Social OAuthKeys"] = "";
-$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "";
 $a->strings["Save Settings"] = "Sauvegarder les paramètres";
-$a->strings["Provide your own OAuth Credentials"] = "";
-$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "";
-$a->strings["OAuth Consumer Key"] = "";
-$a->strings["OAuth Consumer Secret"] = "";
-$a->strings["Base API Path (remember the trailing /)"] = "";
-$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "";
 $a->strings["Log in with GNU Social"] = "Se connecter avec GNU Social";
 $a->strings["Copy the security code from GNU Social here"] = "Coller le code de sécurité de GNU Social ici";
-$a->strings["Cancel Connection Process"] = "";
 $a->strings["Current GNU Social API is"] = "L'API actuelle de GNU Social est";
-$a->strings["Cancel GNU Social Connection"] = "";
 $a->strings["Currently connected to: "] = "Actuellement connecté à :";
-$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
 $a->strings["Allow posting to GNU Social"] = "Autoriser la publication sur GNU Social";
-$a->strings["Send public postings to GNU Social by default"] = "";
-$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "";
-$a->strings["Import the remote timeline"] = "";
 $a->strings["Disabled"] = "Désactiver";
 $a->strings["Full Timeline"] = "Timeline complète";
-$a->strings["Only Mentions"] = "";
-$a->strings["Clear OAuth configuration"] = "";
 $a->strings["Site name"] = "Nom du site";
-$a->strings["Consumer Secret"] = "";
-$a->strings["Consumer Key"] = "";
diff --git a/statusnet/lang/is/strings.php b/statusnet/lang/is/strings.php
index 367b40bb6..87a72de1d 100644
--- a/statusnet/lang/is/strings.php
+++ b/statusnet/lang/is/strings.php
@@ -3,19 +3,17 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return ($n % 10 != 1 || $n % 100 == 11);;
+	return intval($n % 10 != 1 || $n % 100 == 11);
 }}
 ;
 $a->strings["Post to GNU Social"] = "Senda á GNU Social";
 $a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Hafðu samband við kerfisstjóra.<br />Uppgefin API-slóð er ógild.";
 $a->strings["We could not contact the GNU Social API with the Path you entered."] = "Ekki náðist í GNU Social API með slóðinni sem þú gafst upp.";
 $a->strings["GNU Social settings updated."] = "Stillingar GNU Social uppfærðar.";
-$a->strings["GNU Social Import/Export/Mirror"] = "";
 $a->strings["Globally Available GNU Social OAuthKeys"] = "Víðværir OAuth-lyklar GNU Social eru til taks";
 $a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "Það eru forstillt OAuth-lyklapör í sumum GNU Social þjónum.  Ef þú ert að nota slíkt par, notaðu þá þau auðkenni. Ef ekki þá er þér frjálst að tengjast hvaða öðrum GNU Social þjónum (sjá fyrir neðan).";
 $a->strings["Save Settings"] = "Vista stillingar";
 $a->strings["Provide your own OAuth Credentials"] = "Gefðu upp eigin OAuth auðkenni";
-$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "";
 $a->strings["OAuth Consumer Key"] = "OAuth-lykill notanda";
 $a->strings["OAuth Consumer Secret"] = "OAuth-leyniorð notanda";
 $a->strings["Base API Path (remember the trailing /)"] = "Grunn API-slóð (muna eftir / í endann)";
@@ -27,14 +25,11 @@ $a->strings["Current GNU Social API is"] = "Núverandi GNU Social API er";
 $a->strings["Cancel GNU Social Connection"] = "Hætta við GNU Social tengingu";
 $a->strings["Currently connected to: "] = "Núna tengdur við:";
 $a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Ef virkt þá geta allar <strong>opinberu</strong> stöðu meldingarnar þínar verið birtar á tengdri GNU Social síðu. Þú getur valið að gera þetta sjálfvirkt (hér) eða fyrir hvern póst í senn þegar hann er skrifaður.";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
 $a->strings["Allow posting to GNU Social"] = "Leyfa sendingu færslna til GNU Social";
 $a->strings["Send public postings to GNU Social by default"] = "Sjálfgefið senda opinberar færslur á GNU Social";
-$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "";
 $a->strings["Import the remote timeline"] = "Flytja inn fjartengdu tímalínuna";
 $a->strings["Disabled"] = "Slökkt";
 $a->strings["Full Timeline"] = "Öll tímalínan";
-$a->strings["Only Mentions"] = "";
 $a->strings["Clear OAuth configuration"] = "Hreinsa OAuth stillingar";
 $a->strings["Site name"] = "Heiti vefsvæðis";
 $a->strings["Consumer Secret"] = "Leyniorð notanda";
diff --git a/statusnet/lang/it/strings.php b/statusnet/lang/it/strings.php
index 8f44cf772..f1f103da1 100644
--- a/statusnet/lang/it/strings.php
+++ b/statusnet/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to GNU Social"] = "Invia a GNU Social";
diff --git a/statusnet/lang/nl/strings.php b/statusnet/lang/nl/strings.php
index b8c05579e..43b82c6a4 100644
--- a/statusnet/lang/nl/strings.php
+++ b/statusnet/lang/nl/strings.php
@@ -3,39 +3,13 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to GNU Social"] = "Post naar GNU Social";
-$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "";
-$a->strings["We could not contact the GNU Social API with the Path you entered."] = "";
 $a->strings["GNU Social settings updated."] = "GNU Social instellingen opgeslagen";
 $a->strings["GNU Social Import/Export/Mirror"] = "GNU Social Import/Exporteren/Spiegelen";
-$a->strings["Globally Available GNU Social OAuthKeys"] = "";
-$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "";
 $a->strings["Save Settings"] = "Instellingen opslaan";
-$a->strings["Provide your own OAuth Credentials"] = "";
-$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "";
-$a->strings["OAuth Consumer Key"] = "";
-$a->strings["OAuth Consumer Secret"] = "";
-$a->strings["Base API Path (remember the trailing /)"] = "";
-$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "";
-$a->strings["Log in with GNU Social"] = "";
-$a->strings["Copy the security code from GNU Social here"] = "";
-$a->strings["Cancel Connection Process"] = "";
-$a->strings["Current GNU Social API is"] = "";
-$a->strings["Cancel GNU Social Connection"] = "";
-$a->strings["Currently connected to: "] = "";
-$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
 $a->strings["Allow posting to GNU Social"] = "Plaatsen op GNU Social toestaan";
 $a->strings["Send public postings to GNU Social by default"] = "Verzend publieke berichten naar GNU Social als standaard instellen";
-$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "";
-$a->strings["Import the remote timeline"] = "";
 $a->strings["Disabled"] = "Uitgeschakeld";
-$a->strings["Full Timeline"] = "";
-$a->strings["Only Mentions"] = "";
-$a->strings["Clear OAuth configuration"] = "";
-$a->strings["Site name"] = "";
-$a->strings["Consumer Secret"] = "";
-$a->strings["Consumer Key"] = "";
diff --git a/statusnet/lang/pl/strings.php b/statusnet/lang/pl/strings.php
index c8d2513b4..2d8f7ed3b 100644
--- a/statusnet/lang/pl/strings.php
+++ b/statusnet/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to GNU Social"] = "Opublikuj w GNU Social";
diff --git a/statusnet/lang/pt-br/strings.php b/statusnet/lang/pt-br/strings.php
index 951322a0e..65e26e266 100644
--- a/statusnet/lang/pt-br/strings.php
+++ b/statusnet/lang/pt-br/strings.php
@@ -2,39 +2,14 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Post to GNU Social"] = "Publicar no GNU Social";
-$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "";
-$a->strings["We could not contact the GNU Social API with the Path you entered."] = "";
 $a->strings["GNU Social settings updated."] = "As configurações do GNU Social foram atualizadas.";
-$a->strings["GNU Social Import/Export/Mirror"] = "";
-$a->strings["Globally Available GNU Social OAuthKeys"] = "";
-$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "";
 $a->strings["Save Settings"] = "Salvar Configurações";
-$a->strings["Provide your own OAuth Credentials"] = "";
-$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "";
-$a->strings["OAuth Consumer Key"] = "";
-$a->strings["OAuth Consumer Secret"] = "";
-$a->strings["Base API Path (remember the trailing /)"] = "";
-$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "";
 $a->strings["Log in with GNU Social"] = "Entrar com o GNU Social";
-$a->strings["Copy the security code from GNU Social here"] = "";
-$a->strings["Cancel Connection Process"] = "";
-$a->strings["Current GNU Social API is"] = "";
-$a->strings["Cancel GNU Social Connection"] = "";
-$a->strings["Currently connected to: "] = "";
-$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
 $a->strings["Allow posting to GNU Social"] = "Permitir a publicação no GNU Social";
 $a->strings["Send public postings to GNU Social by default"] = "Publicar posts públicos no GNU Social por padrão";
-$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "";
 $a->strings["Import the remote timeline"] = "Importar a linha do tempo remota";
-$a->strings["Disabled"] = "";
-$a->strings["Full Timeline"] = "";
-$a->strings["Only Mentions"] = "";
-$a->strings["Clear OAuth configuration"] = "";
-$a->strings["Site name"] = "";
-$a->strings["Consumer Secret"] = "";
-$a->strings["Consumer Key"] = "";
diff --git a/statusnet/lang/ro/strings.php b/statusnet/lang/ro/strings.php
index c5a8fff81..bf3b8fc9d 100644
--- a/statusnet/lang/ro/strings.php
+++ b/statusnet/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Post to StatusNet"] = "Postați pe StatusNet";
diff --git a/superblock/lang/C/messages.po b/superblock/lang/C/messages.po
index a96d43ecd..50f078684 100644
--- a/superblock/lang/C/messages.po
+++ b/superblock/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-17 10:25+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,26 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: superblock.php:47 superblock.php:51
+#: superblock.php:38 superblock.php:42
 msgid "Superblock"
 msgstr ""
 
-#: superblock.php:54
+#: superblock.php:45
 msgid "Comma separated profile URLS to block"
 msgstr ""
 
-#: superblock.php:58
+#: superblock.php:49
 msgid "Save Settings"
 msgstr ""
 
-#: superblock.php:71
-msgid "SUPERBLOCK Settings saved."
-msgstr ""
-
-#: superblock.php:144
+#: superblock.php:138
 msgid "Block Completely"
 msgstr ""
-
-#: superblock.php:165
-msgid "superblock settings updated"
-msgstr ""
diff --git a/superblock/lang/cs/strings.php b/superblock/lang/cs/strings.php
index 32acaf8bb..b7a3ec8f0 100644
--- a/superblock/lang/cs/strings.php
+++ b/superblock/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Superblock"] = "Superblock";
diff --git a/superblock/lang/de/strings.php b/superblock/lang/de/strings.php
index 5fb3cb2c4..4d88a5470 100644
--- a/superblock/lang/de/strings.php
+++ b/superblock/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Superblock"] = "Superblock";
diff --git a/superblock/lang/en-gb/strings.php b/superblock/lang/en-gb/strings.php
index e269b37d7..e5d54902a 100644
--- a/superblock/lang/en-gb/strings.php
+++ b/superblock/lang/en-gb/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Superblock"] = "Superblock";
diff --git a/superblock/lang/en-us/strings.php b/superblock/lang/en-us/strings.php
index 31906bb6e..133456b39 100644
--- a/superblock/lang/en-us/strings.php
+++ b/superblock/lang/en-us/strings.php
@@ -3,12 +3,7 @@
 if(! function_exists("string_plural_select_en_us")) {
 function string_plural_select_en_us($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
-$a->strings["\"Superblock\""] = "";
 $a->strings["Comma separated profile URLS to block"] = "Comma-separated profile URLs to block";
-$a->strings["Save Settings"] = "";
-$a->strings["SUPERBLOCK Settings saved."] = "";
-$a->strings["Block Completely"] = "";
-$a->strings["superblock settings updated"] = "";
diff --git a/superblock/lang/es/strings.php b/superblock/lang/es/strings.php
index 1b40975f1..65373babd 100644
--- a/superblock/lang/es/strings.php
+++ b/superblock/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Superblock\""] = "«Superbloque»";
diff --git a/superblock/lang/fi-fi/strings.php b/superblock/lang/fi-fi/strings.php
index f96ee65b6..b2aeb0428 100644
--- a/superblock/lang/fi-fi/strings.php
+++ b/superblock/lang/fi-fi/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["\"Superblock\""] = "\"Superblock\"";
diff --git a/superblock/lang/fr/strings.php b/superblock/lang/fr/strings.php
index ea8228a53..02efe8d11 100644
--- a/superblock/lang/fr/strings.php
+++ b/superblock/lang/fr/strings.php
@@ -3,12 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
-$a->strings["Superblock"] = "";
-$a->strings["Comma separated profile URLS to block"] = "";
 $a->strings["Save Settings"] = "Sauvegarder les paramètres";
-$a->strings["SUPERBLOCK Settings saved."] = "";
-$a->strings["Block Completely"] = "";
-$a->strings["superblock settings updated"] = "";
diff --git a/superblock/lang/it/strings.php b/superblock/lang/it/strings.php
index 972748952..d49a57728 100644
--- a/superblock/lang/it/strings.php
+++ b/superblock/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Superblock"] = "Superblock";
diff --git a/superblock/lang/nl/strings.php b/superblock/lang/nl/strings.php
index d66e7b9e7..7f5f2532b 100644
--- a/superblock/lang/nl/strings.php
+++ b/superblock/lang/nl/strings.php
@@ -3,12 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Superblock"] = "Superblock";
-$a->strings["Comma separated profile URLS to block"] = "";
 $a->strings["Save Settings"] = "Instellingen opslaan";
 $a->strings["SUPERBLOCK Settings saved."] = "SUPERBLOCK instellingen opgeslagen";
-$a->strings["Block Completely"] = "";
 $a->strings["superblock settings updated"] = "Superblock instellingen opgeslagen";
diff --git a/superblock/lang/pl/strings.php b/superblock/lang/pl/strings.php
index e06891e08..3fe020662 100644
--- a/superblock/lang/pl/strings.php
+++ b/superblock/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Superblock"] = "Superblock";
diff --git a/superblock/lang/pt-br/strings.php b/superblock/lang/pt-br/strings.php
index 34c9f2e06..0a23c4730 100644
--- a/superblock/lang/pt-br/strings.php
+++ b/superblock/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["\"Blockem\" Settings"] = "Configurações do \"Blockem\"";
diff --git a/superblock/lang/ro/strings.php b/superblock/lang/ro/strings.php
index ee0dfee00..f3298a237 100644
--- a/superblock/lang/ro/strings.php
+++ b/superblock/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["\"Superblock\" Settings"] = "Configurări \"Superblock\"";
diff --git a/superblock/lang/ru/strings.php b/superblock/lang/ru/strings.php
index 4e3b90797..acae21d39 100644
--- a/superblock/lang/ru/strings.php
+++ b/superblock/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Superblock"] = "Superblock";
diff --git a/testdrive/lang/C/messages.po b/testdrive/lang/C/messages.po
index d450b2bce..36bb8069f 100644
--- a/testdrive/lang/C/messages.po
+++ b/testdrive/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-23 17:30+0200\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,20 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: testdrive.php:67
+#: testdrive.php:64
 msgid "Administrator"
 msgstr ""
 
-#: testdrive.php:94
+#: testdrive.php:89
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr ""
 
-#: testdrive.php:95
+#: testdrive.php:90
 msgid "Your Friendica test account is about to expire."
 msgstr ""
 
-#: testdrive.php:96
+#: testdrive.php:91
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -40,5 +40,5 @@ msgid ""
 "Friendica website for your integrated social communications. A list of "
 "public sites is available at %s/siteinfo - and for more information on "
 "setting up your own Friendica server please see the Friendica project "
-"website at http://friendica.com."
+"website at https://friendi.ca."
 msgstr ""
diff --git a/testdrive/lang/cs/strings.php b/testdrive/lang/cs/strings.php
index d2d36aabd..abdc9e858 100644
--- a/testdrive/lang/cs/strings.php
+++ b/testdrive/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["Administrator"] = "Administrátor";
diff --git a/testdrive/lang/de/strings.php b/testdrive/lang/de/strings.php
index 0ba2b0354..4f7d822bb 100644
--- a/testdrive/lang/de/strings.php
+++ b/testdrive/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Administrator"] = "Administrator";
diff --git a/testdrive/lang/es/strings.php b/testdrive/lang/es/strings.php
index 2292d3fd8..f91f26a8d 100644
--- a/testdrive/lang/es/strings.php
+++ b/testdrive/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Administrator"] = "Administrador";
diff --git a/testdrive/lang/fi-fi/strings.php b/testdrive/lang/fi-fi/strings.php
index f2942692c..87c536a17 100644
--- a/testdrive/lang/fi-fi/strings.php
+++ b/testdrive/lang/fi-fi/strings.php
@@ -3,10 +3,9 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Administrator"] = "Ylläpitäjä";
 $a->strings["Your account on %s will expire in a few days."] = "%s -tilisi vanhenee muutaman päivän kuluttua.";
 $a->strings["Your Friendica test account is about to expire."] = "Koetilisi Friendicassa umpeutuu kohta.";
-$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "";
diff --git a/testdrive/lang/it/strings.php b/testdrive/lang/it/strings.php
index 517702bfd..43e18bf2f 100644
--- a/testdrive/lang/it/strings.php
+++ b/testdrive/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Administrator"] = "Amministratore";
diff --git a/testdrive/lang/nl/strings.php b/testdrive/lang/nl/strings.php
index 9c61900d5..6db69a1b4 100644
--- a/testdrive/lang/nl/strings.php
+++ b/testdrive/lang/nl/strings.php
@@ -3,10 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Administrator"] = "Beheerder";
-$a->strings["Your account on %s will expire in a few days."] = "";
-$a->strings["Your Friendica test account is about to expire."] = "";
-$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "";
diff --git a/testdrive/lang/pl/strings.php b/testdrive/lang/pl/strings.php
index f93293fc0..47900eab4 100644
--- a/testdrive/lang/pl/strings.php
+++ b/testdrive/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Administrator"] = "Administrator";
diff --git a/testdrive/lang/ro/strings.php b/testdrive/lang/ro/strings.php
index c647c3c74..f64d845de 100644
--- a/testdrive/lang/ro/strings.php
+++ b/testdrive/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Administrator"] = "Administrator";
diff --git a/testdrive/lang/zh-cn/strings.php b/testdrive/lang/zh-cn/strings.php
index 87dce2189..92f74ba85 100644
--- a/testdrive/lang/zh-cn/strings.php
+++ b/testdrive/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Administrator"] = "管理员";
diff --git a/tictac/lang/C/messages.po b/tictac/lang/C/messages.po
index 5550d6228..8a0ad6c21 100644
--- a/tictac/lang/C/messages.po
+++ b/tictac/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tictac.php:20
+#: tictac.php:16
 msgid "Three Dimensional Tic-Tac-Toe"
 msgstr ""
 
-#: tictac.php:53
+#: tictac.php:49
 msgid "3D Tic-Tac-Toe"
 msgstr ""
 
-#: tictac.php:58
+#: tictac.php:54
 msgid "New game"
 msgstr ""
 
-#: tictac.php:59
+#: tictac.php:55
 msgid "New game with handicap"
 msgstr ""
 
-#: tictac.php:60
+#: tictac.php:56
 msgid ""
 "Three dimensional tic-tac-toe is just like the traditional game except that "
 "it is played on multiple levels simultaneously. "
 msgstr ""
 
-#: tictac.php:61
+#: tictac.php:57
 msgid ""
 "In this case there are three levels. You win by getting three in a row on "
 "any level, as well as up, down, and diagonally across the different levels."
 msgstr ""
 
-#: tictac.php:63
+#: tictac.php:59
 msgid ""
 "The handicap game disables the center position on the middle level because "
 "the player claiming this square often has an unfair advantage."
 msgstr ""
 
-#: tictac.php:182
+#: tictac.php:178
 msgid "You go first..."
 msgstr ""
 
-#: tictac.php:187
+#: tictac.php:183
 msgid "I'm going first this time..."
 msgstr ""
 
-#: tictac.php:193
+#: tictac.php:189
 msgid "You won!"
 msgstr ""
 
-#: tictac.php:199 tictac.php:224
+#: tictac.php:195 tictac.php:220
 msgid "\"Cat\" game!"
 msgstr ""
 
-#: tictac.php:222
+#: tictac.php:218
 msgid "I won!"
 msgstr ""
diff --git a/tictac/lang/cs/strings.php b/tictac/lang/cs/strings.php
index 3913f06d5..d971cd9f6 100644
--- a/tictac/lang/cs/strings.php
+++ b/tictac/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["Three Dimensional Tic-Tac-Toe"] = "Trojrozměrné Tic-Tac-Toe";
diff --git a/tictac/lang/de/strings.php b/tictac/lang/de/strings.php
index dd85990b8..313eb3c08 100644
--- a/tictac/lang/de/strings.php
+++ b/tictac/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Three Dimensional Tic-Tac-Toe"] = "Dreidimensionales Tic-Tac-Toe";
diff --git a/tictac/lang/es/strings.php b/tictac/lang/es/strings.php
index 600c84cf3..1afba6944 100644
--- a/tictac/lang/es/strings.php
+++ b/tictac/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe tridimensional";
diff --git a/tictac/lang/fi-fi/strings.php b/tictac/lang/fi-fi/strings.php
index 2cb1f7d7b..2da919d7b 100644
--- a/tictac/lang/fi-fi/strings.php
+++ b/tictac/lang/fi-fi/strings.php
@@ -2,18 +2,15 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Three Dimensional Tic-Tac-Toe"] = "Kolmiulotteinen ristinolla";
 $a->strings["3D Tic-Tac-Toe"] = "3D ristinolla";
 $a->strings["New game"] = "Uusi peli";
 $a->strings["New game with handicap"] = "Uusi peli haitalla";
-$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "";
-$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "";
-$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "";
 $a->strings["You go first..."] = "Aloita sinä...";
 $a->strings["I'm going first this time..."] = "Minä aloitan...";
 $a->strings["You won!"] = "Sinä voitit!";
-$a->strings["\"Cat\" game!"] = "";
 $a->strings["I won!"] = "Minä voitin!";
diff --git a/tictac/lang/fr/strings.php b/tictac/lang/fr/strings.php
index a5b2a1b83..d0f96bb1f 100644
--- a/tictac/lang/fr/strings.php
+++ b/tictac/lang/fr/strings.php
@@ -3,18 +3,8 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
-$a->strings["Three Dimensional Tic-Tac-Toe"] = "";
-$a->strings["3D Tic-Tac-Toe"] = "";
-$a->strings["New game"] = "";
-$a->strings["New game with handicap"] = "";
-$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "";
-$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "";
-$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "";
-$a->strings["You go first..."] = "";
-$a->strings["I'm going first this time..."] = "";
 $a->strings["You won!"] = "Vous avez gagné !";
-$a->strings["\"Cat\" game!"] = "";
 $a->strings["I won!"] = "J’ai gagné !";
diff --git a/tictac/lang/it/strings.php b/tictac/lang/it/strings.php
index 145066367..37c340829 100644
--- a/tictac/lang/it/strings.php
+++ b/tictac/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe tridimensionale";
diff --git a/tictac/lang/nl/strings.php b/tictac/lang/nl/strings.php
index ad0d122e0..1e763807e 100644
--- a/tictac/lang/nl/strings.php
+++ b/tictac/lang/nl/strings.php
@@ -3,18 +3,8 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Three Dimensional Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
 $a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe ";
-$a->strings["New game"] = "";
-$a->strings["New game with handicap"] = "";
-$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "";
-$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "";
-$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "";
-$a->strings["You go first..."] = "";
-$a->strings["I'm going first this time..."] = "";
-$a->strings["You won!"] = "";
-$a->strings["\"Cat\" game!"] = "";
-$a->strings["I won!"] = "";
diff --git a/tictac/lang/pl/strings.php b/tictac/lang/pl/strings.php
index de3646ac4..53911b799 100644
--- a/tictac/lang/pl/strings.php
+++ b/tictac/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Three Dimensional Tic-Tac-Toe"] = "Trójwymiarowe Kółko i Krzyżyk";
diff --git a/tictac/lang/pt-br/strings.php b/tictac/lang/pt-br/strings.php
index 55d91195a..20f9211b1 100644
--- a/tictac/lang/pt-br/strings.php
+++ b/tictac/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Three Dimensional Tic-Tac-Toe"] = "Jogo da Velha Tridimensional";
diff --git a/tictac/lang/ro/strings.php b/tictac/lang/ro/strings.php
index 5b0c79e69..52f03c4f1 100644
--- a/tictac/lang/ro/strings.php
+++ b/tictac/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe Tridimensional";
diff --git a/tumblr/lang/C/messages.po b/tumblr/lang/C/messages.po
index d2e4a909c..5ca9ea58d 100644
--- a/tumblr/lang/C/messages.po
+++ b/tumblr/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,46 +17,54 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tumblr.php:34
+#: tumblr.php:39
 msgid "Permission denied."
 msgstr ""
 
-#: tumblr.php:144
+#: tumblr.php:69 tumblr.php:283
+msgid "Save Settings"
+msgstr ""
+
+#: tumblr.php:71
+msgid "Consumer Key"
+msgstr ""
+
+#: tumblr.php:72
+msgid "Consumer Secret"
+msgstr ""
+
+#: tumblr.php:177
 msgid "You are now authenticated to tumblr."
 msgstr ""
 
-#: tumblr.php:145
+#: tumblr.php:178
 msgid "return to the connector page"
 msgstr ""
 
-#: tumblr.php:158
+#: tumblr.php:194
 msgid "Post to Tumblr"
 msgstr ""
 
-#: tumblr.php:185
-msgid "Tumblr Post Settings"
+#: tumblr.php:224 tumblr.php:228
+msgid "Tumblr Export"
 msgstr ""
 
-#: tumblr.php:188
+#: tumblr.php:232
 msgid "(Re-)Authenticate your tumblr page"
 msgstr ""
 
-#: tumblr.php:192
+#: tumblr.php:236
 msgid "Enable Tumblr Post Addon"
 msgstr ""
 
-#: tumblr.php:197
+#: tumblr.php:242
 msgid "Post to Tumblr by default"
 msgstr ""
 
-#: tumblr.php:217
+#: tumblr.php:263
 msgid "Post to page:"
 msgstr ""
 
-#: tumblr.php:228
+#: tumblr.php:277
 msgid "You are not authenticated to tumblr"
 msgstr ""
-
-#: tumblr.php:233
-msgid "Submit"
-msgstr ""
diff --git a/tumblr/lang/cs/strings.php b/tumblr/lang/cs/strings.php
index 75f8eab1e..7d05b900c 100644
--- a/tumblr/lang/cs/strings.php
+++ b/tumblr/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Permission denied."] = "Přístup odmítnut.";
diff --git a/tumblr/lang/de/strings.php b/tumblr/lang/de/strings.php
index 87fd5c504..8cedc6a7c 100644
--- a/tumblr/lang/de/strings.php
+++ b/tumblr/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Zugriff verweigert.";
diff --git a/tumblr/lang/es/strings.php b/tumblr/lang/es/strings.php
index 12d3d2d2a..43c69a997 100644
--- a/tumblr/lang/es/strings.php
+++ b/tumblr/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Permiso denegado.";
diff --git a/tumblr/lang/fi-fi/strings.php b/tumblr/lang/fi-fi/strings.php
index fe80c0954..48ee87c5a 100644
--- a/tumblr/lang/fi-fi/strings.php
+++ b/tumblr/lang/fi-fi/strings.php
@@ -2,17 +2,14 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Lupa kielletty.";
-$a->strings["You are now authenticated to tumblr."] = "";
-$a->strings["return to the connector page"] = "";
 $a->strings["Post to Tumblr"] = "Lähetä Tumblriin";
 $a->strings["Tumblr Post Settings"] = "Tumblr -viestin asetukset";
-$a->strings["(Re-)Authenticate your tumblr page"] = "";
 $a->strings["Enable Tumblr Post Addon"] = "Ota Tumblr -viestilisäosa käyttöön";
 $a->strings["Post to Tumblr by default"] = "Lähetä Tumblriin oletuksena";
 $a->strings["Post to page:"] = "Julkaise sivulle:";
-$a->strings["You are not authenticated to tumblr"] = "";
 $a->strings["Submit"] = "Lähetä";
diff --git a/tumblr/lang/it/strings.php b/tumblr/lang/it/strings.php
index 3cf0c9519..797494b85 100644
--- a/tumblr/lang/it/strings.php
+++ b/tumblr/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Permesso negato.";
diff --git a/tumblr/lang/nl/strings.php b/tumblr/lang/nl/strings.php
index c3661dffc..42e62e125 100644
--- a/tumblr/lang/nl/strings.php
+++ b/tumblr/lang/nl/strings.php
@@ -3,17 +3,11 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Permission denied."] = "Toegang geweigerd.";
 $a->strings["You are now authenticated to tumblr."] = "Je bent nu aangemeld bij tumblr";
-$a->strings["return to the connector page"] = "";
-$a->strings["Post to Tumblr"] = "";
-$a->strings["Tumblr Post Settings"] = "";
-$a->strings["(Re-)Authenticate your tumblr page"] = "";
 $a->strings["Enable Tumblr Post Addon"] = "Tumblr Post Addon inschakelen";
 $a->strings["Post to Tumblr by default"] = "Plaatsen op Tumblr als standaard instellen ";
 $a->strings["Post to page:"] = "Plaats op pagina:";
-$a->strings["You are not authenticated to tumblr"] = "";
-$a->strings["Submit"] = "";
diff --git a/tumblr/lang/pl/strings.php b/tumblr/lang/pl/strings.php
index 127d8d81b..a4e2baaae 100644
--- a/tumblr/lang/pl/strings.php
+++ b/tumblr/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Permission denied."] = "Odmowa dostępu.";
diff --git a/tumblr/lang/pt-br/strings.php b/tumblr/lang/pt-br/strings.php
index f77c85f20..35ab991fc 100644
--- a/tumblr/lang/pt-br/strings.php
+++ b/tumblr/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Permission denied."] = "Permissão negada.";
diff --git a/tumblr/lang/ro/strings.php b/tumblr/lang/ro/strings.php
index 60f96432f..5fe3a95a7 100644
--- a/tumblr/lang/ro/strings.php
+++ b/tumblr/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Permission denied."] = "Permisiune refuzată.";
diff --git a/twitter/lang/C/messages.po b/twitter/lang/C/messages.po
index ec200a31a..cbb77a492 100644
--- a/twitter/lang/C/messages.po
+++ b/twitter/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-23 02:00-0400\n"
+"POT-Creation-Date: 2021-02-01 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
 msgid "Copy the PIN from Twitter here"
 msgstr ""
 
-#: twitter.php:322 twitter.php:377 twitter.php:757
+#: twitter.php:322 twitter.php:377 twitter.php:768
 msgid "Save Settings"
 msgstr ""
 
@@ -115,15 +115,15 @@ msgid ""
 "recreate this contact when they post again."
 msgstr ""
 
-#: twitter.php:759
+#: twitter.php:770
 msgid "Consumer key"
 msgstr ""
 
-#: twitter.php:760
+#: twitter.php:771
 msgid "Consumer secret"
 msgstr ""
 
-#: twitter.php:945
+#: twitter.php:967
 #, php-format
 msgid "%s on Twitter"
 msgstr ""
diff --git a/twitter/lang/cs/strings.php b/twitter/lang/cs/strings.php
index e6aeedfd8..a4eb45660 100644
--- a/twitter/lang/cs/strings.php
+++ b/twitter/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Twitter"] = "Poslat příspěvek na Twitter";
diff --git a/twitter/lang/de/strings.php b/twitter/lang/de/strings.php
index aa6b0e7d4..26304e724 100644
--- a/twitter/lang/de/strings.php
+++ b/twitter/lang/de/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Twitter"] = "Auf Twitter veröffentlichen";
diff --git a/twitter/lang/en-gb/strings.php b/twitter/lang/en-gb/strings.php
index b03fbe8ec..c2a003009 100644
--- a/twitter/lang/en-gb/strings.php
+++ b/twitter/lang/en-gb/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Twitter"] = "Post to Twitter";
diff --git a/twitter/lang/es/strings.php b/twitter/lang/es/strings.php
index 812e646be..07c93a18b 100644
--- a/twitter/lang/es/strings.php
+++ b/twitter/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Twitter"] = "Entrada para Twitter";
diff --git a/twitter/lang/fi-fi/strings.php b/twitter/lang/fi-fi/strings.php
index d8b9fab20..4ae9a852e 100644
--- a/twitter/lang/fi-fi/strings.php
+++ b/twitter/lang/fi-fi/strings.php
@@ -3,23 +3,17 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Twitter"] = "Lähetä Twitteriin";
-$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "";
 $a->strings["Twitter settings updated."] = "Twitter -asetukset päivitetty.";
 $a->strings["Twitter Import/Export/Mirror"] = "Twitter tuonti/vienti/peili";
 $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Twitter -kuluttajan avainparia ei löytynyt. Ota yhteyttä sivuston ylläpitäjään.";
-$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 <strong>public</strong> posts will be posted to Twitter."] = "";
 $a->strings["Log in with Twitter"] = "Kirjaudu sisään Twitterillä";
-$a->strings["Copy the PIN from Twitter here"] = "";
 $a->strings["Save Settings"] = "Tallenna asetukset";
-$a->strings["Currently connected to: "] = "";
 $a->strings["Disconnect"] = "Katkaise yhteys";
 $a->strings["Allow posting to Twitter"] = "Salli julkaisu Twitteriin";
-$a->strings["If enabled all your <strong>public</strong> 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."] = "";
-$a->strings["<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) 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."] = "";
 $a->strings["Send public postings to Twitter by default"] = "Lähetä oletuksena kaikki julkiset julkaisut Twitteriin";
 $a->strings["Mirror all posts from twitter that are no replies"] = "Peilaa kaikki julkaisut Twitteristä jotka eivät ole vastauksia";
 $a->strings["Import the remote timeline"] = "Tuo etäaikajana";
diff --git a/twitter/lang/fr/strings.php b/twitter/lang/fr/strings.php
index d79c5cf96..28f112630 100644
--- a/twitter/lang/fr/strings.php
+++ b/twitter/lang/fr/strings.php
@@ -2,28 +2,18 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Post to Twitter"] = "Publier sur Twitter";
 $a->strings["Twitter settings updated."] = "Paramètres Twitter mis à jour.";
 $a->strings["Twitter Posting Settings"] = "Paramètres Twitter de publication";
-$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "";
-$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 <strong>public</strong> posts will be posted to Twitter."] = "";
 $a->strings["Log in with Twitter"] = "Se connecter avec Twitter";
 $a->strings["Copy the PIN from Twitter here"] = "Copier le PIN de Twitter ici";
 $a->strings["Submit"] = "Soumettre";
 $a->strings["Currently connected to: "] = "Actuellement connecté à :";
-$a->strings["If enabled all your <strong>public</strong> 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."] = "";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) 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."] = "";
 $a->strings["Allow posting to Twitter"] = "Autoriser la publication sur Twitter";
 $a->strings["Send public postings to Twitter by default"] = "Envoyer par défaut les messages publics sur Twitter";
-$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "";
-$a->strings["Shortening method that optimizes the tweet"] = "";
-$a->strings["Send linked #-tags and @-names to Twitter"] = "";
-$a->strings["Clear OAuth configuration"] = "";
 $a->strings["Settings updated."] = "Paramètres mis à jour.";
-$a->strings["Consumer key"] = "";
-$a->strings["Consumer secret"] = "";
 $a->strings["Name of the Twitter Application"] = "Nom de l'application Twitter";
-$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "";
diff --git a/twitter/lang/it/strings.php b/twitter/lang/it/strings.php
index 29a45b1ff..998578f65 100644
--- a/twitter/lang/it/strings.php
+++ b/twitter/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Twitter"] = "Invia a Twitter";
diff --git a/twitter/lang/ja/strings.php b/twitter/lang/ja/strings.php
index f30a36fa4..db9ef932d 100644
--- a/twitter/lang/ja/strings.php
+++ b/twitter/lang/ja/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ja")) {
 function string_plural_select_ja($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Post to Twitter"] = "Twitterに投稿";
diff --git a/twitter/lang/nl/strings.php b/twitter/lang/nl/strings.php
index 94257ca97..77cd84061 100644
--- a/twitter/lang/nl/strings.php
+++ b/twitter/lang/nl/strings.php
@@ -3,29 +3,13 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Twitter"] = "Plaatsen op Twitter";
-$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "";
 $a->strings["Twitter settings updated."] = "Twitter instellingen opgeslagen";
 $a->strings["Twitter Import/Export/Mirror"] = "Twitter Import/Exporteren/Spiegelen";
-$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "";
-$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 <strong>public</strong> posts will be posted to Twitter."] = "";
-$a->strings["Log in with Twitter"] = "";
-$a->strings["Copy the PIN from Twitter here"] = "";
 $a->strings["Save Settings"] = "Instellingen opslaan";
-$a->strings["Currently connected to: "] = "";
-$a->strings["Disconnect"] = "";
 $a->strings["Allow posting to Twitter"] = "Plaatsen op Twitter toestaan";
-$a->strings["If enabled all your <strong>public</strong> 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."] = "";
-$a->strings["<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) 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."] = "";
 $a->strings["Send public postings to Twitter by default"] = "Verzend publieke berichten naar Twitter als standaard instellen ";
-$a->strings["Mirror all posts from twitter that are no replies"] = "";
-$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."] = "";
-$a->strings["Twitter post failed. Queued for retry."] = "";
 $a->strings["Settings updated."] = "Instellingen opgeslagen";
-$a->strings["Consumer key"] = "";
-$a->strings["Consumer secret"] = "";
diff --git a/twitter/lang/pl/strings.php b/twitter/lang/pl/strings.php
index c8a2fcc21..3aacaa05b 100644
--- a/twitter/lang/pl/strings.php
+++ b/twitter/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Twitter"] = "Opublikuj na Twitterze";
diff --git a/twitter/lang/pt-br/strings.php b/twitter/lang/pt-br/strings.php
index 698b761e2..4347b4d24 100644
--- a/twitter/lang/pt-br/strings.php
+++ b/twitter/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Post to Twitter"] = "Publicar no Twitter";
@@ -15,15 +16,6 @@ $a->strings["Copy the PIN from Twitter here"] = "Cole o código de verificação
 $a->strings["Submit"] = "Enviar";
 $a->strings["Currently connected to: "] = "Atualmente conectado a:";
 $a->strings["If enabled all your <strong>public</strong> 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."] = "Se habilitado, todos os seus posts <strong>públicos</strong> poderão ser replicados na conta do Twitter associada. Você pode escolher entre fazer isso por padrão (aqui) ou separadamente, quando escrever cada mensagem, nas opções de publicação.";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) 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."] = "";
 $a->strings["Allow posting to Twitter"] = "Permitir a publicação no Twitter";
 $a->strings["Send public postings to Twitter by default"] = "Publicar posts públicos no Twitter por padrão";
-$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "";
-$a->strings["Shortening method that optimizes the tweet"] = "";
-$a->strings["Send linked #-tags and @-names to Twitter"] = "";
-$a->strings["Clear OAuth configuration"] = "";
 $a->strings["Settings updated."] = "As configurações foram atualizadas.";
-$a->strings["Consumer key"] = "";
-$a->strings["Consumer secret"] = "";
-$a->strings["Name of the Twitter Application"] = "";
-$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "";
diff --git a/twitter/lang/ro/strings.php b/twitter/lang/ro/strings.php
index 36a36e8c5..d01f37be4 100644
--- a/twitter/lang/ro/strings.php
+++ b/twitter/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Post to Twitter"] = "Postați pe Twitter";
diff --git a/twitter/lang/ru/strings.php b/twitter/lang/ru/strings.php
index 39e61e4ec..f5ebe11fa 100644
--- a/twitter/lang/ru/strings.php
+++ b/twitter/lang/ru/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	$n = intval($n);
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Twitter"] = "Отправить в Twitter";
diff --git a/twitter/lang/zh-cn/strings.php b/twitter/lang/zh-cn/strings.php
index 142679526..629d615fc 100644
--- a/twitter/lang/zh-cn/strings.php
+++ b/twitter/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Post to Twitter"] = "发帖到Twitter";
diff --git a/viewsrc/lang/C/messages.po b/viewsrc/lang/C/messages.po
index 8d2c21675..2516817cd 100644
--- a/viewsrc/lang/C/messages.po
+++ b/viewsrc/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: viewsrc.php:39
+#: viewsrc.php:49
 msgid "View Source"
 msgstr ""
diff --git a/viewsrc/lang/cs/strings.php b/viewsrc/lang/cs/strings.php
index 6ac28bcfd..f8fd3ed82 100644
--- a/viewsrc/lang/cs/strings.php
+++ b/viewsrc/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["View Source"] = "Zobrazit zdroj";
diff --git a/viewsrc/lang/fi-fi/strings.php b/viewsrc/lang/fi-fi/strings.php
index 67f25b182..558f8da46 100644
--- a/viewsrc/lang/fi-fi/strings.php
+++ b/viewsrc/lang/fi-fi/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["View Source"] = "Näytä lähde";
diff --git a/viewsrc/lang/fr/strings.php b/viewsrc/lang/fr/strings.php
index a4abe2daf..2661631cf 100644
--- a/viewsrc/lang/fr/strings.php
+++ b/viewsrc/lang/fr/strings.php
@@ -1,2 +1,9 @@
 <?php
 
+if(! function_exists("string_plural_select_fr")) {
+function string_plural_select_fr($n){
+	$n = intval($n);
+	return intval($n > 1);
+}}
+;
+$a->strings["View Source"] = "Voir source";
diff --git a/viewsrc/lang/hu/strings.php b/viewsrc/lang/hu/strings.php
index 171dfeeed..07d5edb51 100644
--- a/viewsrc/lang/hu/strings.php
+++ b/viewsrc/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["View Source"] = "Forrás megtekintése";
diff --git a/viewsrc/lang/is/strings.php b/viewsrc/lang/is/strings.php
index d67368df0..f84f269b8 100644
--- a/viewsrc/lang/is/strings.php
+++ b/viewsrc/lang/is/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return ($n % 10 != 1 || $n % 100 == 11);;
+	return intval($n % 10 != 1 || $n % 100 == 11);
 }}
 ;
 $a->strings["View Source"] = "Skoða uppruna";
diff --git a/viewsrc/lang/it/strings.php b/viewsrc/lang/it/strings.php
index 09b93909e..d4c3b79a5 100644
--- a/viewsrc/lang/it/strings.php
+++ b/viewsrc/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["View Source"] = "Vedi Sorgente";
diff --git a/viewsrc/lang/nb-no/strings.php b/viewsrc/lang/nb-no/strings.php
index 4528985f9..a747b57d1 100644
--- a/viewsrc/lang/nb-no/strings.php
+++ b/viewsrc/lang/nb-no/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nb_no")) {
 function string_plural_select_nb_no($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["View Source"] = "Se kilde";
diff --git a/viewsrc/lang/nl/strings.php b/viewsrc/lang/nl/strings.php
index c64e24c0e..bcc240533 100644
--- a/viewsrc/lang/nl/strings.php
+++ b/viewsrc/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["View Source"] = "Bekijk Bron";
diff --git a/viewsrc/lang/pl/strings.php b/viewsrc/lang/pl/strings.php
index 3b8f56abc..0349e2b22 100644
--- a/viewsrc/lang/pl/strings.php
+++ b/viewsrc/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["View Source"] = "Pokaż źródło";
diff --git a/viewsrc/lang/ru/strings.php b/viewsrc/lang/ru/strings.php
index 345462c4c..89e75e217 100644
--- a/viewsrc/lang/ru/strings.php
+++ b/viewsrc/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["View Source"] = "Показать исходник";
diff --git a/viewsrc/lang/zh-cn/strings.php b/viewsrc/lang/zh-cn/strings.php
index 33fc82220..6e986992e 100644
--- a/viewsrc/lang/zh-cn/strings.php
+++ b/viewsrc/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["View Source"] = "查看源码";
diff --git a/webrtc/lang/C/messages.po b/webrtc/lang/C/messages.po
index a690269d4..11171c849 100644
--- a/webrtc/lang/C/messages.po
+++ b/webrtc/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"POT-Creation-Date: 2021-02-01 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,40 +17,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: webrtc.php:20
+#: webrtc.php:19
 msgid "WebRTC Videochat"
 msgstr ""
 
-#: webrtc.php:26
+#: webrtc.php:25
 msgid "Save Settings"
 msgstr ""
 
-#: webrtc.php:27
+#: webrtc.php:26
 msgid "WebRTC Base URL"
 msgstr ""
 
-#: webrtc.php:27
+#: webrtc.php:26
 msgid ""
 "Page your users will create a WebRTC chat room on. For example you could use "
 "https://live.mayfirst.org ."
 msgstr ""
 
-#: webrtc.php:33
-msgid "Settings updated."
-msgstr ""
-
-#: webrtc.php:47
+#: webrtc.php:45
 msgid "Video Chat"
 msgstr ""
 
-#: webrtc.php:48
+#: webrtc.php:46
 msgid ""
 "WebRTC is a video and audio conferencing tool that works with Firefox "
 "(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
 "create a new chat room and send the link to someone you want to chat with."
 msgstr ""
 
-#: webrtc.php:50
+#: webrtc.php:48
 msgid ""
 "Please contact your friendica admin and send a reminder to configure the "
 "WebRTC addon."
diff --git a/webrtc/lang/cs/strings.php b/webrtc/lang/cs/strings.php
index e8a973151..b417c6cab 100644
--- a/webrtc/lang/cs/strings.php
+++ b/webrtc/lang/cs/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	$n = intval($n);
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 ;
 $a->strings["WebRTC Videochat"] = "WebRTC Videochat";
diff --git a/webrtc/lang/de/strings.php b/webrtc/lang/de/strings.php
index c94de4803..5d0c409e4 100644
--- a/webrtc/lang/de/strings.php
+++ b/webrtc/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["WebRTC Videochat"] = "WebRTC Videochat";
diff --git a/webrtc/lang/es/strings.php b/webrtc/lang/es/strings.php
index 7c79f35db..8ef6cde65 100644
--- a/webrtc/lang/es/strings.php
+++ b/webrtc/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["WebRTC Videochat"] = "WebRTC Videochat";
diff --git a/webrtc/lang/fi-fi/strings.php b/webrtc/lang/fi-fi/strings.php
index edf6f18a4..9c5337272 100644
--- a/webrtc/lang/fi-fi/strings.php
+++ b/webrtc/lang/fi-fi/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["WebRTC Videochat"] = "WebRTC videokeskustelu";
@@ -12,5 +12,4 @@ $a->strings["WebRTC Base URL"] = "WebRTC perus-URL-osoite";
 $a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "Sivusto jolla käyttäjäsi luo WebRTC -chattihuoneen. Esim. https://live.mayfirst.org";
 $a->strings["Settings updated."] = "Asetukset päivitetty.";
 $a->strings["Video Chat"] = "Videokeskustelu";
-$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "";
 $a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Ota yhteyttä Friendica -ylläpitäjääsi ja pyydä heitä asentamaan WebRTC -lisäosan.";
diff --git a/webrtc/lang/it/strings.php b/webrtc/lang/it/strings.php
index 4783ad859..6b227dc3a 100644
--- a/webrtc/lang/it/strings.php
+++ b/webrtc/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["WebRTC Videochat"] = "Chat video WebRTC";
diff --git a/webrtc/lang/nl/strings.php b/webrtc/lang/nl/strings.php
index 943551be1..5f7b02979 100644
--- a/webrtc/lang/nl/strings.php
+++ b/webrtc/lang/nl/strings.php
@@ -3,14 +3,9 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["WebRTC Videochat"] = "WebRTC Videochat";
 $a->strings["Save Settings"] = "Instellingen opslaan";
-$a->strings["WebRTC Base URL"] = "";
-$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "";
 $a->strings["Settings updated."] = "Instellingen opgeslagen";
-$a->strings["Video Chat"] = "";
-$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "";
-$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "";
diff --git a/webrtc/lang/pl/strings.php b/webrtc/lang/pl/strings.php
index d9fdc635b..5b39ed95a 100644
--- a/webrtc/lang/pl/strings.php
+++ b/webrtc/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["WebRTC Videochat"] = "Videochat WebRTC";
diff --git a/webrtc/lang/ro/strings.php b/webrtc/lang/ro/strings.php
index 6afbbc930..ed39a26b5 100644
--- a/webrtc/lang/ro/strings.php
+++ b/webrtc/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["WebRTC Videochat"] = "Videochat WebRTC ";
diff --git a/webrtc/lang/zh-cn/strings.php b/webrtc/lang/zh-cn/strings.php
index 1d41cd169..587ffecb4 100644
--- a/webrtc/lang/zh-cn/strings.php
+++ b/webrtc/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["WebRTC Videochat"] = "WebRTC 视频通话";
diff --git a/widgets/lang/C/messages.po b/widgets/lang/C/messages.po
index 79a7a4028..71a306886 100644
--- a/widgets/lang/C/messages.po
+++ b/widgets/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2021-02-01 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,42 +16,42 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-#"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: widget_like.php:59
-#, php-format
-msgid "%d person likes this"
-msgid_plural "%d people like this"
-msgstr[0] ""
-msgstr[1] ""
 
-#: widget_like.php:62
+#: widget_friendheader.php:50
+msgid "Get added to this list!"
+msgstr ""
+
+#: widget_friends.php:53
+msgid "Connect on Friendica!"
+msgstr ""
+
+#: widget_like.php:56
 #, php-format
 msgid "%d person doesn't like this"
 msgid_plural "%d people don't like this"
 msgstr[0] ""
 msgstr[1] ""
 
-#: widget_friends.php:40
-msgid "Connect on Friendica!"
-msgstr ""
+#: widget_like.php:66
+#, php-format
+msgid "%d person likes this"
+msgid_plural "%d people like this"
+msgstr[0] ""
+msgstr[1] ""
 
-#: widgets.php:57
+#: widgets.php:59
 msgid "Generate new key"
 msgstr ""
 
-#: widgets.php:60
+#: widgets.php:61
 msgid "Widgets key"
 msgstr ""
 
-#: widgets.php:62
+#: widgets.php:63
 msgid "Widgets available"
 msgstr ""
 
 #: widgets.php:124
 msgid "Addon Settings"
 msgstr ""
-
-#: widget_friendheader.php:40
-msgid "Get added to this list!"
-msgstr ""
diff --git a/windowsphonepush/lang/C/messages.po b/windowsphonepush/lang/C/messages.po
index 8643694aa..9beefa87c 100644
--- a/windowsphonepush/lang/C/messages.po
+++ b/windowsphonepush/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-26 15:02+0100\n"
+"POT-Creation-Date: 2021-02-01 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,22 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: windowsphonepush.php:85
-msgid "WindowsPhonePush settings updated."
-msgstr ""
-
-#: windowsphonepush.php:114
+#: windowsphonepush.php:108
 msgid "WindowsPhonePush Settings"
 msgstr ""
 
-#: windowsphonepush.php:117
+#: windowsphonepush.php:111
 msgid "Enable WindowsPhonePush Addon"
 msgstr ""
 
-#: windowsphonepush.php:122
+#: windowsphonepush.php:116
 msgid "Push text of new item"
 msgstr ""
 
-#: windowsphonepush.php:127
+#: windowsphonepush.php:121
 msgid "Save Settings"
 msgstr ""
diff --git a/windowsphonepush/lang/cs/strings.php b/windowsphonepush/lang/cs/strings.php
index 1afd57ff7..37333f14f 100644
--- a/windowsphonepush/lang/cs/strings.php
+++ b/windowsphonepush/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["WindowsPhonePush settings updated."] = "Nastavení WindowsPhonePush aktualizována";
diff --git a/windowsphonepush/lang/de/strings.php b/windowsphonepush/lang/de/strings.php
index e03a0bd73..4c1524b50 100644
--- a/windowsphonepush/lang/de/strings.php
+++ b/windowsphonepush/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["WindowsPhonePush settings updated."] = "WindowsPhonePush Einstellungen aktualisiert.";
diff --git a/windowsphonepush/lang/es/strings.php b/windowsphonepush/lang/es/strings.php
index b1a1bd37a..d05076f47 100644
--- a/windowsphonepush/lang/es/strings.php
+++ b/windowsphonepush/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["WindowsPhonePush settings updated."] = "Ajustes de WindowsPhonePush actualizados.";
diff --git a/windowsphonepush/lang/fi-fi/strings.php b/windowsphonepush/lang/fi-fi/strings.php
index 3383a021c..f4fa90d7b 100644
--- a/windowsphonepush/lang/fi-fi/strings.php
+++ b/windowsphonepush/lang/fi-fi/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["WindowsPhonePush settings updated."] = "WindowsPhonePush -asetuket päivitetty.";
diff --git a/windowsphonepush/lang/fr/strings.php b/windowsphonepush/lang/fr/strings.php
index a23fabb18..17298ad11 100644
--- a/windowsphonepush/lang/fr/strings.php
+++ b/windowsphonepush/lang/fr/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["WindowsPhonePush settings updated."] = "Paramètres WindowsPhonePush mis à jour";
diff --git a/windowsphonepush/lang/hu/strings.php b/windowsphonepush/lang/hu/strings.php
index 6fff28796..168684241 100644
--- a/windowsphonepush/lang/hu/strings.php
+++ b/windowsphonepush/lang/hu/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_hu")) {
 function string_plural_select_hu($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["WindowsPhonePush settings updated."] = "A WindowsPhonePush beállításai frissítve.";
diff --git a/windowsphonepush/lang/it/strings.php b/windowsphonepush/lang/it/strings.php
index a45c2c7f5..733ed9c3f 100644
--- a/windowsphonepush/lang/it/strings.php
+++ b/windowsphonepush/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["WindowsPhonePush settings updated."] = "Impostazioni WindowsPhonePush aggiornate.";
diff --git a/windowsphonepush/lang/nl/strings.php b/windowsphonepush/lang/nl/strings.php
index 1ac1b7170..ea334b649 100644
--- a/windowsphonepush/lang/nl/strings.php
+++ b/windowsphonepush/lang/nl/strings.php
@@ -3,11 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["WindowsPhonePush settings updated."] = "WindowsPhonePush instellingen opgeslagen";
 $a->strings["WindowsPhonePush Settings"] = "WindowsPhonePush instellingen";
 $a->strings["Enable WindowsPhonePush Addon"] = "WindowsPhonePush Addon inschakelen";
-$a->strings["Push text of new item"] = "";
 $a->strings["Save Settings"] = "Instellingen opslaan";
diff --git a/windowsphonepush/lang/ro/strings.php b/windowsphonepush/lang/ro/strings.php
index 819ef6fe5..5dc60c2d2 100644
--- a/windowsphonepush/lang/ro/strings.php
+++ b/windowsphonepush/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["WindowsPhonePush settings updated."] = "Configurări  WindowsPhonePush actualizate.";
diff --git a/windowsphonepush/lang/zh-cn/strings.php b/windowsphonepush/lang/zh-cn/strings.php
index 3782a3142..ad6e43d2a 100644
--- a/windowsphonepush/lang/zh-cn/strings.php
+++ b/windowsphonepush/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["WindowsPhonePush settings updated."] = "WindowsPhonePush 设置已更新。";
diff --git a/wppost/lang/C/messages.po b/wppost/lang/C/messages.po
index 92bc721d4..cc3ed548f 100644
--- a/wppost/lang/C/messages.po
+++ b/wppost/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 21:06+0100\n"
+"POT-Creation-Date: 2021-02-01 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: wppost.php:42
+#: wppost.php:39
 msgid "Post to Wordpress"
 msgstr ""
 
@@ -29,44 +29,44 @@ msgstr ""
 msgid "Enable WordPress Post Addon"
 msgstr ""
 
-#: wppost.php:92
+#: wppost.php:93
 msgid "WordPress username"
 msgstr ""
 
-#: wppost.php:97
+#: wppost.php:98
 msgid "WordPress password"
 msgstr ""
 
-#: wppost.php:102
+#: wppost.php:103
 msgid "WordPress API URL"
 msgstr ""
 
-#: wppost.php:107
+#: wppost.php:108
 msgid "Post to WordPress by default"
 msgstr ""
 
-#: wppost.php:112
+#: wppost.php:114
 msgid "Provide a backlink to the Friendica post"
 msgstr ""
 
-#: wppost.php:116
+#: wppost.php:119
 msgid ""
 "Text for the backlink, e.g. Read the original post and comment stream on "
 "Friendica."
 msgstr ""
 
-#: wppost.php:121
+#: wppost.php:124
 msgid "Don't post messages that are too short"
 msgstr ""
 
-#: wppost.php:127
+#: wppost.php:131
 msgid "Save Settings"
 msgstr ""
 
-#: wppost.php:206
+#: wppost.php:231
 msgid "Read the orig­i­nal post and com­ment stream on Friendica"
 msgstr ""
 
-#: wppost.php:269
+#: wppost.php:289
 msgid "Post from Friendica"
 msgstr ""
diff --git a/wppost/lang/cs/strings.php b/wppost/lang/cs/strings.php
index 6ed8f6c47..b56616fa6 100644
--- a/wppost/lang/cs/strings.php
+++ b/wppost/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Wordpress"] = "Odesílat na WordPress";
diff --git a/wppost/lang/de/strings.php b/wppost/lang/de/strings.php
index 57ae6afeb..9591b02d5 100644
--- a/wppost/lang/de/strings.php
+++ b/wppost/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Wordpress"] = "Bei WordPress veröffentlichen";
diff --git a/wppost/lang/es/strings.php b/wppost/lang/es/strings.php
index fab68021a..499e422e5 100644
--- a/wppost/lang/es/strings.php
+++ b/wppost/lang/es/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Wordpress"] = "Publicar en Wordpress";
diff --git a/wppost/lang/fi-fi/strings.php b/wppost/lang/fi-fi/strings.php
index 0d1353d8d..0beef11b3 100644
--- a/wppost/lang/fi-fi/strings.php
+++ b/wppost/lang/fi-fi/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Wordpress"] = "Lähetä WordPressiin";
diff --git a/wppost/lang/it/strings.php b/wppost/lang/it/strings.php
index 0b9674a0b..a23788f06 100644
--- a/wppost/lang/it/strings.php
+++ b/wppost/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Wordpress"] = "Invia a Wordpress";
diff --git a/wppost/lang/nl/strings.php b/wppost/lang/nl/strings.php
index d838cccd9..315326c09 100644
--- a/wppost/lang/nl/strings.php
+++ b/wppost/lang/nl/strings.php
@@ -3,19 +3,13 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["Post to Wordpress"] = "Plaatsen op Wordpress";
 $a->strings["Wordpress Export"] = "Wordpress Exporteren";
 $a->strings["Enable WordPress Post Addon"] = "Wordpress Post Addon Inschakelen";
-$a->strings["WordPress username"] = "";
-$a->strings["WordPress password"] = "";
-$a->strings["WordPress API URL"] = "";
 $a->strings["Post to WordPress by default"] = "Plaatsen op Wordpress als standaard instellen ";
 $a->strings["Provide a backlink to the Friendica post"] = "Geef een terugkoppeling naar get Friendica bericht";
-$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "";
 $a->strings["Don't post messages that are too short"] = "Plaats geen berichten die te kort zijn";
 $a->strings["Save Settings"] = "Instellingen opslaan";
-$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "";
-$a->strings["Post from Friendica"] = "";
diff --git a/wppost/lang/pl/strings.php b/wppost/lang/pl/strings.php
index 3c152f487..d87397c73 100644
--- a/wppost/lang/pl/strings.php
+++ b/wppost/lang/pl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	return ($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);;
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["Post to Wordpress"] = "Opublikuj w Wordpress";
diff --git a/wppost/lang/pt-br/strings.php b/wppost/lang/pt-br/strings.php
index fc59fcb38..b332bc1da 100644
--- a/wppost/lang/pt-br/strings.php
+++ b/wppost/lang/pt-br/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	return ($n > 1);;
+	$n = intval($n);
+	return intval($n > 1);
 }}
 ;
 $a->strings["Post to Wordpress"] = "Publicar no Wordpress";
@@ -10,9 +11,5 @@ $a->strings["WordPress Post Settings"] = "Configurações de publicação no Wor
 $a->strings["Enable WordPress Post Addon"] = "Habilitar plug-in para publicar no WordPress";
 $a->strings["WordPress username"] = "Nome de usuário no WordPress";
 $a->strings["WordPress password"] = "Senha do WordPress";
-$a->strings["WordPress API URL"] = "";
 $a->strings["Post to WordPress by default"] = "Publicar no WordPress por padrão";
-$a->strings["Provide a backlink to the Friendica post"] = "";
 $a->strings["Submit"] = "Enviar";
-$a->strings["Post from Friendica"] = "";
-$a->strings["Read the original post and comment stream on Friendica"] = "";
diff --git a/wppost/lang/ro/strings.php b/wppost/lang/ro/strings.php
index fcd0efa43..aa734f727 100644
--- a/wppost/lang/ro/strings.php
+++ b/wppost/lang/ro/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+	$n = intval($n);
+	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
 }}
 ;
 $a->strings["Post to Wordpress"] = "Postați pe Wordpress";
diff --git a/wppost/lang/zh-cn/strings.php b/wppost/lang/zh-cn/strings.php
index e74c598b5..fe8467dde 100644
--- a/wppost/lang/zh-cn/strings.php
+++ b/wppost/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["Post to Wordpress"] = "发布到 Wordpress";
diff --git a/xmpp/lang/C/messages.po b/xmpp/lang/C/messages.po
index a37749d04..5304df2e6 100644
--- a/xmpp/lang/C/messages.po
+++ b/xmpp/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"POT-Creation-Date: 2021-02-01 18:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,41 +17,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: xmpp.php:38
-msgid "XMPP settings updated."
-msgstr ""
-
-#: xmpp.php:63 xmpp.php:67
+#: xmpp.php:57 xmpp.php:61
 msgid "XMPP-Chat (Jabber)"
 msgstr ""
 
-#: xmpp.php:71
+#: xmpp.php:65
 msgid "Enable Webchat"
 msgstr ""
 
-#: xmpp.php:76
+#: xmpp.php:70
 msgid "Individual Credentials"
 msgstr ""
 
-#: xmpp.php:82 xmpp.php:108
+#: xmpp.php:76 xmpp.php:102
 msgid "Jabber BOSH host"
 msgstr ""
 
-#: xmpp.php:91 xmpp.php:107
+#: xmpp.php:85 xmpp.php:101
 msgid "Save Settings"
 msgstr ""
 
-#: xmpp.php:109
+#: xmpp.php:103
 msgid "Use central userbase"
 msgstr ""
 
-#: xmpp.php:109
+#: xmpp.php:103
 msgid ""
 "If enabled, users will automatically login to an ejabberd server that has to "
 "be installed on this machine with synchronized credentials via the "
 "\"auth_ejabberd.php\" script."
 msgstr ""
-
-#: xmpp.php:119
-msgid "Settings updated."
-msgstr ""
diff --git a/xmpp/lang/cs/strings.php b/xmpp/lang/cs/strings.php
index 4601f8906..8574773e3 100644
--- a/xmpp/lang/cs/strings.php
+++ b/xmpp/lang/cs/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["XMPP settings updated."] = "Nastavení XMPP aktualizována";
@@ -13,5 +13,4 @@ $a->strings["Individual Credentials"] = "Jednotlivé kredenciály";
 $a->strings["Jabber BOSH host"] = "BOSH host Jabber";
 $a->strings["Save Settings"] = "Uložit nastavení";
 $a->strings["Use central userbase"] = "Použít centrální uživatelskou základnu";
-$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Pokud tuto funkci povolíte, uživatelé budou automaticky přihlášeni na server ejabberd, který musí být nainstalovaný na tomto serveru se synchronizovanými kredenciálami přes skript \"auth_ejabberd.php\".";
 $a->strings["Settings updated."] = "Nastavení aktualizována";
diff --git a/xmpp/lang/de/strings.php b/xmpp/lang/de/strings.php
index a87850242..920628dc2 100644
--- a/xmpp/lang/de/strings.php
+++ b/xmpp/lang/de/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["XMPP settings updated."] = "XMPP Einstellungen aktualisiert.";
@@ -12,5 +13,4 @@ $a->strings["Individual Credentials"] = "Individuelle Anmeldedaten";
 $a->strings["Jabber BOSH host"] = "Jabber BOSH Host";
 $a->strings["Save Settings"] = "Speichere Einstellungen";
 $a->strings["Use central userbase"] = "Nutze zentrale Nutzerbasis";
-$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Wenn aktiviert, werden die Nutzer automatisch auf dem EJabber Server, der auf dieser Maschine installiert ist, angemeldet und die Zugangsdaten werden über das \"auth_ejabberd.php\"-Script synchronisiert.";
 $a->strings["Settings updated."] = "Einstellungen aktualisiert.";
diff --git a/xmpp/lang/en-us/strings.php b/xmpp/lang/en-us/strings.php
index 1112c27b6..bf50f067b 100644
--- a/xmpp/lang/en-us/strings.php
+++ b/xmpp/lang/en-us/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_en_us")) {
 function string_plural_select_en_us($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["XMPP settings updated."] = "XMPP settings updated.";
@@ -12,5 +13,4 @@ $a->strings["Individual Credentials"] = "Individual Credentials";
 $a->strings["Jabber BOSH host"] = "Jabber BOSH host";
 $a->strings["Save Settings"] = "Save Settings";
 $a->strings["Use central userbase"] = "Use central userbase";
-$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script.";
 $a->strings["Settings updated."] = "Settings updated.";
diff --git a/xmpp/lang/fi-fi/strings.php b/xmpp/lang/fi-fi/strings.php
index fa9aaf295..d00f98c0f 100644
--- a/xmpp/lang/fi-fi/strings.php
+++ b/xmpp/lang/fi-fi/strings.php
@@ -2,15 +2,12 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["XMPP settings updated."] = "XMPP-asetukset päivitetty";
 $a->strings["XMPP-Chat (Jabber)"] = "XMPP-Chat (Jabber)";
 $a->strings["Enable Webchat"] = "Ota Webchat käyttöön";
-$a->strings["Individual Credentials"] = "";
-$a->strings["Jabber BOSH host"] = "";
 $a->strings["Save Settings"] = "Tallenna asetukset";
-$a->strings["Use central userbase"] = "";
-$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "";
 $a->strings["Settings updated."] = "Asetukset päivitetty.";
diff --git a/xmpp/lang/it/strings.php b/xmpp/lang/it/strings.php
index d0bebb7ea..fe43d8fb8 100644
--- a/xmpp/lang/it/strings.php
+++ b/xmpp/lang/it/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	return ($n != 1);;
+	$n = intval($n);
+	return intval($n != 1);
 }}
 ;
 $a->strings["XMPP settings updated."] = "Impostazioni XMPP aggiornate.";
@@ -12,5 +13,4 @@ $a->strings["Individual Credentials"] = "Credenziali Individuali";
 $a->strings["Jabber BOSH host"] = "Server Jabber BOSH";
 $a->strings["Save Settings"] = "Salva Impostazioni";
 $a->strings["Use central userbase"] = "Usa base utenti centrale";
-$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Se abilitato, gli utenti verranno automaticamente autenticati con un server ejabber che deve essere installato su questa macchina, con le credenziali sincronizzate attraverso lo script \"auth_ejabberd.php\"";
 $a->strings["Settings updated."] = "Impostazioni aggiornate.";
diff --git a/xmpp/lang/nl/strings.php b/xmpp/lang/nl/strings.php
index 7b470759e..97b78226b 100644
--- a/xmpp/lang/nl/strings.php
+++ b/xmpp/lang/nl/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return ($n != 1);;
+	return intval($n != 1);
 }}
 ;
 $a->strings["XMPP settings updated."] = "XMPP-instellingen opgeslagen";
@@ -13,5 +13,4 @@ $a->strings["Individual Credentials"] = "Individuele inloggegevens";
 $a->strings["Jabber BOSH host"] = "Jabber BOSH Server";
 $a->strings["Save Settings"] = "Instellingen opslaan";
 $a->strings["Use central userbase"] = "Gebruik centrale gebruikersbank";
-$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Wanneer ingeschakeld zullen gebruikers automatisch inloggen op een ejabberd-server die op deze server moet geïnstalleerd staan, met dezelfde gebruikersnaam en wachtwoord, via het \"auth_ejabberd.php\" script.";
 $a->strings["Settings updated."] = "Instellingen opgeslagen";
diff --git a/xmpp/lang/pl/strings.php b/xmpp/lang/pl/strings.php
index a247b7e13..cca967814 100644
--- a/xmpp/lang/pl/strings.php
+++ b/xmpp/lang/pl/strings.php
@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	return ($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 = intval($n);
+	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["XMPP settings updated."] = "zaktualizowano ustawienia XMPP.";
@@ -12,5 +13,4 @@ $a->strings["Individual Credentials"] = "Indywidualne poświadczenia";
 $a->strings["Jabber BOSH host"] = "Jabber BOSH host";
 $a->strings["Save Settings"] = "Zapisz ustawienia";
 $a->strings["Use central userbase"] = "Użyj centralnej bazy użytkowników";
-$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Jeśli jest włączona, użytkownicy automatycznie logują się do serwera ejabberd, który musi być zainstalowany na tym komputerze z synchronizowanymi danymi uwierzytelniającymi za pomocą skryptu \"auth_ejabberd.php\".";
 $a->strings["Settings updated."] = "Ustawienia zaktualizowane.";
diff --git a/xmpp/lang/pt-br/strings.php b/xmpp/lang/pt-br/strings.php
index c3bd9bb11..eab89d0e4 100644
--- a/xmpp/lang/pt-br/strings.php
+++ b/xmpp/lang/pt-br/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
 	$n = intval($n);
-	return ($n > 1);;
+	return intval($n > 1);
 }}
 ;
 $a->strings["XMPP settings updated."] = "Configurações de XMPP atualizadas.";
@@ -13,5 +13,4 @@ $a->strings["Individual Credentials"] = "Credenciais individuais";
 $a->strings["Jabber BOSH host"] = "Host BOSH de Jabber";
 $a->strings["Save Settings"] = "Salvar configurações";
 $a->strings["Use central userbase"] = "Usar base de usuários central";
-$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Se habilitado, a autenticação será feita automaticamente em um servidor ejabberd, que precisa ser instalado neste computador com credenciais sincronizadas por meio do script \"auth_ejabberd.php\".";
 $a->strings["Settings updated."] = "Configurações atualizadas.";
diff --git a/xmpp/lang/ru/strings.php b/xmpp/lang/ru/strings.php
index 499cb9814..a76acca79 100644
--- a/xmpp/lang/ru/strings.php
+++ b/xmpp/lang/ru/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
 }}
 ;
 $a->strings["XMPP settings updated."] = "Настройки XMPP обновлены.";
@@ -13,5 +13,4 @@ $a->strings["Individual Credentials"] = "Ваши данные для входа
 $a->strings["Jabber BOSH host"] = "BOSH хост";
 $a->strings["Save Settings"] = "Сохранить настройки";
 $a->strings["Use central userbase"] = "Использовать централизованную БД пользователей";
-$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Если включено, то пользователи будут автоматически входить в учетную запись на ejabberd сервере, который должен быть установлен на этом сервере. Учетные данные должны быть синхронизированы с помощью скрипта \"auth_ejabberd.php\".";
 $a->strings["Settings updated."] = "Настройки обновлены.";
diff --git a/xmpp/lang/zh-cn/strings.php b/xmpp/lang/zh-cn/strings.php
index 6f5aace22..951447878 100644
--- a/xmpp/lang/zh-cn/strings.php
+++ b/xmpp/lang/zh-cn/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return 0;;
+	return intval(0);
 }}
 ;
 $a->strings["XMPP settings updated."] = "XMPP 设置已更新。";