Browse Source

Replace all "press enter" occurrences with "press [Enter]"

Thanks: Andre Felipe Machado for initial patch
Closes: 414848
tags/debian/1.1.exp9
Luca Bruno David Kalnischkies 6 years ago
parent
commit
94171725b1
7 changed files with 14 additions and 14 deletions
  1. +1
    -1
      apt-pkg/acquire-worker.cc
  2. +1
    -1
      apt-private/acqprogress.cc
  3. +1
    -1
      cmdline/apt-cdrom.cc
  4. +5
    -5
      dselect/install
  5. +1
    -1
      dselect/update
  6. +4
    -4
      po/apt-all.pot
  7. +1
    -1
      test/integration/test-apt-cdrom

+ 1
- 1
apt-pkg/acquire-worker.cc View File

@@ -538,7 +538,7 @@ bool pkgAcquire::Worker::MediaChange(string Message)
ostringstream msg,status;
ioprintf(msg,_("Please insert the disc labeled: "
"'%s' "
"in the drive '%s' and press enter."),
"in the drive '%s' and press [Enter]."),
Media.c_str(),Drive.c_str());
status << "media-change: " // message
<< Media << ":" // media


+ 1
- 1
apt-private/acqprogress.cc View File

@@ -296,7 +296,7 @@ bool AcqTextStatus::MediaChange(std::string Media, std::string Drive)
clearLastLine();
ioprintf(out,_("Media change: please insert the disc labeled\n"
" '%s'\n"
"in the drive '%s' and press enter\n"),
"in the drive '%s' and press [Enter]\n"),
Media.c_str(),Drive.c_str());

char C = 0;


+ 1
- 1
cmdline/apt-cdrom.cc View File

@@ -89,7 +89,7 @@ void pkgCdromTextStatus::Update(string text, int /*current*/)

bool pkgCdromTextStatus::ChangeCdrom()
{
Prompt(_("Please insert a Disc in the drive and press enter"));
Prompt(_("Please insert a Disc in the drive and press [Enter]"));
return true;
}



+ 5
- 5
dselect/install View File

@@ -49,7 +49,7 @@ yesno() {

if [ "$WAIT" = "true" ]; then
$APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" -d dselect-upgrade
echo $"Press enter to continue." && read RES
echo $"Press [Enter] to continue." && read RES
$APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade
RES=$?
else
@@ -81,18 +81,18 @@ if [ $RES -eq 0 ]; then
case $(echo $CLEAN | tr '[:upper:]' '[:lower:]') in
auto)
$APTGET "$APT_OPT0" "$APT_OPT1" autoclean &&
echo $"Press enter to continue." && read RES && exit 0;
echo $"Press [Enter] to continue." && read RES && exit 0;
;;
always)
$APTGET "$APT_OPT0" "$APT_OPT1" clean &&
echo $"Press enter to continue." && read RES && exit 0;
echo $"Press [Enter] to continue." && read RES && exit 0;
;;
prompt)
exec 3>&1
echo -n $"Do you want to erase any previously downloaded .deb files?"
if [ $(yesno "" y) = y ]; then
$APTGET "$APT_OPT0" "$APT_OPT1" clean &&
echo $"Press enter to continue." && read RES && exit 0;
echo $"Press [Enter] to continue." && read RES && exit 0;
fi
;;
*)
@@ -103,7 +103,7 @@ else
echo $"will be configured. This may result in duplicate errors"
echo $"or errors caused by missing dependencies. This is OK, only the errors"
echo $"above this message are important. Please fix them and run [I]nstall again"
echo $"Press enter to continue."
echo $"Press [Enter] to continue."
read RES && $DPKG "$DPKG_OPTS" --configure -a
exit 100
fi


+ 1
- 1
dselect/update View File

@@ -42,7 +42,7 @@ then
fi

if [ x$PROMPT = "xtrue" ]; then
echo $"Press enter to continue." && read RES;
echo $"Press [Enter] to continue." && read RES;
fi

exit $STATUS

+ 4
- 4
po/apt-all.pot View File

@@ -200,7 +200,7 @@ msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""

#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgid "Please insert a Disc in the drive and press [Enter]"
msgstr ""

#: cmdline/apt-cdrom.cc:140
@@ -1563,7 +1563,7 @@ msgstr ""
msgid ""
"Media change: please insert the disc labeled\n"
" '%s'\n"
"in the drive '%s' and press enter\n"
"in the drive '%s' and press [Enter]\n"
msgstr ""

#. Only warn if there are no sources.list.d.
@@ -1623,7 +1623,7 @@ msgstr ""

#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
#: dselect/install:106 dselect/update:45
msgid "Press enter to continue."
msgid "Press [Enter] to continue."
msgstr ""

#: dselect/install:92
@@ -2057,7 +2057,7 @@ msgstr ""

#: apt-pkg/acquire-worker.cc:485
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
msgstr ""

#: apt-pkg/cachefile.cc:94


+ 1
- 1
test/integration/test-apt-cdrom View File

@@ -38,7 +38,7 @@ aptautotest_aptcdromlog_add() { aptautotest_aptget_update "$@"; }
CDROM_PRE="Using CD-ROM mount point $(readlink -f ./rootdir/media)/cdrom/
Unmounting CD-ROM...
Waiting for disc...
Please insert a Disc in the drive and press enter
Please insert a Disc in the drive and press [Enter]
Mounting CD-ROM...
Scanning disc for index files..."
CDROM_POST="This disc is called:


Loading…
Cancel
Save