From c18788dc035b535cf487046e0fa9539c391c9ea3 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 1 Oct 2018 13:45:57 +0100
Subject: [PATCH] i18n: dgit: mark some messages (8)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/dgit b/dgit
index 2ac6d51c..35986821 100755
--- a/dgit
+++ b/dgit
@@ -5356,7 +5356,7 @@ END
 	        " to record .gitignore changes",
 		$gipatch
 	    if (stat _)[7];
-	print GIPATCH <<END.<<ENDU or die "$gipatch: $!";
+	print GIPATCH +(__ <<END).<<ENDU or die "$gipatch: $!";
 Subject: Update .gitignore from Debian packaging branch
 
 The Debian packaging git branch contains these updates to the upstream
@@ -5378,7 +5378,7 @@ ENDU
 	print SERIES "auto-gitignore\n" or die $!;
 	close SERIES or die  $!;
         runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
-        commit_admin <<END.<<ENDU
+        commit_admin +(__ <<END).<<ENDU
 Commit patch to update .gitignore
 END
 
@@ -5393,8 +5393,8 @@ ENDU
 
     changedir "$playground/work";
 
-    my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
-    progress "dgit view: created ($saved)";
+    my $saved = maybe_split_brain_save $headref, $dgitview, __ "converted";
+    progress f_ "dgit view: created (%s)", $saved;
 }
 
 sub quiltify ($$$$) {
@@ -5459,7 +5459,7 @@ sub quiltify ($$$$) {
 	my $c = shift @todo;
 	next if $considered{$c->{Commit}}++;
 
-	$not->($c, "maximum search space exceeded") if --$max_work <= 0;
+	$not->($c, __ "maximum search space exceeded") if --$max_work <= 0;
 
 	printdebug "quiltify investigate $c->{Commit}\n";
 
@@ -5477,7 +5477,7 @@ sub quiltify ($$$$) {
 	}
 
 	my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
-	$not->($c, "has $c_sentinels not $t_sentinels")
+	$not->($c, f_ "has %s not %s", $c_sentinels, $t_sentinels)
 	    if $c_sentinels ne $t_sentinels;
 
 	my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
@@ -5486,13 +5486,14 @@ sub quiltify ($$$$) {
 	my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
 	@parents = map { { Commit => $_, Child => $c } } @parents;
 
-	$not->($c, "root commit") if !@parents;
+	$not->($c, __ "root commit") if !@parents;
 
 	foreach my $p (@parents) {
 	    $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
 	}
 	my $ndiffers = grep { $_->{Nontrivial} } @parents;
-	$not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
+	$not->($c, f_ "merge (%s nontrivial parents)", $ndiffers)
+	    if $ndiffers > 1;
 
 	foreach my $p (@parents) {
 	    printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
@@ -5502,7 +5503,7 @@ sub quiltify ($$$$) {
 	    my $patchstackchange = cmdoutput @cmd;
 	    if (length $patchstackchange) {
 		$patchstackchange =~ s/\n/,/g;
-		$not->($p, "changed $patchstackchange");
+		$not->($p, f_ "changed %s", $patchstackchange);
 	    }
 
 	    printdebug " search queue P=$p->{Commit} ",
@@ -5520,13 +5521,16 @@ sub quiltify ($$$$) {
 	    return $x;
 	};
 	if ($quilt_mode eq 'linear') {
-	    print STDERR "\n$us: error: quilt fixup cannot be linear.  Stopped at:\n";
+	    print STDERR f_
+		"\n%s: error: quilt fixup cannot be linear.  Stopped at:\n",
+		$us;
 	    my $all_gdr = !!@nots;
 	    foreach my $notp (@nots) {
 		my $c = $notp->{Child};
 		my $cprange = $abbrev->($notp);
 		$cprange .= "..".$abbrev->($c) if $c;
-		print STDERR "$us:  $cprange: $notp->{Whynot}\n";
+		print STDERR f_ "%s:  %s: %s\n",
+		    $us, $cprange, $notp->{Whynot};
 		$all_gdr &&= $notp->{Child} &&
 		    (git_cat_file $notp->{Child}{Commit}, 'commit')
 		    =~ m{^\[git-debrebase(?! split[: ]).*\]$}m;
@@ -5536,13 +5540,13 @@ sub quiltify ($$$$) {
 		[ grep { $_->[0] ne 'quilt-mode' } @$failsuggestion ]
 		if $all_gdr;
 	    print STDERR "$us: $_->[1]\n" foreach @$failsuggestion;
-	    fail
+	    fail __
  "quilt history linearisation failed.  Search \`quilt fixup' in dgit(7).\n";
 	} elsif ($quilt_mode eq 'smash') {
 	} elsif ($quilt_mode eq 'auto') {
-	    progress "quilt fixup cannot be linear, smashing...";
+	    progress __ "quilt fixup cannot be linear, smashing...";
 	} else {
-	    die "$quilt_mode ?";
+	    confess "$quilt_mode ?";
 	}
 
 	my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
@@ -5552,12 +5556,14 @@ sub quiltify ($$$$) {
 
 	quiltify_dpkg_commit "auto-$version-$target-$time",
 	    (getfield $clogp, 'Maintainer'),
-	    "Automatically generated patch ($clogp->{Version})\n".
-	    "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
+	    (f_ "Automatically generated patch (%s)\n".
+	     "Last (up to) %s git changes, FYI:\n\n",
+	     $clogp->{Version}, $ncommits).
+	     $msg;
 	return;
     }
 
-    progress "quiltify linearisation planning successful, executing...";
+    progress __ "quiltify linearisation planning successful, executing...";
 
     for (my $p = $sref_S;
 	 my $c = $p->{Child};
-- 
2.30.2