Merge branch 'master' into fix-outdated-setting-layouts

Conflicts:
	xmpp/templates/adminSettings.php
	xmpp/templates/userSettings.php

62 files changed, 191 insertions, 61 deletions

diff --git a/user_openid_provider/l10n/ar.php b/user_openid_provider/l10n/ar.php
index 73be9a9c1..c8473b78d 100644
--- a/user_openid_provider/l10n/ar.php
+++ b/user_openid_provider/l10n/ar.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "مواقع المتذكرة لمزود خدمة الدخول المتوازى ",
 "Trusted" => "موثوق",
 "Denied" => "مرفوض",
 "Remove" => "الغى"
 );
+$PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/user_openid_provider/l10n/ast.php b/user_openid_provider/l10n/ast.php
new file mode 100644
index 000000000..35c3b464c
--- /dev/null
+++ b/user_openid_provider/l10n/ast.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"OpenID Provider remembered sites" => "Sitios recordaos del fornidor de OpenID",
+"Trusted" => "Confiáu",
+"Denied" => "Refugáu",
+"Remove" => "Desaniciáu"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/bg_BG.php b/user_openid_provider/l10n/bg_BG.php
index ccbc6810d..fa56ba440 100644
--- a/user_openid_provider/l10n/bg_BG.php
+++ b/user_openid_provider/l10n/bg_BG.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Запомнени сайтове с OpenID доставчика",
 "Trusted" => "Проверени",
 "Denied" => "Отхвърлени",
 "Remove" => "Премахване"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/bn_BD.php b/user_openid_provider/l10n/bn_BD.php
index 28ee982a7..0f08955cb 100644
--- a/user_openid_provider/l10n/bn_BD.php
+++ b/user_openid_provider/l10n/bn_BD.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID সেবা প্রদানকারীর মনে রাখা সাইটগুলো",
 "Trusted" => "বিশ্বস্ত",
 "Denied" => "অস্বীকৃত",
 "Remove" => "অপসারণ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/ca.php b/user_openid_provider/l10n/ca.php
index 96fb88529..602cdfd96 100644
--- a/user_openid_provider/l10n/ca.php
+++ b/user_openid_provider/l10n/ca.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Llocs que recorda el proveïdor OpenID",
 "Trusted" => "Verificat",
 "Denied" => "Denegat",
 "Remove" => "Elimina"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/cs_CZ.php b/user_openid_provider/l10n/cs_CZ.php
index 83113ef7c..f0a71d9cc 100644
--- a/user_openid_provider/l10n/cs_CZ.php
+++ b/user_openid_provider/l10n/cs_CZ.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Známé stránky poskytovatelů OpenID",
 "Trusted" => "Důvěryhodné",
 "Denied" => "Zamítnuté",
 "Remove" => "Odebrat"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/user_openid_provider/l10n/cy_GB.php b/user_openid_provider/l10n/cy_GB.php
index bc3e37e9d..933c4e37f 100644
--- a/user_openid_provider/l10n/cy_GB.php
+++ b/user_openid_provider/l10n/cy_GB.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Safleoedd gofiwyd gan Ddarparwr OpenID",
 "Trusted" => "Dibynadwy",
 "Denied" => "Gwrthodwyd",
 "Remove" => "Gwaredu"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/user_openid_provider/l10n/da.php b/user_openid_provider/l10n/da.php
index 12bdeb286..1f8474614 100644
--- a/user_openid_provider/l10n/da.php
+++ b/user_openid_provider/l10n/da.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "huskede sider af OpenID leverandør",
 "Trusted" => "Betroet",
 "Denied" => "Afvist",
 "Remove" => "Fjern"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/de.php b/user_openid_provider/l10n/de.php
index b13585290..b476ac1ac 100644
--- a/user_openid_provider/l10n/de.php
+++ b/user_openid_provider/l10n/de.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Vom OpenID-Provider gemerkte Seiten",
 "Trusted" => "Vertraut",
 "Denied" => "Verweigert",
 "Remove" => "Entfernen"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/de_CH.php b/user_openid_provider/l10n/de_CH.php
