Index: trunk/BNC/bncmain.cpp
===================================================================
--- trunk/BNC/bncmain.cpp	(revision 1500)
+++ trunk/BNC/bncmain.cpp	(revision 1501)
@@ -61,8 +61,11 @@
   bool       GUIenabled  = true;
   bool       fileInput   = false;
+  bool       confFile  = false;
   QByteArray fileName;
   QByteArray format; 
   QString    dateString;
   QString    timeString;
+  QString    confFileName;
+  QString    confFileIs;
 
   for (int ii = 1; ii < argc; ii++) {
@@ -98,9 +101,28 @@
       }
     }
+    if (QByteArray(argv[ii]) == "-conf" || QByteArray(argv[ii]) == "--conf") {
+      confFile  = true;
+      if (ii+1 < argc) {
+        confFileName = QString(argv[ii+1]);
+      }
+    }
+  }
+
+  if (confFile && confFileName.isEmpty() ) {
+      cout << "Usage: bnc --conf <confFileName>\n"
+              "           --file <inputFileName>\n"
+              "           --format <RTIGS | RTCM_2 | RTCM_3>\n" 
+              "           --date YYYY-MM-DD  --time HH:MM:SS" << endl;
+      exit(0);
   }
 
   QCoreApplication::setOrganizationName("BKG");
   QCoreApplication::setOrganizationDomain("www.bkg.bund.de");
-  QCoreApplication::setApplicationName("BKG_NTRIP_Client");
+  if (!confFileName.isEmpty()) {
+    confFileIs = confFileName;
+  } else {
+    confFileIs = "BKG_NTRIP_Client";
+  }
+  QCoreApplication::setApplicationName(confFileIs);
 
   // Default Settings
@@ -138,5 +160,4 @@
 
 
-
   bncApp app(argc, argv, GUIenabled);
 
@@ -187,5 +208,5 @@
       caster->slotReadMountPoints();
       if (caster->numStations() == 0) {
-        return 0;
+      return 0;
       }
     }
@@ -196,5 +217,6 @@
       if ( fileName.isEmpty() || format.isEmpty() || 
            dateString.isEmpty() || timeString.isEmpty() ) {
-        cout << "Usage: bnc --file <fileName>\n"
+        cout << "Usage: bnc --conf <confFileName>\n"
+                "           --file <inputFileName>\n"
                 "           --format <RTIGS | RTCM_2 | RTCM_3>\n" 
                 "           --date YYYY-MM-DD  --time HH:MM:SS" << endl;
Index: trunk/BNC/bncwindow.cpp
===================================================================
--- trunk/BNC/bncwindow.cpp	(revision 1500)
+++ trunk/BNC/bncwindow.cpp	(revision 1501)
@@ -859,5 +859,7 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::slotResetOptions() {
-  int iRet = QMessageBox::question(this, "Reset", "Delete saved options?",
+  int iRet = QMessageBox::question(this, "Reset", "Remove all configuration"
+                                   " options from configuration"
+                                   " file/register on disk?",
                                    QMessageBox::Yes, QMessageBox::No,
                                    QMessageBox::NoButton);