Merge branch 'patch-26' into 'dev'

New plural functions for JavaScript compatibility

See merge request hubzilla/core!1370

9 files changed, 9 insertions, 9 deletions

diff --git a/view/de-de/hmessages.po b/view/de-de/hmessages.po
index 8af9dce6b..4eaec3629 100644
--- a/view/de-de/hmessages.po
+++ b/view/de-de/hmessages.po
@@ -35,7 +35,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index f2c1ccf79..3b42394b1 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_ES\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
diff --git a/view/fr/hmessages.po b/view/fr/hmessages.po
index c5263c2df..0c89da139 100644
--- a/view/fr/hmessages.po
+++ b/view/fr/hmessages.po
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
diff --git a/view/he/hmessages.po b/view/he/hmessages.po
index 991b7f64f..837dfabd0 100644
--- a/view/he/hmessages.po
+++ b/view/he/hmessages.po
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:239
 msgid "parent"
diff --git a/view/it/hmessages.po b/view/it/hmessages.po
index 94911bc20..8c1dc08d7 100644
--- a/view/it/hmessages.po
+++ b/view/it/hmessages.po
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
diff --git a/view/nb-no/hmessages.po b/view/nb-no/hmessages.po
index bcb926d90..0f7f2e8c5 100644
--- a/view/nb-no/hmessages.po
+++ b/view/nb-no/hmessages.po
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:239
 msgid "parent"
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index c98121122..c672e534e 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
diff --git a/view/pt-br/hmessages.po b/view/pt-br/hmessages.po
index 029642f9b..2645cc9bd 100644
--- a/view/pt-br/hmessages.po
+++ b/view/pt-br/hmessages.po
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1 ? 1 : 0);\n"
 
 #: ../../include/dba/dba_driver.php:50
 #, php-format
diff --git a/view/sv/hmessages.po b/view/sv/hmessages.po
index 4486a8630..249dbd8be 100644
--- a/view/sv/hmessages.po
+++ b/view/sv/hmessages.po
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../include/dba/dba_driver.php:142
 #, php-format