Index: /branches/BNC_2.12/src/bncwindow.cpp
===================================================================
--- /branches/BNC_2.12/src/bncwindow.cpp	(revision 8491)
+++ /branches/BNC_2.12/src/bncwindow.cpp	(revision 8492)
@@ -280,7 +280,7 @@
   _outSamplComboBox    = new QComboBox();
   _outSamplComboBox->addItems(QString("0.1 sec,1 sec,5 sec,10 sec,15 sec,30 sec,60 sec").split(","));
-  int nn = _rnxSamplComboBox->findText(settings.value("rnxSampl").toString());
+  int nn = _outSamplComboBox->findText(settings.value("outSampl").toString());
     if (nn != -1) {
-      _rnxSamplComboBox->setCurrentIndex(nn);
+      _outSamplComboBox->setCurrentIndex(nn);
     }
   _outFileLineEdit    = new QLineEdit(settings.value("outFile").toString());
@@ -2185,5 +2185,5 @@
   populateMountPointsTable();
   bncSettings settings;
-  _outSamplComboBox->findText(settings.value("rnxSampl").toString());
+  _outSamplComboBox->findText(settings.value("outSampl").toString());
   _outWaitSpinBox->setValue(settings.value("outWait").toInt());
   QListIterator<bncGetThread*> iTh(threads);
Index: /branches/BNC_2.12/src/reqcdlg.cpp
===================================================================
--- /branches/BNC_2.12/src/reqcdlg.cpp	(revision 8491)
+++ /branches/BNC_2.12/src/reqcdlg.cpp	(revision 8492)
@@ -35,5 +35,5 @@
  * Created:    28-Mar-2012
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -90,5 +90,5 @@
   _reqcSampling->addItems(QString("0.1 sec,1 sec,5 sec,10 sec,15 sec,30 sec,60 sec").split(","));
   bncSettings settings;
-  int ll = _reqcSampling->findText(settings.value("reqcSampl").toString());
+  int ll = _reqcSampling->findText(settings.value("reqcSampling").toString());
   if (ll != -1) {
     _reqcSampling->setCurrentIndex(ll);
@@ -229,5 +229,5 @@
   // WhatsThis, RINEX Editing & QC
   // -----------------------------
-  _reqcRnxVersion->setWhatsThis(tr("<p>Select version number of emerging new RINEX file.</p><p>Note the following:</p><p>When converting <u>RINEX Version 2 to Version 3 </u>Observation files, the tracking mode or channel information (signal attribute, see RINEX Version 3 documentation) in the (last out of the three characters) observation code is left blank if unknown.</p><p>When converting <u>RINEX Version 3 to Version 2</u>, the mapping of observations follows a 'Signal priority list' with signal attributes as defined in RINEX Version 3.</p>")); 
+  _reqcRnxVersion->setWhatsThis(tr("<p>Select version number of emerging new RINEX file.</p><p>Note the following:</p><p>When converting <u>RINEX Version 2 to Version 3 </u>Observation files, the tracking mode or channel information (signal attribute, see RINEX Version 3 documentation) in the (last out of the three characters) observation code is left blank if unknown.</p><p>When converting <u>RINEX Version 3 to Version 2</u>, the mapping of observations follows a 'Signal priority list' with signal attributes as defined in RINEX Version 3.</p>"));
   _reqcSampling->setWhatsThis(tr("<p>Select sampling rate of emerging new RINEX Observation file.</p>"));
   _reqcV2Priority->setWhatsThis(tr("<p>Specify a priority list of characters defining signal attributes as defined in RINEX Version 3. Priorities will be used to map observations with RINEX Version 3 attributes from incoming streams to Version 2. The underscore character '_' stands for undefined attributes. A question mark '?' can be used as wildcard which represents any one character.</p><p>Signal priorities can be specified as equal for all systems, as system specific or as system and freq. specific. For example: </li><ul><li>'CWPX_?' (General signal priorities valid for all GNSS) </li><li>'C:IQX I:ABCX' (System specific signal priorities for BDS and IRNSS) </li><li>'G:12&PWCSLXYN G:5&IQX R:12&PC R:3&IQX' (System and frequency specific signal priorities) </li></ul>Default is the following priority list 'G:12&PWCSLXYN_ G:5&IQX_ R:12&PC_ R:3&IQX_ E:16&BCX_ E:578&IQX_ J:1&SLXCZ_ J:26&SLX_ J:5&IQX_ C:IQX_ I:ABCX_ S:1&C_ S:5&IQX_'.</p>"));
@@ -280,5 +280,5 @@
 void reqcDlg::closeEvent(QCloseEvent* event) {
 
-  int iRet = QMessageBox::question(this, "Close", "Save Options?", 
+  int iRet = QMessageBox::question(this, "Close", "Save Options?",
                                    QMessageBox::Yes, QMessageBox::No,
                                    QMessageBox::Cancel);