diff options
| -rw-r--r-- | util/po2php.php | 3 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/ca/strings.php | 5 | ||||
| -rw-r--r-- | view/cs/strings.php | 3 | ||||
| -rw-r--r-- | view/de/strings.php | 3 | ||||
| -rw-r--r-- | view/eo/strings.php | 3 | ||||
| -rw-r--r-- | view/es/strings.php | 3 | ||||
| -rw-r--r-- | view/fr/strings.php | 3 | ||||
| -rw-r--r-- | view/it/strings.php | 3 | ||||
| -rw-r--r-- | view/nb-no/strings.php | 3 | ||||
| -rw-r--r-- | view/pt-br/strings.php | 3 | ||||
| -rw-r--r-- | view/ru/strings.php | 3 | ||||
| -rw-r--r-- | view/sv/strings.php | 3 |
13 files changed, 26 insertions, 14 deletions
diff --git a/util/po2php.php b/util/po2php.php index c703172af..3ac8b89dd 100644 --- a/util/po2php.php +++ b/util/po2php.php @@ -44,9 +44,10 @@ function po2php_run($argv, $argc) { $match=Array(); preg_match("|nplurals=([0-9]*); *plural=(.*)[;\\\\]|", $l, $match); $cond = str_replace('n','$n',$match[2]); + $out .= 'if(! function_exists("' . 'string_plural_select_' . $lang .'") {' . "\n"; $out .= 'function string_plural_select_' . $lang . '($n){'."\n"; $out .= ' return '.$cond.';'."\n"; - $out .= '}'."\n"; + $out .= '}}'."\n"; } diff --git a/version.inc b/version.inc index a7de0fb96..2ac8372b9 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-05-12.673 +2014-05-13.674 diff --git a/view/ca/strings.php b/view/ca/strings.php index 265058391..2311c9ccc 100644 --- a/view/ca/strings.php +++ b/view/ca/strings.php @@ -1,8 +1,9 @@ <?php +if(! function_exists("string_plural_select_ca") { function string_plural_select_ca($n){ return ($n != 1); -} +}} ; $a->strings["Post successful."] = "Publicat amb éxit."; $a->strings["[Embedded content - reload page to view]"] = "[Contingut embegut - recarrega la pàgina per a veure-ho]"; @@ -210,7 +211,7 @@ $a->strings["Enter full path to php executable"] = "Introdueixi el camí complet $a->strings["Command line PHP"] = "Linia de comandos PHP"; $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versió de línia de comandos de PHP en el seu sistema no té \"register_argc_argv\" habilitat."; $a->strings["This is required for message delivery to work."] = "Això és necessari perquè funcioni el lliurament de missatges."; -$a->strings["PHP \"register_argc_argv\""] = "PHP \"register_argc_argv\""; +$a->strings["PHP \"register_argc_argv\"] = "PHP \"register_argc_argv\""; $a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: la funció \"openssl_pkey_new\" en aquest sistema no és capaç de generar claus de xifrat"; $a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si s'executa en Windows, per favor consulti la secció \"http://www.php.net/manual/en/openssl.installation.php\"."; $a->strings["Generate encryption keys"] = "Generar claus d'encripció"; diff --git a/view/cs/strings.php b/view/cs/strings.php index 0c7d0d7bd..c7c7c32f0 100644 --- a/view/cs/strings.php +++ b/view/cs/strings.php @@ -1,8 +1,9 @@ <?php +if(! function_exists("string_plural_select_cs") { function string_plural_select_cs($n){ return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2; -} +}} ; $a->strings["Post successful."] = "Příspěvek úspěšně odeslán"; $a->strings["Contact settings applied."] = "Nastavení kontaktu změněno"; diff --git a/view/de/strings.php b/view/de/strings.php index 611eff282..67ba771e5 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -1,8 +1,9 @@ <?php +if(! function_exists("string_plural_select_de") { function string_plural_select_de($n){ return ($n != 1);; -} +}} ; $a->strings["Categories"] = "Kategorien"; $a->strings["Connect"] = "Verbinden"; diff --git a/view/eo/strings.php b/view/eo/strings.php index 236022993..4d76c357f 100644 --- a/view/eo/strings.php +++ b/view/eo/strings.php @@ -1,8 +1,9 @@ <?php +if(! function_exists("string_plural_select_eo") { function string_plural_select_eo($n){ return ($n != 1); -} +}} ; $a->strings["Post successful."] = "Sukcese afiŝita."; $a->strings["[Embedded content - reload page to view]"] = "[Enigita enhavo - reŝargu paĝon por spekti ĝin]"; diff --git a/view/es/strings.php b/view/es/strings.php index d2b8e240e..8e4d01794 100644 --- a/view/es/strings.php +++ b/view/es/strings.php @@ -1,8 +1,9 @@ <?php +if(! function_exists("string_plural_select_es") { function string_plural_select_es($n){ return ($n != 1); -} +}} ; $a->strings["Not Found"] = "No se ha encontrado"; $a->strings["Page not found."] = "Página no encontrada."; diff --git a/view/fr/strings.php b/view/fr/strings.php index 360b616d2..5b398425f 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -1,8 +1,9 @@ <?php +if(! function_exists("string_plural_select_fr") { function string_plural_select_fr($n){ return ($n > 1);; -} +}} ; $a->strings["Categories"] = "Catégories"; $a->strings["Connect"] = "Relier"; diff --git a/view/it/strings.php b/view/it/strings.php index 9ce09e00a..32d08fa52 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -1,8 +1,9 @@ <?php +if(! function_exists("string_plural_select_it") { function string_plural_select_it($n){ return ($n != 1);; -} +}} ; $a->strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'"; $a->strings["Profile Photos"] = "Foto del profilo"; diff --git a/view/nb-no/strings.php b/view/nb-no/strings.php index 96404e4b1..eda4ccea0 100644 --- a/view/nb-no/strings.php +++ b/view/nb-no/strings.php @@ -1,8 +1,9 @@ <?php +if(! function_exists("string_plural_select_nb_no") { function string_plural_select_nb_no($n){ return ($n != 1);; -} +}} ; $a->strings["Categories"] = "Kategorier"; $a->strings["Connect"] = "Koble"; diff --git a/view/pt-br/strings.php b/view/pt-br/strings.php index 363d34648..073f2e2a2 100644 --- a/view/pt-br/strings.php +++ b/view/pt-br/strings.php @@ -1,8 +1,9 @@ <?php +if(! function_exists("string_plural_select_pt_br") { function string_plural_select_pt_br($n){ return ($n > 1);; -} +}} ; $a->strings["Cannot locate DNS info for database server '%s'"] = "Não foi possível localizar a informação de DNS para o servidor de banco de dados '%s'"; $a->strings["Profile Photos"] = "Fotos do perfil"; diff --git a/view/ru/strings.php b/view/ru/strings.php index 149684a8c..4c6ca1d3d 100644 --- a/view/ru/strings.php +++ b/view/ru/strings.php @@ -1,8 +1,9 @@ <?php +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<10 || $n%100>=20) ? 1 : 2);; -} +}} ; $a->strings["Cannot locate DNS info for database server '%s'"] = ""; $a->strings["Profile Photos"] = "Фотографии профиля"; diff --git a/view/sv/strings.php b/view/sv/strings.php index 29d75fe0c..ecb2c2658 100644 --- a/view/sv/strings.php +++ b/view/sv/strings.php @@ -1,8 +1,9 @@ <?php +if(! function_exists("string_plural_select_sv") { function string_plural_select_sv($n){ return ($n != 1);; -} +}} ; $a->strings["Categories"] = "Kategorier"; $a->strings["Connect"] = "Ta kontakt"; |