[Aptitude-devel] r3138 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Wed Apr 27 12:16:47 2005
New Revision: 3138

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/download_bar.cc
   branches/aptitude-0.3/aptitude/src/download_list.cc
Log:
Don't word the question so awkwardly.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Apr 27 12:16:47 2005
@@ -2,6 +2,10 @@
 
 	* src/download_bar.cc, src/download_list.cc:
 
+	  Word the question less awkwardly.
+
+	* src/download_bar.cc, src/download_list.cc:
+
 	  Flow the other media-change question, and get rid of an
 	  unnecessary newline in both media-change questions (since the
 	  text is wrapped now, there's no need to break after the first

Modified: branches/aptitude-0.3/aptitude/src/download_bar.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_bar.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/download_bar.cc	Wed Apr 27 12:16:47 2005
@@ -53,8 +53,8 @@
 {
   CRITICAL_ENTER
 
-    fragment *f=wrapbox(fragf(_("Please insert the following disc into the drive \"%s\": %s"),
-			      drive.c_str(), media.c_str()));
+    fragment *f=wrapbox(fragf(_("Please insert the disc labeled \"%s\" into the drive \"%s\""),
+			      media.c_str(), drive.c_str()));
 
   f->set_attr(get_color("MediaChange"));
 

Modified: branches/aptitude-0.3/aptitude/src/download_list.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_list.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/download_list.cc	Wed Apr 27 12:16:47 2005
@@ -260,8 +260,8 @@
 				download_manager &manager)
 {
   fragment *f=wrapbox(fragf(
-			    _("Please insert the following disc into the drive \"%s\": %s"),
-			    drive.c_str(), media.c_str()));
+			    _("Please insert the disc labeled \"%s\" into the drive \"%s\""),
+			    media.c_str(), drive.c_str()));
 
   f->set_attr(get_color("MediaChange"));