Browse Source

Use "<enter>" instead of "return" or "enter" in input prompts

This should make it more clear we are talking about the key and not
something else.
Guillem Jover 11 years ago
parent
commit
19d98528e6
4 changed files with 4 additions and 3 deletions
  1. 1 0
      debian/changelog
  2. 1 1
      dselect/methods/ftp/setup.pl
  3. 1 1
      scripts/dpkg-buildpackage.pl
  4. 1 1
      utils/update-alternatives.c

+ 1 - 0
debian/changelog

@@ -86,6 +86,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low
     - Say “package” instead of “it” in dpkg-name warning message.
     - Say “package” instead of “it” in dpkg-name warning message.
     - Uppercase field names in error messages.
     - Uppercase field names in error messages.
     - Expand EOF and eof into “end of file” in error messages.
     - Expand EOF and eof into “end of file” in error messages.
+    - Use “<enter>” instead of “return” or “enter” in input prompts.
 
 
   [ Raphaël Hertzog ]
   [ Raphaël Hertzog ]
   * Drop myself from Uploaders.
   * Drop myself from Uploaders.

+ 1 - 1
dselect/methods/ftp/setup.pl

@@ -171,7 +171,7 @@ store_config("$methdir/vars");
 chmod  0600, "$methdir/vars";
 chmod  0600, "$methdir/vars";
 
 
 if($exit || $problem) {
 if($exit || $problem) {
-    print "Press return to continue\n";
+    print "Press <enter> to continue\n";
     <STDIN>;
     <STDIN>;
 }
 }
 
 

+ 1 - 1
scripts/dpkg-buildpackage.pl

@@ -601,7 +601,7 @@ if ($check_command) {
 }
 }
 
 
 if ($signpause && ($signchanges || $signsource)) {
 if ($signpause && ($signchanges || $signsource)) {
-    print g_("Press the return key to start signing process\n");
+    print g_("Press <enter> to start the signing process.\n");
     getc();
     getc();
 }
 }
 
 

+ 1 - 1
utils/update-alternatives.c

@@ -1614,7 +1614,7 @@ alternative_select_choice(struct alternative *a)
 		for (fs = a->choices; fs; fs = fs->next, idx++)
 		for (fs = a->choices; fs; fs = fs->next, idx++)
 			alternative_print_choice(a, ALT_ST_MANUAL, fs, idx, len);
 			alternative_print_choice(a, ALT_ST_MANUAL, fs, idx, len);
 		printf("\n");
 		printf("\n");
-		printf(_("Press enter to keep the current choice[*], "
+		printf(_("Press <enter> to keep the current choice[*], "
 		         "or type selection number: "));
 		         "or type selection number: "));
 		ret = fgets(selection, sizeof(selection), stdin);
 		ret = fgets(selection, sizeof(selection), stdin);
 		if (ret == NULL || strlen(selection) == 0) {
 		if (ret == NULL || strlen(selection) == 0) {