index 263208219..8f990e3dc 100644
--- a/user_openid_provider/l10n/de_CH.php
+++ b/user_openid_provider/l10n/de_CH.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Vom OpenID-Provider gemerkte Seiten",
 "Trusted" => "Vertrauenswürdig",
 "Denied" => "Verweigert",
 "Remove" => "Entfernen"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/de_DE.php b/user_openid_provider/l10n/de_DE.php
index 263208219..8f990e3dc 100644
--- a/user_openid_provider/l10n/de_DE.php
+++ b/user_openid_provider/l10n/de_DE.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Vom OpenID-Provider gemerkte Seiten",
 "Trusted" => "Vertrauenswürdig",
 "Denied" => "Verweigert",
 "Remove" => "Entfernen"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/el.php b/user_openid_provider/l10n/el.php
index 1cc2c7c4b..01b6c26c7 100644
--- a/user_openid_provider/l10n/el.php
+++ b/user_openid_provider/l10n/el.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Ενθυμούμενες ιστοσελίδες Παρόχου OpenID",
 "Trusted" => "Έμπιστοι",
 "Denied" => "Αρνηθέντες",
 "Remove" => "Αφαίρεση"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/en_GB.php b/user_openid_provider/l10n/en_GB.php
index 755006293..780a1cfec 100644
--- a/user_openid_provider/l10n/en_GB.php
+++ b/user_openid_provider/l10n/en_GB.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID Provider remembered sites",
 "Trusted" => "Trusted",
 "Denied" => "Denied",
 "Remove" => "Remove"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/eo.php b/user_openid_provider/l10n/eo.php
index c0c0c1168..72e6b5bb3 100644
--- a/user_openid_provider/l10n/eo.php
+++ b/user_openid_provider/l10n/eo.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Ejoj memorataj de OpenID-provizanto",
 "Trusted" => "Fidataj",
 "Denied" => "Malakceptata",
 "Remove" => "Forigi"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/es.php b/user_openid_provider/l10n/es.php
index b29f6934a..abc4e4e7f 100644
--- a/user_openid_provider/l10n/es.php
+++ b/user_openid_provider/l10n/es.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Sitios recordados del proveedor de OpenID",
 "Trusted" => "Confiado",
 "Denied" => "Denegado",
 "Remove" => "Eliminar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/es_AR.php b/user_openid_provider/l10n/es_AR.php
index dc16a0f3d..1a9f570a4 100644
--- a/user_openid_provider/l10n/es_AR.php
+++ b/user_openid_provider/l10n/es_AR.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Sitios recordados de proveedores OpenID",
 "Trusted" => "Confiables",
 "Denied" => "Denegado",
 "Remove" => "Borrar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/es_MX.php b/user_openid_provider/l10n/es_MX.php
index b29f6934a..abc4e4e7f 100644
--- a/user_openid_provider/l10n/es_MX.php
+++ b/user_openid_provider/l10n/es_MX.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Sitios recordados del proveedor de OpenID",
 "Trusted" => "Confiado",
 "Denied" => "Denegado",
 "Remove" => "Eliminar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/et_EE.php b/user_openid_provider/l10n/et_EE.php
index 37d5a5d52..2ba72cd0d 100644
--- a/user_openid_provider/l10n/et_EE.php
+++ b/user_openid_provider/l10n/et_EE.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID teenusepakkuja poolt meelespeetud saidid",
 "Trusted" => "Usaldatud",
 "Denied" => "Keelatud",
 "Remove" => "Eemalda"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/eu.php b/user_openid_provider/l10n/eu.php
index 8f540cf7e..990b755fa 100644
--- a/user_openid_provider/l10n/eu.php
+++ b/user_openid_provider/l10n/eu.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID Hornitzaileak gogoratutako lekuak",
 "Trusted" => "Fidagarriak",
 "Denied" => "Ukatuta",
 "Remove" => "Ezabatu"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/fa.php b/user_openid_provider/l10n/fa.php
index b320e4d6b..82505e349 100644
--- a/user_openid_provider/l10n/fa.php
+++ b/user_openid_provider/l10n/fa.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "سایت‌های نگهداری شده توسط OpenID",
 "Trusted" => "مطمئن",
 "Denied" => "منع شد",
 "Remove" => "حذف"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/user_openid_provider/l10n/fi_FI.php b/user_openid_provider/l10n/fi_FI.php
