@@ -716,7 +716,7 @@ static const char *read_author_ident(struct strbuf *buf)
716
716
/* dequote values and construct ident line in-place */
717
717
for (in = out = buf -> buf ; i < 3 && in - buf -> buf < buf -> len ; i ++ ) {
718
718
if (!skip_prefix (in , keys [i ], (const char * * )& in )) {
719
- warning ("could not parse '%s' (looking for '%s'" ,
719
+ warning (_ ( "could not parse '%s' (looking for '%s'" ) ,
720
720
rebase_path_author_script (), keys [i ]);
721
721
return NULL ;
722
722
}
@@ -738,7 +738,7 @@ static const char *read_author_ident(struct strbuf *buf)
738
738
}
739
739
740
740
if (i < 3 ) {
741
- warning ("could not parse '%s' (looking for '%s')" ,
741
+ warning (_ ( "could not parse '%s' (looking for '%s')" ) ,
742
742
rebase_path_author_script (), keys [i ]);
743
743
return NULL ;
744
744
}
@@ -1444,7 +1444,7 @@ static const char *command_to_string(const enum todo_command command)
1444
1444
{
1445
1445
if (command < TODO_COMMENT )
1446
1446
return todo_command_info [command ].str ;
1447
- die ("unknown command: %d" , command );
1447
+ die (_ ( "unknown command: %d" ) , command );
1448
1448
}
1449
1449
1450
1450
static char command_to_char (const enum todo_command command )
@@ -2600,15 +2600,17 @@ static int error_with_patch(struct commit *commit,
2600
2600
if (intend_to_amend ())
2601
2601
return -1 ;
2602
2602
2603
- fprintf (stderr , "You can amend the commit now, with\n"
2604
- "\n"
2605
- " git commit --amend %s\n"
2606
- "\n"
2607
- "Once you are satisfied with your changes, run\n"
2608
- "\n"
2609
- " git rebase --continue\n" , gpg_sign_opt_quoted (opts ));
2603
+ fprintf (stderr ,
2604
+ _ ("You can amend the commit now, with\n"
2605
+ "\n"
2606
+ " git commit --amend %s\n"
2607
+ "\n"
2608
+ "Once you are satisfied with your changes, run\n"
2609
+ "\n"
2610
+ " git rebase --continue\n" ),
2611
+ gpg_sign_opt_quoted (opts ));
2610
2612
} else if (exit_code )
2611
- fprintf_ln (stderr , "Could not apply %s... %.*s" ,
2613
+ fprintf_ln (stderr , _ ( "Could not apply %s... %.*s" ) ,
2612
2614
short_commit_name (commit ), subject_len , subject );
2613
2615
2614
2616
return exit_code ;
@@ -2719,7 +2721,7 @@ static int do_label(const char *name, int len)
2719
2721
struct object_id head_oid ;
2720
2722
2721
2723
if (len == 1 && * name == '#' )
2722
- return error ("illegal label name: '%.*s'" , len , name );
2724
+ return error (_ ( "illegal label name: '%.*s'" ) , len , name );
2723
2725
2724
2726
strbuf_addf (& ref_name , "refs/rewritten/%.*s" , len , name );
2725
2727
strbuf_addf (& msg , "rebase -i (label) '%.*s'" , len , name );
0 commit comments