Merge branch 'patch-26' into 'dev'
New plural functions for JavaScript compatibility See merge request hubzilla/core!1370
This commit is contained in:
		| @@ -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" | ||||
|   | ||||
| @@ -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" | ||||
|   | ||||
| @@ -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" | ||||
|   | ||||
| @@ -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" | ||||
|   | ||||
| @@ -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" | ||||
|   | ||||
| @@ -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" | ||||
|   | ||||
| @@ -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" | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user