index 9fc8599b0..c2bb1777e 100644
--- a/user_openid_provider/l10n/fi_FI.php
+++ b/user_openid_provider/l10n/fi_FI.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID-tarjoajan muistamat sivustot",
 "Trusted" => "Luotettu",
 "Denied" => "Kielletty",
 "Remove" => "Poista"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/fr.php b/user_openid_provider/l10n/fr.php
index edca59117..61c533165 100644
--- a/user_openid_provider/l10n/fr.php
+++ b/user_openid_provider/l10n/fr.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Sites mémorisés par le fournisseur OpenID",
 "Trusted" => "De confiance",
 "Denied" => "Interdit",
 "Remove" => "Supprimer"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/user_openid_provider/l10n/gl.php b/user_openid_provider/l10n/gl.php
index d7cfd9caf..441ec0caa 100644
--- a/user_openid_provider/l10n/gl.php
+++ b/user_openid_provider/l10n/gl.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Sitios lembrados polo fornecedor de OpenID",
 "Trusted" => "Autenticado",
 "Denied" => "Denegada",
 "Remove" => "Retirar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/he.php b/user_openid_provider/l10n/he.php
index 5dea8cd51..51f1dd964 100644
--- a/user_openid_provider/l10n/he.php
+++ b/user_openid_provider/l10n/he.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "אתרי ספקי OpenID שנשמרו ",
 "Trusted" => "מהימן",
 "Denied" => "חסום",
 "Remove" => "הסרה"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/hr.php b/user_openid_provider/l10n/hr.php
index c4f914fb5..6f70e7e2a 100644
--- a/user_openid_provider/l10n/hr.php
+++ b/user_openid_provider/l10n/hr.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Remove" => "Makni"
 );
+$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/user_openid_provider/l10n/hu_HU.php b/user_openid_provider/l10n/hu_HU.php
index e96b78477..e9f1f1d6e 100644
--- a/user_openid_provider/l10n/hu_HU.php
+++ b/user_openid_provider/l10n/hu_HU.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID kiszolgáló által megjegyzett oldalak",
 "Trusted" => "Megbízható",
 "Denied" => "Megtagadott",
 "Remove" => "Eltávolítás"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/id.php b/user_openid_provider/l10n/id.php
index fe3271d57..0ae6ab196 100644
--- a/user_openid_provider/l10n/id.php
+++ b/user_openid_provider/l10n/id.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "situs penyedia OpenID yang di ingat",
 "Trusted" => "dipercaya",
 "Denied" => "ditolak",
 "Remove" => "hilangkan"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/user_openid_provider/l10n/is.php b/user_openid_provider/l10n/is.php
index 3cff47286..ebdb4faab 100644
--- a/user_openid_provider/l10n/is.php
+++ b/user_openid_provider/l10n/is.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Þekktar OpenID veitur",
 "Trusted" => "Treyst",
 "Denied" => "Hafnað",
 "Remove" => "Fjarlægja"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/it.php b/user_openid_provider/l10n/it.php
index e4b7e95cc..1e81736d4 100644
--- a/user_openid_provider/l10n/it.php
+++ b/user_openid_provider/l10n/it.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Siti ricordati dal fornitore OpenID",
 "Trusted" => "Consentiti",
 "Denied" => "Vietati",
 "Remove" => "Rimuovi"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/ja.php b/user_openid_provider/l10n/ja.php
index 71df18253..b78746ee0 100644
--- a/user_openid_provider/l10n/ja.php
+++ b/user_openid_provider/l10n/ja.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenIDプロバイダはサイトを記憶しました",
 "Trusted" => "信頼",
 "Denied" => "拒否",
 "Remove" => "削除"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/user_openid_provider/l10n/ka_GE.php b/user_openid_provider/l10n/ka_GE.php
index df2f8b635..dd151abf9 100644
--- a/user_openid_provider/l10n/ka_GE.php
+++ b/user_openid_provider/l10n/ka_GE.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID პროვაიდერის დამახსოვრებული საიტები",
 "Trusted" => "სანდო",
 "Denied" => "აკრძალული",
 "Remove" => "წაშლა"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/user_openid_provider/l10n/km.php b/user_openid_provider/l10n/km.php
