[PATCH 5/5] misc capitalisation and spelling

Tim Wootton tim at tee-jay.demon.co.uk
Fri Jul 11 01:21:38 PDT 2014


Signed-off-by: Tim Wootton <tim at tee-jay.demon.co.uk>
---
 qt-ui/divecomputermanagementdialog.cpp | 2 +-
 qt-ui/globe.cpp                        | 2 +-
 qt-ui/maintab.cpp                      | 2 +-
 qt-ui/mainwindow.cpp                   | 2 +-
 qt-ui/models.cpp                       | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/qt-ui/divecomputermanagementdialog.cpp b/qt-ui/divecomputermanagementdialog.cpp
index 7d52e83..567abd4 100644
--- a/qt-ui/divecomputermanagementdialog.cpp
+++ b/qt-ui/divecomputermanagementdialog.cpp
@@ -47,7 +47,7 @@ void DiveComputerManagementDialog::tryRemove(const QModelIndex &index)
 
 	QMessageBox::StandardButton response = QMessageBox::question(
 	    this, TITLE_OR_TEXT(
-		      tr("Remove the selected Dive Computer?"),
+		      tr("Remove the selected dive computer?"),
 		      tr("Are you sure that you want to \n remove the selected dive computer?")),
 	    QMessageBox::Ok | QMessageBox::Cancel);
 
diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp
index 91d8834..8af76ac 100644
--- a/qt-ui/globe.cpp
+++ b/qt-ui/globe.cpp
@@ -117,7 +117,7 @@ bool GlobeGPS::eventFilter(QObject *obj, QEvent *ev)
 void GlobeGPS::contextMenuEvent(QContextMenuEvent *ev)
 {
 	QMenu m;
-	QAction *a = m.addAction(tr("Edit Selected Dive Locations"), this, SLOT(prepareForGetDiveCoordinates()));
+	QAction *a = m.addAction(tr("Edit selected dive locations"), this, SLOT(prepareForGetDiveCoordinates()));
 	a->setData(QVariant::fromValue<void *>(&m));
 	m.exec(ev->globalPos());
 }
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index e28511f..a7950c0 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -791,7 +791,7 @@ void MainTab::rejectChanges()
 	    (modified ||
 	     memcmp(&current_dive->cylinder[0], &displayed_dive.cylinder[0], sizeof(cylinder_t) * MAX_CYLINDERS) ||
 	     memcmp(&current_dive->cylinder[0], &displayed_dive.weightsystem[0], sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS))) {
-		if (QMessageBox::warning(MainWindow::instance(), TITLE_OR_TEXT(tr("Discard the Changes?"),
+		if (QMessageBox::warning(MainWindow::instance(), TITLE_OR_TEXT(tr("Discard the changes?"),
 									       tr("You are about to discard your changes.")),
 					 QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard) != QMessageBox::Discard) {
 			return;
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 2b762d9..c221298 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -711,7 +711,7 @@ bool MainWindow::askSaveChanges()
 	if (existing_filename)
 		message = tr("Do you want to save the changes that you made in the file %1?").arg(existing_filename);
 	else
-		message = tr("Do you want to save the changes that you made in the datafile?");
+		message = tr("Do you want to save the changes that you made in the data file?");
 
 	response.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
 	response.setDefaultButton(QMessageBox::Save);
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp
index aa3f302..98f35e2 100644
--- a/qt-ui/models.cpp
+++ b/qt-ui/models.cpp
@@ -66,7 +66,7 @@ void CleanerTableModel::setHeaderDataStrings(const QStringList &newHeaders)
 CylindersModel::CylindersModel(QObject *parent) : rows(0)
 {
 	//	enum {REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH};
-	setHeaderDataStrings(QStringList() << "" << tr("Type") << tr("Size") << tr("WorkPress") << tr("StartPress") << tr("EndPress") << trUtf8("O" UTF8_SUBSCRIPT_2 "%") << tr("He%")
+	setHeaderDataStrings(QStringList() << "" << tr("Type") << tr("Size") << tr("Work press.") << tr("Start press.") << tr("End press.") << trUtf8("O" UTF8_SUBSCRIPT_2 "%") << tr("He%")
 					   << tr("Switch at")
 			     );
 }
@@ -430,7 +430,7 @@ QVariant WeightModel::data(const QModelIndex &index, int role) const
 		break;
 	case Qt::ToolTipRole:
 		if (index.column() == REMOVE)
-			ret = tr("Clicking here will remove this weigthsystem.");
+			ret = tr("Clicking here will remove this weight system.");
 		break;
 	}
 	return ret;
@@ -1439,7 +1439,7 @@ QVariant DiveComputerModel::data(const QModelIndex &index, int role) const
 			ret = QIcon(":trash");
 			break;
 		case Qt::ToolTipRole:
-			ret = tr("Clicking here will remove this divecomputer.");
+			ret = tr("Clicking here will remove this dive computer.");
 			break;
 		}
 	}
@@ -1895,7 +1895,7 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const
 		// headings
 		if (row == 2) {
 			if (col == 0)
-				return tr("Gas Used:");
+				return tr("Gas used:");
 			if (col == 2)
 				return tr("SAC:");
 			if (col == 3)
-- 
2.0.0



More information about the subsurface mailing list