[PATCH 2/5] Match agreed captalisation style
Tim Wootton
tim at tee-jay.demon.co.uk
Mon Nov 24 15:42:31 PST 2014
Signed-off-by: Tim Wootton <tim at tee-jay.demon.co.uk>
---
qt-ui/divelogimportdialog.ui | 2 [32m+[m[31m-[m
qt-ui/filtermodels.cpp | 2 [32m+[m[31m-[m
qt-ui/maintab.cpp | 4 [32m++[m[31m--[m
qt-ui/mainwindow.cpp | 2 [32m+[m[31m-[m
qt-ui/mainwindow.ui | 6 [32m+++[m[31m---[m
qt-ui/updatemanager.cpp | 6 [32m+++[m[31m---[m
uemis-downloader.c | 2 [32m+[m[31m-[m
uemis.c | 34 [32m+++++++++++++++++[m[31m-----------------[m
8 files changed, 29 insertions(+), 29 deletions(-)
[1mdiff --git a/qt-ui/divelogimportdialog.ui b/qt-ui/divelogimportdialog.ui[m
[1mindex 47a0e54..97b6989 100644[m
[1m--- a/qt-ui/divelogimportdialog.ui[m
[1m+++ b/qt-ui/divelogimportdialog.ui[m
[36m@@ -510,7 +510,7 @@[m
<item row="5" column="0">[m
<widget class="QCheckBox" name="GpsCheck">[m
<property name="text">[m
[31m- <string>Gps</string>[m
[32m+[m[32m <string>GPS</string>[m
</property>[m
</widget>[m
</item>[m
[1mdiff --git a/qt-ui/filtermodels.cpp b/qt-ui/filtermodels.cpp[m
[1mindex 7ef0df3..01d2592 100644[m
[1m--- a/qt-ui/filtermodels.cpp[m
[1m+++ b/qt-ui/filtermodels.cpp[m
[36m@@ -141,7 +141,7 @@[m [mvoid TagFilterModel::repopulate()[m
current_tag_entry = current_tag_entry->next;[m
}[m
qSort(list);[m
[31m- list << tr("Empty Tags");[m
[32m+[m [32mlist << tr("Empty tags");[m
setStringList(list);[m
delete[] checkState;[m
checkState = new bool[list.count()];[m
[1mdiff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp[m
[1mindex 68775c8..8981663 100644[m
[1m--- a/qt-ui/maintab.cpp[m
[1m+++ b/qt-ui/maintab.cpp[m
[36m@@ -92,11 +92,11 @@[m [mMainTab::MainTab(QWidget *parent) : QTabWidget(parent),[m
label->setAlignment(Qt::AlignHCenter);[m
}[m
ui.cylinders->setTitle(tr("Cylinders"));[m
[31m- ui.cylinders->setBtnToolTip(tr("Add Cylinder"));[m
[32m+[m [32mui.cylinders->setBtnToolTip(tr("Add cylinder"));[m
connect(ui.cylinders, SIGNAL(addButtonClicked()), this, SLOT(addCylinder_clicked()));[m
[m
ui.weights->setTitle(tr("Weights"));[m
[31m- ui.weights->setBtnToolTip(tr("Add Weight System"));[m
[32m+[m [32mui.weights->setBtnToolTip(tr("Add weight system"));[m
connect(ui.weights, SIGNAL(addButtonClicked()), this, SLOT(addWeight_clicked()));[m
[m
connect(ui.cylinders->view(), SIGNAL(clicked(QModelIndex)), this, SLOT(editCylinderWidget(QModelIndex)));[m
[1mdiff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp[m
[1mindex a02ff03..f26c0f1 100644[m
[1m--- a/qt-ui/mainwindow.cpp[m
[1m+++ b/qt-ui/mainwindow.cpp[m
[36m@@ -575,7 +575,7 @@[m [mvoid MainWindow::on_actionYearlyStatistics_triggered()[m
connect(quit, SIGNAL(activated()), this, SLOT(close()));[m
d.setWindowFlags(Qt::Window | Qt::CustomizeWindowHint[m
| Qt::WindowCloseButtonHint | Qt::WindowTitleHint);[m
[31m- d.setWindowTitle(tr("Yearly Statistics"));[m
[32m+[m [32md.setWindowTitle(tr("Yearly statistics"));[m
d.exec();[m
}[m
[m
[1mdiff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui[m
[1mindex 6d857a8..ecbd4d7 100644[m
[1m--- a/qt-ui/mainwindow.ui[m
[1m+++ b/qt-ui/mainwindow.ui[m
[36m@@ -624,7 +624,7 @@[m [mp, li { white-space: pre-wrap; }[m
<string>&Export</string>[m
</property>[m
<property name="toolTip">[m
[31m- <string>Export Dive Logs</string>[m
[32m+[m[32m <string>Export dive logs</string>[m
</property>[m
<property name="shortcut">[m
<string>Ctrl+E</string>[m
[36m@@ -655,7 +655,7 @@[m [mp, li { white-space: pre-wrap; }[m
<normaloff>:/icon_o2</normaloff>:/icon_o2</iconset>[m
</property>[m
<property name="text">[m
[31m- <string>Toggle pO2 Graph</string>[m
[32m+[m[32m <string>Toggle pO₂ graph</string>[m
</property>[m
</action>[m
<action name="profPn2">[m
[36m@@ -667,7 +667,7 @@[m [mp, li { white-space: pre-wrap; }[m
<normaloff>:/icon_n2</normaloff>:/icon_n2</iconset>[m
</property>[m
<property name="text">[m
[31m- <string>Toggle pN2 Graph</string>[m
[32m+[m[32m <string>Toggle pN₂ graph</string>[m
</property>[m
</action>[m
<action name="profPhe">[m
[1mdiff --git a/qt-ui/updatemanager.cpp b/qt-ui/updatemanager.cpp[m
[1mindex 858de56..a181f34 100644[m
[1m--- a/qt-ui/updatemanager.cpp[m
[1m+++ b/qt-ui/updatemanager.cpp[m
[36m@@ -56,16 +56,16 @@[m [mvoid UpdateManager::requestReceived()[m
msgbox.setIcon(QMessageBox::Information);[m
[m
if (responseBody == "OK") {[m
[31m- msgText = tr("You are using the latest version of subsurface.");[m
[32m+[m [32mmsgText = tr("You are using the latest version of Subsurface.");[m
} else if (responseBody.startsWith("http")) {[m
[31m- msgText = tr("A new version of subsurface is available.<br/>Click on:<br/><a href=\"%1\">%1</a><br/> to download it.")[m
[32m+[m [32mmsgText = tr("A new version of Subsurface is available.<br/>Click on:<br/><a href=\"%1\">%1</a><br/> to download it.")[m
.arg(responseBody);[m
} else if (responseBody.startsWith("Latest version")) {[m
// the webservice backend doesn't localize - but it's easy enough to just replace the[m
// strings that it is likely to send back[m
responseBody.replace("Latest version is ", "");[m
responseBody.replace(". please check with your OS vendor for updates.", "");[m
[31m- msgText = QString("<b>") + tr("A new version of subsurface is available.") + QString("</b><br/><br/>") +[m
[32m+[m [32mmsgText = QString("<b>") + tr("A new version of Subsurface is available.") + QString("</b><br/><br/>") +[m
tr("Latest version is %1, please check with your OS vendor for updates.")[m
.arg(responseBody);[m
} else {[m
[1mdiff --git a/uemis-downloader.c b/uemis-downloader.c[m
[1mindex 256f139..5dfce6c 100644[m
[1m--- a/uemis-downloader.c[m
[1m+++ b/uemis-downloader.c[m
[36m@@ -850,7 +850,7 @@[m [mconst char *do_uemis_import(device_data_t *data)[m
[m
if (dive_table.nr == 0)[m
keep_number = true;[m
[31m- uemis_info(translate("gettextFromC", "Init Communication"));[m
[32m+[m [32muemis_info(translate("gettextFromC", "Initialise communication"));[m
if (!uemis_init(mountpath))[m
return translate("gettextFromC", "Uemis init failed");[m
if (!uemis_get_answer(mountpath, "getDeviceId", 0, 1, &result))[m
[1mdiff --git a/uemis.c b/uemis.c[m
[1mindex 327b350..b6cadb8 100644[m
[1m--- a/uemis.c[m
[1m+++ b/uemis.c[m
[36m@@ -193,45 +193,45 @@[m [mstatic void uemis_event(struct dive *dive, struct divecomputer *dc, struct sampl[m
static int lastndl;[m
[m
if (flags[1] & 0x01)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Safety Stop Violation"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Safety stop violation"));[m
if (flags[1] & 0x08)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Speed Alarm"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Speed alarm"));[m
#if WANT_CRAZY_WARNINGS[m
if (flags[1] & 0x06) /* both bits 1 and 2 are a warning */[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Speed Warning"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Speed warning"));[m
if (flags[1] & 0x10)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "pO₂ Green Warning"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "pO₂ green warning"));[m
#endif[m
if (flags[1] & 0x20)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "pO₂ Ascend Warning"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "pO₂ ascend warning"));[m
if (flags[1] & 0x40)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "pO₂ Ascend Alarm"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "pO₂ ascend alarm"));[m
/* flags[2] reflects the deco / time bar[m
* flags[3] reflects more display details on deco and pO2 */[m
if (flags[4] & 0x01)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Tank Pressure Info"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Tank pressure info"));[m
if (flags[4] & 0x04)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "RGT Warning"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "RGT warning"));[m
if (flags[4] & 0x08)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "RGT Alert"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "RGT alert"));[m
if (flags[4] & 0x40)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Tank Change Suggested"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Tank change suggested"));[m
if (flags[4] & 0x80)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Depth Limit Exceeded"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Depth limit exceeded"));[m
if (flags[5] & 0x01)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Max Deco Time Warning"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Max deco time warning"));[m
if (flags[5] & 0x04)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Dive Time Info"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Dive time info"));[m
if (flags[5] & 0x08)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Dive Time Alert"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Dive time alert"));[m
if (flags[5] & 0x10)[m
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Marker"));[m
if (flags[6] & 0x02)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "No Tank Data"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "No tank data"));[m
if (flags[6] & 0x04)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Low Battery Warning"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Low battery warning"));[m
if (flags[6] & 0x08)[m
[31m- add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Low Battery Alert"));[m
[32m+[m [32madd_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Low battery alert"));[m
/* flags[7] reflects the little on screen icons that remind of previous[m
* warnings / alerts - not useful for events */[m
[m
--
2.1.1
More information about the subsurface
mailing list