index 28fd709d7..2c4af22e4 100644
--- a/user_openid_provider/l10n/km.php
+++ b/user_openid_provider/l10n/km.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "ប្រតិបត្តិករ OpenID បាន​ចងចាំ​វេបសាយ",
 "Trusted" => "ដែល​ទុក​ចិត្ត",
 "Denied" => "ដែល​បដិសេធ",
 "Remove" => "ដកចេញ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/user_openid_provider/l10n/ko.php b/user_openid_provider/l10n/ko.php
index a6b7f11d4..a64fee885 100644
--- a/user_openid_provider/l10n/ko.php
+++ b/user_openid_provider/l10n/ko.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID 제공자가 사이트를 기억했습니다",
 "Trusted" => "신뢰함",
 "Denied" => "거부됨",
 "Remove" => "삭제"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/user_openid_provider/l10n/lb.php b/user_openid_provider/l10n/lb.php
index a2243d26d..fb843a819 100644
--- a/user_openid_provider/l10n/lb.php
+++ b/user_openid_provider/l10n/lb.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Gespäichert Säite vum OpenID-Provider",
 "Trusted" => "Sécher",
 "Denied" => "Verweigert",
 "Remove" => "Läschen"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/lt_LT.php b/user_openid_provider/l10n/lt_LT.php
index 6efeabef9..77c53ebc2 100644
--- a/user_openid_provider/l10n/lt_LT.php
+++ b/user_openid_provider/l10n/lt_LT.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID įsimintos svetainės",
 "Trusted" => "Patikimas",
 "Denied" => "Atmestas",
 "Remove" => "Pašalinti"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/user_openid_provider/l10n/lv.php b/user_openid_provider/l10n/lv.php
index 09a6ed3bf..80dee8a70 100644
--- a/user_openid_provider/l10n/lv.php
+++ b/user_openid_provider/l10n/lv.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Vietnes, ko atceras OpenID sniedzējs",
 "Trusted" => "Uzticas",
 "Denied" => "Noraidīts",
 "Remove" => "Izņemt"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/user_openid_provider/l10n/mk.php b/user_openid_provider/l10n/mk.php
index 8cbca0198..3b9c0df15 100644
--- a/user_openid_provider/l10n/mk.php
+++ b/user_openid_provider/l10n/mk.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Запамтени страници од OpenID провајдер",
 "Trusted" => "Доверлив",
 "Denied" => "Одбиен",
 "Remove" => "Отстрани"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/user_openid_provider/l10n/ms_MY.php b/user_openid_provider/l10n/ms_MY.php
index 1d127f35c..62943b965 100644
--- a/user_openid_provider/l10n/ms_MY.php
+++ b/user_openid_provider/l10n/ms_MY.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Laman diingati Pembekal OpenID",
 "Trusted" => "Dipercayai",
 "Denied" => "Dinafikan",
 "Remove" => "Buang"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/user_openid_provider/l10n/nb_NO.php b/user_openid_provider/l10n/nb_NO.php
index 651216920..03c817aaa 100644
--- a/user_openid_provider/l10n/nb_NO.php
+++ b/user_openid_provider/l10n/nb_NO.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID lagrede sider",
 "Trusted" => "Pålitelig",
 "Denied" => "Avvist",
 "Remove" => "Fjern"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/nl.php b/user_openid_provider/l10n/nl.php
index 17bf181e6..d9115cc43 100644
--- a/user_openid_provider/l10n/nl.php
+++ b/user_openid_provider/l10n/nl.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Onthouden OpenID provider sites",
 "Trusted" => "Vertrouwde",
 "Denied" => "Ontzeggen",
 "Remove" => "Verwijder"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/nn_NO.php b/user_openid_provider/l10n/nn_NO.php
index 709822f5a..acb6280d5 100644
--- a/user_openid_provider/l10n/nn_NO.php
+++ b/user_openid_provider/l10n/nn_NO.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Hugsa nettstader for OpenID-tilbydaren",
 "Trusted" => "Tiltrudd",
 "Denied" => "Avvist",
 "Remove" => "Fjern"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/pa.php b/user_openid_provider/l10n/pa.php
