Merge branch 'pull'

util/po2php.php

@@ -35,7 +35,7 @@ function po2php_run($argv, $argc) {
 		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]*); *plural=(.*)|", $l, $match);
 			$cond = str_replace('n','$n',$match[2]);
 			$out .= 'function string_plural_select($n){'."\n";
 			$out .= '	return '.$cond.';'."\n";

util/run_xgettext.sh

@@ -31,6 +31,7 @@ sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2010/g" "$OUTFILE"
 sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE"
 sed -i "s/PACKAGE/Friendika/g" "$OUTFILE"
 sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
+sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE"
 
 
 echo "done."