Merge branch 'translation'

extras/po/generate_translatable_strings.pl

@@ -26,18 +26,25 @@ msgstr ""
 
 my @blacklist = ('"--"', '"\\\\000"', '`.*`', '$\(.*\)');
 
+# Translatable strings that can't be automatically detected yet
+my %undetectable = (
+    124 => '[sudo] Enter password for user ::1 user:: to gain superuser privileges'
+);
+
 open my $handle, $FILE or die "Failed to open $FILE";
 my @lines = <$handle>;
 close $handle;
 
 my %seen;
-my @ignored;
 my $index = 0;
 my $fold;
 my $func;
+my $force;
+my $str;
 
 foreach (@lines) {
     $index++;
+    $force = 0;
 
     # It's a fold title
     if (m/^# +{{{ +(.*)$/) {
@@ -51,44 +58,28 @@ foreach (@lines) {
         next;
     }
 
+    # Force if it's undetectable
+    $force = 1 if exists($undetectable{$index});
+
     # Next if there is no print function
-    next unless m/$FUNCPATTERN +$STRINGPATTERN/;
+    next unless $force or m/$FUNCPATTERN +$STRINGPATTERN/;
 
-    # Next if it was seen before
+    # Get string from the $undetectable hash or via regex
-    $seen{$2}++;
+    if ($force) {
-    next if $seen{$2} > 1;
+        $str = "\"$undetectable{$index}\"";
-
-    # Next if it's blacklisted
-    if (grep {$2 =~ m/$_/} @blacklist) {
-	push @ignored, $2;
-	next;
-    }
-
-    print "#. Fold: $fold\n";
-    print "#. Function: $func\n";
-    print "#.\n";
-    print "#. Code sample:\n";
-
-    my $sign = ' ';
-    for (-7..3) {
-        if($_ == -1) {
-            $sign = '>';
     }
     else {
-            $sign = ' ';
+        $str = $2;
     }
 
-        my $n = $index + $_;
+    # Next if it was seen before
-        print "#. $sign $lines[$n]";
+    $seen{$str}++;
-    }
+    next if $seen{$str} > 1;
 
-    print "#: tomb:$index\n";
+    # Next if it's blacklisted
-    print "msgid $2\n";
+    next if grep {$str =~ m/$_/} @blacklist;
+
+    print "#: tomb:$fold:$func:$index\n";
+    print "msgid $str\n";
     print "msgstr \"\"\n\n";
 }
-
-print STDERR "-- IGNORED\n";
-foreach (@ignored) {
-    print STDERR "$_\n";
-}
-