index 9c56b3e7c..eedc05e99 100644
--- a/user_openid_provider/l10n/pa.php
+++ b/user_openid_provider/l10n/pa.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Remove" => "ਹਟਾਓ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/pl.php b/user_openid_provider/l10n/pl.php
index 4f6a71881..32e42260d 100644
--- a/user_openid_provider/l10n/pl.php
+++ b/user_openid_provider/l10n/pl.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Dostawca OpenID zapamiętywane witryny",
 "Trusted" => "Zaufany",
 "Denied" => "Zablokowany",
 "Remove" => "Usuń"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/user_openid_provider/l10n/pt_BR.php b/user_openid_provider/l10n/pt_BR.php
index 9468ffa3e..bef99e676 100644
--- a/user_openid_provider/l10n/pt_BR.php
+++ b/user_openid_provider/l10n/pt_BR.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Sites lembrados pelo Provedor OpenID",
 "Trusted" => "Confiável",
 "Denied" => "Declinado",
 "Remove" => "Remover"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/user_openid_provider/l10n/pt_PT.php b/user_openid_provider/l10n/pt_PT.php
index 3f78ff182..6f1f34d49 100644
--- a/user_openid_provider/l10n/pt_PT.php
+++ b/user_openid_provider/l10n/pt_PT.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Páginas fornecedoras de OpenID recordadas",
 "Trusted" => "De confiança",
 "Denied" => "Negado",
 "Remove" => "Apagar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/ro.php b/user_openid_provider/l10n/ro.php
index 5fc130a15..10ebebef2 100644
--- a/user_openid_provider/l10n/ro.php
+++ b/user_openid_provider/l10n/ro.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Furnizorul de OpenID a memorat siturile",
 "Trusted" => "Credibil",
 "Denied" => "Refuzat",
 "Remove" => "Șterge"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/user_openid_provider/l10n/ru.php b/user_openid_provider/l10n/ru.php
index 509dfec3a..8c4297357 100644
--- a/user_openid_provider/l10n/ru.php
+++ b/user_openid_provider/l10n/ru.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Сохранённые сайты OpenID Провайдеров",
 "Trusted" => "Доверенные",
 "Denied" => "Отклонённые",
 "Remove" => "Удалить"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/user_openid_provider/l10n/si_LK.php b/user_openid_provider/l10n/si_LK.php
index 8ffbc6cc1..65249cae5 100644
--- a/user_openid_provider/l10n/si_LK.php
+++ b/user_openid_provider/l10n/si_LK.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID සැපයුම්කරු මතක තබා ගත් වෙබ් අඩවි",
 "Trusted" => "විශ්වාසවත්",
 "Denied" => "අවහිර කරන්න",
 "Remove" => "ඉවත් කරන්න "
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/sk_SK.php b/user_openid_provider/l10n/sk_SK.php
index 8962ab88a..347e7a764 100644
--- a/user_openid_provider/l10n/sk_SK.php
+++ b/user_openid_provider/l10n/sk_SK.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Známe stránky poskytovateľov OpenID",
 "Trusted" => "Dôveryhodné",
 "Denied" => "Zamietnuté",
 "Remove" => "Odobrať"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/user_openid_provider/l10n/sl.php b/user_openid_provider/l10n/sl.php
index 476cf8a18..420a9ae9b 100644
--- a/user_openid_provider/l10n/sl.php
+++ b/user_openid_provider/l10n/sl.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Shranjene strani ponudnika OpenID",
 "Trusted" => "Zaupano",
 "Denied" => "Zavrnjeno",
 "Remove" => "Odstrani"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/user_openid_provider/l10n/sq.php b/user_openid_provider/l10n/sq.php
index 9fd970353..80f558795 100644
--- a/user_openid_provider/l10n/sq.php
+++ b/user_openid_provider/l10n/sq.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Remove" => "Hiq"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/sr.php b/user_openid_provider/l10n/sr.php
index eb515eb61..555fb2516 100644
--- a/user_openid_provider/l10n/sr.php
+++ b/user_openid_provider/l10n/sr.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Запамћени сајтови на OpenID-ју",
 "Trusted" => "Поверљиво",
 "Denied" => "Одбијено",
 "Remove" => "Уклони"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/user_openid_provider/l10n/sr@latin.php b/user_openid_provider/l10n/sr@latin.php
