diff options
| -rw-r--r-- | qt-ui/divelogimportdialog.ui | 2 | ||||
| -rw-r--r-- | qt-ui/filtermodels.cpp | 2 | ||||
| -rw-r--r-- | qt-ui/maintab.cpp | 4 | ||||
| -rw-r--r-- | qt-ui/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | qt-ui/mainwindow.ui | 6 | ||||
| -rw-r--r-- | qt-ui/updatemanager.cpp | 6 | ||||
| -rw-r--r-- | uemis-downloader.c | 2 | ||||
| -rw-r--r-- | uemis.c | 34 |
8 files changed, 29 insertions, 29 deletions
diff --git a/qt-ui/divelogimportdialog.ui b/qt-ui/divelogimportdialog.ui index 47a0e54ba..97b698901 100644 --- a/qt-ui/divelogimportdialog.ui +++ b/qt-ui/divelogimportdialog.ui @@ -510,7 +510,7 @@ <item row="5" column="0"> <widget class="QCheckBox" name="GpsCheck"> <property name="text"> - <string>Gps</string> + <string>GPS</string> </property> </widget> </item> diff --git a/qt-ui/filtermodels.cpp b/qt-ui/filtermodels.cpp index 7ef0df3b9..01d2592f8 100644 --- a/qt-ui/filtermodels.cpp +++ b/qt-ui/filtermodels.cpp @@ -141,7 +141,7 @@ void TagFilterModel::repopulate() current_tag_entry = current_tag_entry->next; } qSort(list); - list << tr("Empty Tags"); + list << tr("Empty tags"); setStringList(list); delete[] checkState; checkState = new bool[list.count()]; diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 68775c8c1..898166328 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -92,11 +92,11 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), label->setAlignment(Qt::AlignHCenter); } 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())); 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.cylinders->view(), SIGNAL(clicked(QModelIndex)), this, SLOT(editCylinderWidget(QModelIndex))); diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index a02ff0357..f26c0f168 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -575,7 +575,7 @@ void MainWindow::on_actionYearlyStatistics_triggered() connect(quit, SIGNAL(activated()), this, SLOT(close())); d.setWindowFlags(Qt::Window | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint | Qt::WindowTitleHint); - d.setWindowTitle(tr("Yearly Statistics")); + d.setWindowTitle(tr("Yearly statistics")); d.exec(); } diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index 6d857a834..ecbd4d787 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -624,7 +624,7 @@ p, li { white-space: pre-wrap; } <string>&Export</string> </property> <property name="toolTip"> - <string>Export Dive Logs</string> + <string>Export dive logs</string> </property> <property name="shortcut"> <string>Ctrl+E</string> @@ -655,7 +655,7 @@ p, li { white-space: pre-wrap; } <normaloff>:/icon_o2</normaloff>:/icon_o2</iconset> </property> <property name="text"> - <string>Toggle pO2 Graph</string> + <string>Toggle pO₂ graph</string> </property> </action> <action name="profPn2"> @@ -667,7 +667,7 @@ p, li { white-space: pre-wrap; } <normaloff>:/icon_n2</normaloff>:/icon_n2</iconset> </property> <property name="text"> - <string>Toggle pN2 Graph</string> + <string>Toggle pN₂ graph</string> </property> </action> <action name="profPhe"> diff --git a/qt-ui/updatemanager.cpp b/qt-ui/updatemanager.cpp index 858de561d..a181f34fa 100644 --- a/qt-ui/updatemanager.cpp +++ b/qt-ui/updatemanager.cpp @@ -56,16 +56,16 @@ void UpdateManager::requestReceived() msgbox.setIcon(QMessageBox::Information); 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")) { - 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); } else if (responseBody.startsWith("Latest version")) { // the webservice backend doesn't localize - but it's easy enough to just replace the // strings that it is likely to send back responseBody.replace("Latest version is ", ""); 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.") .arg(responseBody); } else { diff --git a/uemis-downloader.c b/uemis-downloader.c index 256f13904..5dfce6ce2 100644 --- a/uemis-downloader.c +++ b/uemis-downloader.c @@ -850,7 +850,7 @@ const char *do_uemis_import(device_data_t *data) if (dive_table.nr == 0) keep_number = true; - uemis_info(translate("gettextFromC", "Init Communication")); + uemis_info(translate("gettextFromC", "Initialise communication")); if (!uemis_init(mountpath)) return translate("gettextFromC", "Uemis init failed"); if (!uemis_get_answer(mountpath, "getDeviceId", 0, 1, &result)) @@ -193,45 +193,45 @@ static void uemis_event(struct dive *dive, struct divecomputer *dc, struct sampl static int lastndl; 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) - 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 (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) - 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 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) - 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[3] reflects more display details on deco and pO2 */ 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) - 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) - 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) - 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) - 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) - 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) - 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) - 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) add_event(dc, sample->time.seconds, 0, 0, 0, QT_TRANSLATE_NOOP("gettextFromC", "Marker")); 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) - 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) - 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 * warnings / alerts - not useful for events */ |