[PATCH 3/3] More style and readability changes Changes to capitalisation to comply with coding style Changes to make some blocks of english sound a bit better

Tim Wootton tim at tee-jay.org.uk
Fri Sep 4 15:25:35 PDT 2015


Signed-off-by: Tim Wootton <tim at tee-jay.org.uk>
---
 qt-ui/configuredivecomputerdialog.ui | 12 ++++++------
 qt-ui/divelogexportdialog.cpp        |  2 +-
 qt-ui/downloadfromdivecomputer.cpp   |  2 +-
 qt-ui/downloadfromdivecomputer.ui    |  2 +-
 qt-ui/mainwindow.cpp                 |  8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui
index d040849..f8e1e29 100644
--- a/qt-ui/configuredivecomputerdialog.ui
+++ b/qt-ui/configuredivecomputerdialog.ui
@@ -904,7 +904,7 @@
             <item row="8" column="0">
              <widget class="QCheckBox" name="modWarning">
               <property name="text">
-               <string>Mod warning</string>
+               <string>MOD warning</string>
               </property>
              </widget>
             </item>
@@ -918,7 +918,7 @@
             <item row="9" column="0" colspan="2">
              <widget class="QCheckBox" name="dynamicAscendRate">
               <property name="text">
-               <string>Dynamic ascend rate</string>
+               <string>Dynamic ascent rate</string>
               </property>
              </widget>
             </item>
@@ -971,7 +971,7 @@
             <item row="12" column="4">
              <widget class="QSpinBox" name="bottomGasConsumption">
               <property name="suffix">
-               <string> l/m</string>
+               <string> ℓ/min</string>
               </property>
               <property name="minimum">
                <number>5</number>
@@ -987,7 +987,7 @@
             <item row="13" column="4">
              <widget class="QSpinBox" name="decoGasConsumption">
               <property name="suffix">
-               <string> l/m</string>
+               <string> ℓ/min</string>
               </property>
               <property name="minimum">
                <number>5</number>
@@ -2216,7 +2216,7 @@
             <item row="12" column="4">
              <widget class="QSpinBox" name="decoGasConsumption_3">
               <property name="suffix">
-               <string> l/m</string>
+               <string> ℓ/min</string>
               </property>
               <property name="minimum">
                <number>5</number>
@@ -2232,7 +2232,7 @@
             <item row="11" column="4">
              <widget class="QSpinBox" name="bottomGasConsumption_3">
               <property name="suffix">
-               <string> l/m</string>
+               <string> ℓ/min</string>
               </property>
               <property name="minimum">
                <number>5</number>
diff --git a/qt-ui/divelogexportdialog.cpp b/qt-ui/divelogexportdialog.cpp
index cf48a62..7a406b9 100644
--- a/qt-ui/divelogexportdialog.cpp
+++ b/qt-ui/divelogexportdialog.cpp
@@ -196,7 +196,7 @@ void DiveLogExportDialog::on_buttonBox_accepted()
 		// the non XSLT exports are called directly above, the XSLT based ons are called here
 		if (!stylesheet.isEmpty()) {
 			future = QtConcurrent::run(export_dives_xslt, filename.toUtf8(), ui->exportSelected->isChecked(), ui->CSVUnits_2->currentIndex(), stylesheet.toUtf8());
-			MainWindow::instance()->getNotificationWidget()->showNotification(tr("Please Wait, Exporting..."), KMessageWidget::Information);
+			MainWindow::instance()->getNotificationWidget()->showNotification(tr("Please wait, exporting..."), KMessageWidget::Information);
 			MainWindow::instance()->getNotificationWidget()->setFuture(future);
 		}
 	}
diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp
index 063e2aa..92f2455 100644
--- a/qt-ui/downloadfromdivecomputer.cpp
+++ b/qt-ui/downloadfromdivecomputer.cpp
@@ -101,7 +101,7 @@ DownloadFromDCWidget::DownloadFromDCWidget(QWidget *parent, Qt::WindowFlags f) :
 	ui.downloadCancelRetryButton->setText(tr("Download"));
 
 #if defined(BT_SUPPORT)
-	ui.bluetoothMode->setText(tr("Choose Bluetooth Download mode"));
+	ui.bluetoothMode->setText(tr("Choose Bluetooth download mode"));
 	btDeviceSelectionDialog = 0;
 	ui.chooseBluetoothDevice->setEnabled(ui.bluetoothMode->isChecked());
 	connect(ui.bluetoothMode, SIGNAL(stateChanged(int)), this, SLOT(enableBluetoothMode(int)));
diff --git a/qt-ui/downloadfromdivecomputer.ui b/qt-ui/downloadfromdivecomputer.ui
index f232967..b1f1520 100644
--- a/qt-ui/downloadfromdivecomputer.ui
+++ b/qt-ui/downloadfromdivecomputer.ui
@@ -119,7 +119,7 @@
          <item row="11" column="0">
           <widget class="QCheckBox" name="bluetoothMode">
            <property name="text">
-            <string>Choose Bluetooth Download mode</string>
+            <string>Choose Bluetooth download mode</string>
            </property>
           </widget>
          </item>
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 1d98f2b..b19a230 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -1568,10 +1568,10 @@ void MainWindow::loadFiles(const QStringList fileNames)
 	if (min_datafile_version >0 && min_datafile_version < DATAFORMAT_VERSION) {
 		QMessageBox::warning(this, tr("Opening datafile from older version"),
 				     tr("You opened a data file from an older version of Subsurface. We recommend "
-					"to read the manual to learn about the changes in the new version, especially "
-					"about dive site management which changed significantly.\n"
-					"Subsurface already tried to prepopulate the data but it might be worth "
-					"while to take a look at the new dive site management system and to make "
+					"you read the manual to learn about the changes in the new version, especially "
+					"about dive site management which has changed significantly.\n"
+					"Subsurface has already tried to pre-populate the data but it might be worth "
+					"while taking a look at the new dive site management system and to make "
 					"sure that everything looks correct."));
 	}
 }
-- 
2.1.4



More information about the subsurface mailing list