mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Match agreed captalisation style

Browse source 
Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tim Wootton 2014-11-25 15:47:24 +00:00 • committed by Dirk Hohndel
parent f72ec5e29b
commit 93d59c22d7
8 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/divelogimportdialog.ui
View file

@ -510,7 +510,7 @@
<item row="5" column="0"> <item row="5" column="0">
<widget class="QCheckBox" name="GpsCheck"> <widget class="QCheckBox" name="GpsCheck">
<property name="text"> <property name="text">
<string>Gps</string> <string>GPS</string>
</property> </property>
</widget> </widget>
</item> </item>

2
qt-ui/filtermodels.cpp
View file

@ -141,7 +141,7 @@ void TagFilterModel::repopulate()
current_tag_entry = current_tag_entry->next; current_tag_entry = current_tag_entry->next;
} }
qSort(list); qSort(list);
list << tr("Empty Tags"); list << tr("Empty tags");
setStringList(list); setStringList(list);
delete[] checkState; delete[] checkState;
checkState = new bool[list.count()]; checkState = new bool[list.count()];

4
qt-ui/maintab.cpp
View file

@ -92,11 +92,11 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
label->setAlignment(Qt::AlignHCenter); label->setAlignment(Qt::AlignHCenter);
} }
ui.cylinders->setTitle(tr("Cylinders")); ui.cylinders->setTitle(tr("Cylinders"));
ui.cylinders->setBtnToolTip(tr("Add Cylinder")); ui.cylinders->setBtnToolTip(tr("Add cylinder"));
connect(ui.cylinders, SIGNAL(addButtonClicked()), this, SLOT(addCylinder_clicked())); connect(ui.cylinders, SIGNAL(addButtonClicked()), this, SLOT(addCylinder_clicked()));
ui.weights->setTitle(tr("Weights")); ui.weights->setTitle(tr("Weights"));
ui.weights->setBtnToolTip(tr("Add Weight System")); ui.weights->setBtnToolTip(tr("Add weight system"));
connect(ui.weights, SIGNAL(addButtonClicked()), this, SLOT(addWeight_clicked())); connect(ui.weights, SIGNAL(addButtonClicked()), this, SLOT(addWeight_clicked()));
connect(ui.cylinders->view(), SIGNAL(clicked(QModelIndex)), this, SLOT(editCylinderWidget(QModelIndex))); connect(ui.cylinders->view(), SIGNAL(clicked(QModelIndex)), this, SLOT(editCylinderWidget(QModelIndex)));

2
qt-ui/mainwindow.cpp
View file

@ -575,7 +575,7 @@ void MainWindow::on_actionYearlyStatistics_triggered()
connect(quit, SIGNAL(activated()), this, SLOT(close())); connect(quit, SIGNAL(activated()), this, SLOT(close()));
d.setWindowFlags(Qt::Window | Qt::CustomizeWindowHint d.setWindowFlags(Qt::Window | Qt::CustomizeWindowHint
| Qt::WindowCloseButtonHint | Qt::WindowTitleHint); | Qt::WindowCloseButtonHint | Qt::WindowTitleHint);
d.setWindowTitle(tr("Yearly Statistics")); d.setWindowTitle(tr("Yearly statistics"));
d.exec(); d.exec();
} }

6
qt-ui/mainwindow.ui
View file

@ -624,7 +624,7 @@ p, li { white-space: pre-wrap; }
<string>&amp;Export</string> <string>&amp;Export</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Export Dive Logs</string> <string>Export dive logs</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+E</string> <string>Ctrl+E</string>
@ -655,7 +655,7 @@ p, li { white-space: pre-wrap; }
<normaloff>:/icon_o2</normaloff>:/icon_o2</iconset> <normaloff>:/icon_o2</normaloff>:/icon_o2</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Toggle pO2 Graph</string> <string>Toggle pO₂ graph</string>
</property> </property>
</action> </action>
<action name="profPn2"> <action name="profPn2">
@ -667,7 +667,7 @@ p, li { white-space: pre-wrap; }
<normaloff>:/icon_n2</normaloff>:/icon_n2</iconset> <normaloff>:/icon_n2</normaloff>:/icon_n2</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Toggle pN2 Graph</string> <string>Toggle pN₂ graph</string>
</property> </property>
</action> </action>
<action name="profPhe"> <action name="profPhe">

6
qt-ui/updatemanager.cpp
View file

