Merge branch 'dev' into 'dev'

Update Russian translation

See merge request hubzilla/core!1590

util/po2php.php

@@ -52,7 +52,7 @@ function po2php_run($argc,$argv) {
 		if ($l[0]=="#") $l="";
 		if (substr($l,0,15)=='"Plural-Forms: '){
 			$match=Array();
-			preg_match("|nplurals=([0-9]*); *plural=(.*)[;\\\\]|", $l, $match);
+			preg_match("|nplurals=([0-9]*);\s*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";