X-Git-Url: https://cygwin.com/git/?a=blobdiff_plain;f=ini.cc;h=3ef131185cc37abe16dcd890cf7dc57a45fb1e32;hb=20f237b4e884af7992c5b5e270301684f64d0395;hp=99b2ac631639ff02b8e564055a18e438d9b72e26;hpb=069cfbb46fec0e5f54c0d009e3e3dc0870187dab;p=cygwin-apps%2Fsetup.git

diff --git a/ini.cc b/ini.cc
index 99b2ac63..3ef13118 100644
--- a/ini.cc
+++ b/ini.cc
@@ -61,17 +61,18 @@ std::string ini_setup_version;
 IniList setup_ext_list (setup_exts,
 			setup_exts + (sizeof(setup_exts) / sizeof(*setup_exts)));
 
-static BoolOption NoVerifyOption (false, 'X', "no-verify", "Don't verify setup.ini signatures");
-static BoolOption NoVersionCheckOption (false, '\0', "no-version-check", "Suppress checking if a newer version of setup is available");
+static BoolOption NoVerifyOption (false, 'X', "no-verify", IDS_HELPTEXT_NO_VERIFY);
+static BoolOption NoVersionCheckOption (false, '\0', "no-version-check", IDS_HELPTEXT_NO_VERSION_CHECK);
 
 class GuiParseFeedback : public IniParseFeedback
 {
 public:
   GuiParseFeedback () : lastpct (0)
     {
+      Progress.SetText1 (IDS_PROGRESS_PARSING);
       Progress.SetText2 ("");
       Progress.SetText3 ("");
-      Progress.SetText4 (IDS_PROGRESS_PARSING);
+      Progress.SetText4 (IDS_PROGRESS_PROGRESS);
 
       yyerror_count = 0;
       yyerror_messages.clear ();
@@ -98,7 +99,6 @@ public:
     }
   virtual void iniName (const std::string& name)
     {
-      Progress.SetText1 (IDS_PROGRESS_PARSING);
       Progress.SetText2 (name.c_str ());
       Progress.SetText3 ("");
       filename = name;
@@ -134,7 +134,10 @@ public:
     }
   virtual ~ GuiParseFeedback ()
     {
+      Progress.SetText2 ("");
+      Progress.SetText3 ("");
       Progress.SetText4 (IDS_PROGRESS_PACKAGE);
+      Progress.SetBar1 (0);
     }
 private:
   unsigned int lastpct;