Merge remote-tracking branch 'origin/master'

libraries/Advisor.class.php

@@ -283,10 +283,10 @@ class Advisor
                     $ruleLine = 1;
                     $j++;
                     $rules[$j] = array( 'name' => $match[1]);
-                    $lines[$j] = array( 'name' => $i);
+                    $lines[$j] = array( 'name' => $i + 1);
                     if (isset($match[3])) {
                         $rules[$j]['precondition'] = $match[3];
-                        $lines[$j]['precondition'] = $i;
+                        $lines[$j]['precondition'] = $i + 1;
                     }
                 } else {
                     $errors[] = 'Invalid rule declaration on line '.($i+1);
@@ -310,7 +310,7 @@ class Advisor
                     continue;
                 }
                 $rules[$j][$ruleSyntax[$ruleLine]] = chop(substr($line, 1));
-                $lines[$j][$ruleSyntax[$ruleLine]] = $i;
+                $lines[$j][$ruleSyntax[$ruleLine]] = $i + 1;
                 $ruleLine += 1;
             }
 

scripts/update-po

@@ -18,7 +18,7 @@ xgettext \
     `find . -name '*.php' -not -path './test/*' -not -path './po/*' | sort`
 
 # Generate PHP code for advisor rules
-php ./scripts/advisor2php >> po/phpmyadmin.pot
+php ./scripts/advisor2po >> po/phpmyadmin.pot
 
 ver=`sed -n "/PMA_VERSION', '/ s/.*PMA_VERSION', '\(.*\)'.*/\1/p" libraries/Config.class.php`