Skip to content

Commit 1d73f8e

Browse files
gitstergitster
committed
Merge branch 'va/i18n-perl-scripts'
Porcelain scripts written in Perl are getting internationalized. * va/i18n-perl-scripts: i18n: difftool: mark warnings for translation i18n: send-email: mark composing message for translation i18n: send-email: mark string with interpolation for translation i18n: send-email: mark warnings and errors for translation i18n: send-email: mark strings for translation i18n: add--interactive: mark status words for translation i18n: add--interactive: remove %patch_modes entries i18n: add--interactive: mark edit_hunk_manually message for translation i18n: add--interactive: i18n of help_patch_cmd i18n: add--interactive: mark patch prompt for translation i18n: add--interactive: mark plural strings i18n: clean.c: match string with git-add--interactive.perl i18n: add--interactive: mark strings with interpolation for translation i18n: add--interactive: mark simple here-documents for translation i18n: add--interactive: mark strings for translation Git.pm: add subroutines for commenting lines
2 parents 95d0367 + a948eba commit 1d73f8e

File tree

8 files changed

+408
-218
lines changed

8 files changed

+408
-218
lines changed

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2105,7 +2105,8 @@ XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
21052105
--keyword=_ --keyword=N_ --keyword="Q_:1,2"
21062106
XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
21072107
--keyword=gettextln --keyword=eval_gettextln
2108-
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
2108+
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \
2109+
--keyword=__ --keyword=N__ --keyword="__n:1,2"
21092110
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
21102111
LOCALIZED_SH = $(SCRIPT_SH)
21112112
LOCALIZED_SH += git-parse-remote.sh

‎builtin/clean.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,19 +287,19 @@ static void pretty_print_menus(struct string_list *menu_list)
287287
static void prompt_help_cmd(int singleton)
288288
{
289289
clean_print_color(CLEAN_COLOR_HELP);
290-
printf_ln(singleton ?
290+
printf(singleton ?
291291
_("Prompt help:\n"
292292
"1 - select a numbered item\n"
293293
"foo - select item based on unique prefix\n"
294-
" - (empty) select nothing") :
294+
" - (empty) select nothing\n") :
295295
_("Prompt help:\n"
296296
"1 - select a single item\n"
297297
"3-5 - select a range of items\n"
298298
"2-3,6-9 - select multiple ranges\n"
299299
"foo - select item based on unique prefix\n"
300300
"-... - unselect specified items\n"
301301
"* - choose all items\n"
302-
" - (empty) finish selecting"));
302+
" - (empty) finish selecting\n"));
303303
clean_print_color(CLEAN_COLOR_RESET);
304304
}
305305

@@ -508,7 +508,7 @@ static int parse_choice(struct menu_stuff *menu_stuff,
508508
if (top <= 0 || bottom <= 0 || top > menu_stuff->nr || bottom > top ||
509509
(is_single && bottom != top)) {
510510
clean_print_color(CLEAN_COLOR_ERROR);
511-
printf_ln(_("Huh (%s)?"), (*ptr)->buf);
511+
printf(_("Huh (%s)?\n"), (*ptr)->buf);
512512
clean_print_color(CLEAN_COLOR_RESET);
513513
continue;
514514
}
@@ -774,7 +774,7 @@ static int ask_each_cmd(void)
774774
static int quit_cmd(void)
775775
{
776776
string_list_clear(&del_list, 0);
777-
printf_ln(_("Bye."));
777+
printf(_("Bye.\n"));
778778
return MENU_RETURN_NO_LOOP;
779779
}
780780

0 commit comments

Comments
 (0)