git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v7 05/16] i18n: clean.c: match string with git-add--interactive.perl

From
Vasco Almeida <vascomalmeida@sapo.pt>
Date
Dec 14, 2016, 12:54 UTC
Message-ID
<20161214125439.8822-6-vascomalmeida@sapo.pt>
In-Reply-To
<20161214125439.8822-1-vascomalmeida@sapo.pt>

Change strings for help to match the ones in git-add--interactive.perl. The strings now represent one entry to translate each rather then two entries each different only by an ending newline character.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
---
 builtin/clean.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index 0371010af..d6bc3aaae 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -287,11 +287,11 @@ static void pretty_print_menus(struct string_list *menu_list)
 static void prompt_help_cmd(int singleton)
 {
 	clean_print_color(CLEAN_COLOR_HELP);
-	printf_ln(singleton ?
+	printf(singleton ?
 		  _("Prompt help:\n"
 		    "1          - select a numbered item\n"
 		    "foo        - select item based on unique prefix\n"
-		    "           - (empty) select nothing") :
+		    "           - (empty) select nothing\n") :
 		  _("Prompt help:\n"
 		    "1          - select a single item\n"
 		    "3-5        - select a range of items\n"
@@ -299,7 +299,7 @@ static void prompt_help_cmd(int singleton)
 		    "foo        - select item based on unique prefix\n"
 		    "-...       - unselect specified items\n"
 		    "*          - choose all items\n"
-		    "           - (empty) finish selecting"));
+		    "           - (empty) finish selecting\n"));
 	clean_print_color(CLEAN_COLOR_RESET);
 }
 
@@ -508,7 +508,7 @@ static int parse_choice(struct menu_stuff *menu_stuff,
 		if (top <= 0 || bottom <= 0 || top > menu_stuff->nr || bottom > top ||
 		    (is_single && bottom != top)) {
 			clean_print_color(CLEAN_COLOR_ERROR);
-			printf_ln(_("Huh (%s)?"), (*ptr)->buf);
+			printf(_("Huh (%s)?\n"), (*ptr)->buf);
 			clean_print_color(CLEAN_COLOR_RESET);
 			continue;
 		}
@@ -774,7 +774,7 @@ static int ask_each_cmd(void)
 static int quit_cmd(void)
 {
 	string_list_clear(&del_list, 0);
-	printf_ln(_("Bye."));
+	printf(_("Bye.\n"));
 	return MENU_RETURN_NO_LOOP;
 }
 
-- 
2.11.0.44.g7d42c6c
Previous: Vasco AlmeidaNext: Vasco Almeida
Message 5 of 18 in “Mark strings in Perl scripts for translation”
  1. 00/16 Mark strings in Perl scripts for translationVasco Almeida, Dec 14, 2016
  2. 02/16 i18n: add--interactive: mark strings for translationVasco Almeida, Dec 14, 2016
  3. 06/16 i18n: add--interactive: mark plural stringsVasco Almeida, Dec 14, 2016
  4. 11/16 i18n: add--interactive: mark status words for translationVasco Almeida, Dec 14, 2016
  5. 05/16 i18n: clean.c: match string with git-add--interactive.perlVasco Almeida, Dec 14, 2016
  6. 12/16 i18n: send-email: mark strings for translationVasco Almeida, Dec 14, 2016
  7. 03/16 i18n: add--interactive: mark simple here-documents for translationVasco Almeida, Dec 14, 2016
  8. 09/16 i18n: add--interactive: mark edit_hunk_manually message for translationVasco Almeida, Dec 14, 2016
  9. 08/16 i18n: add--interactive: i18n of help_patch_cmdVasco Almeida, Dec 14, 2016
  10. 01/16 Git.pm: add subroutines for commenting linesVasco Almeida, Dec 14, 2016
  11. 10/16 i18n: add--interactive: remove %patch_modes entriesVasco Almeida, Dec 14, 2016
  12. 14/16 i18n: send-email: mark string with interpolation for translationVasco Almeida, Dec 14, 2016
  13. 07/16 i18n: add--interactive: mark patch prompt for translationVasco Almeida, Dec 14, 2016
  14. 04/16 i18n: add--interactive: mark strings with interpolation for translationVasco Almeida, Dec 14, 2016
  15. 13/16 i18n: send-email: mark warnings and errors for translationVasco Almeida, Dec 14, 2016
  16. 16/16 i18n: difftool: mark warnings for translationVasco Almeida, Dec 14, 2016
  17. 15/16 i18n: send-email: mark composing message for translationVasco Almeida, Dec 14, 2016
  18. Junio C HamanoDec 14, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.