index 669ecf253..356376941 100644
--- a/user_openid_provider/l10n/sr@latin.php
+++ b/user_openid_provider/l10n/sr@latin.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Remove" => "Ukloni"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/user_openid_provider/l10n/sv.php b/user_openid_provider/l10n/sv.php
index 75367ea62..afd17cf13 100644
--- a/user_openid_provider/l10n/sv.php
+++ b/user_openid_provider/l10n/sv.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID-leverantör sparade platser",
 "Trusted" => "Betrodd",
 "Denied" => "Nekad",
 "Remove" => "Radera"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/ta_LK.php b/user_openid_provider/l10n/ta_LK.php
index 64addec09..22bb8ba74 100644
--- a/user_openid_provider/l10n/ta_LK.php
+++ b/user_openid_provider/l10n/ta_LK.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "தளங்களை OpenID வழங்குனர் ஞாபகப்படுத்திக்கொள்ளும் ",
 "Trusted" => "நம்பப்பட்டது",
 "Denied" => "மறுக்கப்பட்டது",
 "Remove" => "அகற்றுக"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/user_openid_provider/l10n/th_TH.php b/user_openid_provider/l10n/th_TH.php
index 34c9fb4d9..1d54e0360 100644
--- a/user_openid_provider/l10n/th_TH.php
+++ b/user_openid_provider/l10n/th_TH.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "เว็บไซต์ผู้ให้บริการ OpenID ที่จำข้อมูลไว้",
 "Trusted" => "น่าเชื่อถือ",
 "Denied" => "ถูกปฏิเสธ",
 "Remove" => "ลบออก"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/user_openid_provider/l10n/tr.php b/user_openid_provider/l10n/tr.php
index c12542bac..ab9b6864a 100644
--- a/user_openid_provider/l10n/tr.php
+++ b/user_openid_provider/l10n/tr.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID Sağlayıcı adresler",
 "Trusted" => "Güvenilen",
 "Denied" => "Reddedildi",
 "Remove" => "Sil"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/user_openid_provider/l10n/ug.php b/user_openid_provider/l10n/ug.php
index 7794cab07..087ec9216 100644
--- a/user_openid_provider/l10n/ug.php
+++ b/user_openid_provider/l10n/ug.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID ئەستە تۇتقان تورتۇرالار",
 "Trusted" => "ئىشەنچلىك",
 "Denied" => "رەت قىلىنغان",
 "Remove" => "چىقىرىۋەت"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/user_openid_provider/l10n/uk.php b/user_openid_provider/l10n/uk.php
index 8fe5f48f4..5e68ef2e3 100644
--- a/user_openid_provider/l10n/uk.php
+++ b/user_openid_provider/l10n/uk.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Збережені сайти OpenID провайдерів",
 "Trusted" => "Довірені",
 "Denied" => "Відхилені",
 "Remove" => "Видалити"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/user_openid_provider/l10n/vi.php b/user_openid_provider/l10n/vi.php
index 8cab69175..5161abe2f 100644
--- a/user_openid_provider/l10n/vi.php
+++ b/user_openid_provider/l10n/vi.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "Ghi nhớ các website sử dụng OpenID",
 "Trusted" => "Đáng tin cậy",
 "Denied" => "Bị từ chối",
 "Remove" => "Xóa"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/user_openid_provider/l10n/zh_CN.php b/user_openid_provider/l10n/zh_CN.php
index 99e440c59..aff336997 100644
--- a/user_openid_provider/l10n/zh_CN.php
+++ b/user_openid_provider/l10n/zh_CN.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID 提供商记住的站点",
 "Trusted" => "已信任",
 "Denied" => "已禁止",
 "Remove" => "移除"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/user_openid_provider/l10n/zh_TW.php b/user_openid_provider/l10n/zh_TW.php
index 9743f543a..0c63699e2 100644
--- a/user_openid_provider/l10n/zh_TW.php
+++ b/user_openid_provider/l10n/zh_TW.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "OpenID Provider remembered sites" => "OpenID 提供者已經記住的網站",
 "Trusted" => "信任",
 "Denied" => "拒絕",
 "Remove" => "移除"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";