@ -56,16 +56,16 @@ void UpdateManager::requestReceived()
msgbox.setIcon(QMessageBox::Information); msgbox.setIcon(QMessageBox::Information);
if (responseBody == "OK") { if (responseBody == "OK") {
msgText = tr("You are using the latest version of subsurface."); msgText = tr("You are using the latest version of Subsurface.");
} else if (responseBody.startsWith("http")) { } else if (responseBody.startsWith("http")) {
msgText = tr("A new version of subsurface is available.<br/>Click on:<br/><a href=\"%1\">%1</a><br/> to download it.") msgText = tr("A new version of Subsurface is available.<br/>Click on:<br/><a href=\"%1\">%1</a><br/> to download it.")
.arg(responseBody); .arg(responseBody);
} else if (responseBody.startsWith("Latest version")) { } else if (responseBody.startsWith("Latest version")) {
// the webservice backend doesn't localize - but it's easy enough to just replace the // the webservice backend doesn't localize - but it's easy enough to just replace the
// strings that it is likely to send back // strings that it is likely to send back
responseBody.replace("Latest version is ", ""); responseBody.replace("Latest version is ", "");
responseBody.replace(". please check with your OS vendor for updates.", ""); responseBody.replace(". please check with your OS vendor for updates.", "");
msgText = QString("<b>") + tr("A new version of subsurface is available.") + QString("</b><br/><br/>") + msgText = QString("<b>") + tr("A new version of Subsurface is available.") + QString("</b><br/><br/>") +
tr("Latest version is %1, please check with your OS vendor for updates.") tr("Latest version is %1, please check with your OS vendor for updates.")
.arg(responseBody); .arg(responseBody);
} else { } else {

2
uemis-downloader.c
View file

@ -850,7 +850,7 @@ const char *do_uemis_import(device_data_t *data)
if (dive_table.nr == 0) if (dive_table.nr == 0)
keep_number = true; keep_number = true;
uemis_info(translate("gettextFromC", "Init Communication")); uemis_info(translate("gettextFromC", "Initialise communication"));
if (!uemis_init(mountpath)) if (!uemis_init(mountpath))
return translate("gettextFromC", "Uemis init failed"); return translate("gettextFromC", "Uemis init failed");
if (!uemis_get_answer(mountpath, "getDeviceId", 0, 1, &result)) if (!uemis_get_answer(mountpath, "getDeviceId", 0, 1, &result))

34
uemis.c
View file

@ -193,45 +193,45 @@ static void uemis_event(struct dive *dive, struct divecomputer *dc, struct sampl
static int lastndl; static int lastndl;
if (flags[1] & 0x01) if (flags[1] & 0x01)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Safety Stop Violation")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Safety stop violation"));
if (flags[1] & 0x08) if (flags[1] & 0x08)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Speed Alarm")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Speed alarm"));
#if WANT_CRAZY_WARNINGS #if WANT_CRAZY_WARNINGS
if (flags[1] & 0x06) /* both bits 1 and 2 are a warning */ if (flags[1] & 0x06) /* both bits 1 and 2 are a warning */
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Speed Warning")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Speed warning"));
if (flags[1] & 0x10) if (flags[1] & 0x10)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "pO₂ Green Warning")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "pO₂ green warning"));
#endif #endif
if (flags[1] & 0x20) if (flags[1] & 0x20)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "pO₂ Ascend Warning")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "pO₂ ascend warning"));
if (flags[1] & 0x40) if (flags[1] & 0x40)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "pO₂ Ascend Alarm")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "pO₂ ascend alarm"));
/* flags[2] reflects the deco / time bar /* flags[2] reflects the deco / time bar
* flags[3] reflects more display details on deco and pO2 */ * flags[3] reflects more display details on deco and pO2 */
if (flags[4] & 0x01) if (flags[4] & 0x01)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Tank Pressure Info")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Tank pressure info"));
if (flags[4] & 0x04) if (flags[4] & 0x04)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "RGT Warning")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "RGT warning"));
if (flags[4] & 0x08) if (flags[4] & 0x08)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "RGT Alert")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "RGT alert"));
if (flags[4] & 0x40) if (flags[4] & 0x40)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Tank Change Suggested")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Tank change suggested"));
if (flags[4] & 0x80) if (flags[4] & 0x80)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Depth Limit Exceeded")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Depth limit exceeded"));
if (flags[5] & 0x01) if (flags[5] & 0x01)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Max Deco Time Warning")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Max deco time warning"));
if (flags[5] & 0x04) if (flags[5] & 0x04)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Dive Time Info")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Dive time info"));
if (flags[5] & 0x08) if (flags[5] & 0x08)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Dive Time Alert")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Dive time alert"));
if (flags[5] & 0x10) if (flags[5] & 0x10)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Marker")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Marker"));
if (flags[6] & 0x02) if (flags[6] & 0x02)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "No Tank Data")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "No tank data"));
if (flags[6] & 0x04) if (flags[6] & 0x04)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Low Battery Warning")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Low battery warning"));
if (flags[6] & 0x08) if (flags[6] & 0x08)
add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Low Battery Alert")); add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Low battery alert"));
/* flags[7] reflects the little on screen icons that remind of previous /* flags[7] reflects the little on screen icons that remind of previous
* warnings / alerts - not useful for events */ * warnings / alerts - not useful for events */