From 6719e45704d8694d845bc4e8bc3970e21bdab23b Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Fri, 3 Jan 2014 14:49:17 +0200 Subject: Maintab: prevent a segfault in the 'Equipment' tab When a dive contains no cylinders, clicking the '+' button could SIGSEGV if current_dive->dc.model is NULL. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Dirk Hohndel --- qt-ui/maintab.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 4fc543fc0..8da113700 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -223,6 +223,7 @@ void MainTab::enableEdition(EditMode newEditMode) if (current_dive == NULL || editMode != NONE) return; if ((newEditMode == DIVE || newEditMode == NONE) && + current_dive->dc.model && strcmp(current_dive->dc.model, "manually added dive") == 0) { // editCurrentDive will call enableEdition with newEditMode == MANUALLY_ADDED_DIVE // so exit this function here after editCurrentDive() returns -- cgit v1.2.3-70-g09d2 From 8795be53ae69e8d92633eff7e4ac9afccbaf1148 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 3 Jan 2014 11:22:37 -0800 Subject: Parse localized weight units We have the wonderful Qt string functions. Let's use them to make the code simpler and easier to read. Suggested-by: Lubomir I. Ivanov Signed-off-by: Dirk Hohndel --- qt-ui/models.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index ab501a2bd..aa9db450b 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -468,12 +468,14 @@ double string_to_grams(char *str) { char *end; double value = strtod_flags(str, &end, 0); + QString rest = QString(end).trimmed(); + QString local_kg = WeightModel::tr("kg"); + QString local_lbs = WeightModel::tr("lbs"); - while (isspace(*end)) - end++; - if (!strncmp(end, "kg", 2)) + if (rest.startsWith("kg") || rest.startsWith(local_kg)) goto kg; - if (!strncmp(end, "lbs", 3)) + // using just "lb" instead of "lbs" is intentional - some people might enter the singular + if (rest.startsWith("lb") || rest.startsWith(local_lbs)) goto lbs; if (prefs.units.weight == prefs.units.LBS) goto lbs; -- cgit v1.2.3-70-g09d2 From a0a96e066421da202a3fcffabecfd8991bc6493d Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 3 Jan 2014 16:00:28 -0800 Subject: Fix Uemis temperature conversion In commit 3fd39a7a87bf ("Remove some constants and use helpers instead") Anton missed the fact that the Uemis gives temperatures in the handy unit of "centi degree C". Now things work again. Signed-off-by: Dirk Hohndel --- uemis.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uemis.c b/uemis.c index e37de36ad..d869180eb 100644 --- a/uemis.c +++ b/uemis.c @@ -293,7 +293,7 @@ void uemis_parse_divelog_binary(char *base64, void *datap) { datalen = uemis_convert_base64(base64, &data); - dive->dc.airtemp.mkelvin = C_to_mkelvin(*(uint16_t *)(data + 45)); + dive->dc.airtemp.mkelvin = C_to_mkelvin((*(uint16_t *)(data + 45)) / 10.0); dive->dc.surface_pressure.mbar = *(uint16_t *)(data + 43); if (*(uint8_t *)(data + 19)) dive->dc.salinity = SEAWATER_SALINITY; /* avg grams per 10l sea water */ @@ -351,7 +351,7 @@ void uemis_parse_divelog_binary(char *base64, void *datap) { sample = prepare_sample(dc); sample->time.seconds = u_sample->dive_time; sample->depth.mm = rel_mbar_to_depth(u_sample->water_pressure, dive); - sample->temperature.mkelvin = C_to_mkelvin(u_sample->dive_temperature); + sample->temperature.mkelvin = C_to_mkelvin(u_sample->dive_temperature / 10.0); sample->sensor = active; sample->cylinderpressure.mbar = (u_sample->tank_pressure_high * 256 + u_sample->tank_pressure_low) * 10; -- cgit v1.2.3-70-g09d2 From b871c13d5fdd52282d1fc8d8b4fd4300543a80b3 Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Sat, 4 Jan 2014 21:53:57 +0200 Subject: Fix typo Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- Documentation/user-manual.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index a7d71bbbe..1174faca3 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -38,7 +38,7 @@ software and (if needed) its dependencies please consult the INSTALL file included with the source code. *Audience*: Recreational Scuba Divers, Free Divers, Tec Divers, Professional -Di vers +Divers toc::[] -- cgit v1.2.3-70-g09d2 From 40179b6c1b8af0d320a32afffb44e3fbff6925bd Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Mon, 6 Jan 2014 12:24:30 +0200 Subject: Print numerical value of mean depth This will print the numerical value of mean depth to the profile graph. Fixes #405 Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- qt-ui/profilegraphics.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qt-ui/profilegraphics.cpp b/qt-ui/profilegraphics.cpp index dfbe606f8..3f202cb47 100644 --- a/qt-ui/profilegraphics.cpp +++ b/qt-ui/profilegraphics.cpp @@ -1177,6 +1177,11 @@ void ProfileGraphicsView::plot_depth_profile() pen.setColor(c); item->setPen(pen); scene()->addItem(item); + + struct text_render_options tro = {DEPTH_TEXT_SIZE, MEAN_DEPTH, LEFT, TOP}; + plot_text(&tro, QPointF(gc.leftx, gc.pi.meandepth), QString("%1").arg(QString::number(gc.pi.meandepth / 1000.0, 'f', 1)), item); + tro.hpos = RIGHT; + plot_text(&tro, QPointF(gc.pi.entry[gc.pi.nr - 1].sec, gc.pi.meandepth), QString("%1").arg(QString::number(gc.pi.meandepth / 1000.0, 'f', 1)), item); } #if 0 -- cgit v1.2.3-70-g09d2 From a2e528cea09b8efcd2ab16300c6d664c9495de6c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 6 Jan 2014 21:02:19 +0800 Subject: Use helper function to display mean depth with correct unit In commit 528d0ea0e7bd ("Print numerical value of mean depth") Miika once again forgot the three non-metric countries on this planet... :-) Signed-off-by: Dirk Hohndel --- qt-ui/profilegraphics.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qt-ui/profilegraphics.cpp b/qt-ui/profilegraphics.cpp index 3f202cb47..76eb64b84 100644 --- a/qt-ui/profilegraphics.cpp +++ b/qt-ui/profilegraphics.cpp @@ -1179,9 +1179,10 @@ void ProfileGraphicsView::plot_depth_profile() scene()->addItem(item); struct text_render_options tro = {DEPTH_TEXT_SIZE, MEAN_DEPTH, LEFT, TOP}; - plot_text(&tro, QPointF(gc.leftx, gc.pi.meandepth), QString("%1").arg(QString::number(gc.pi.meandepth / 1000.0, 'f', 1)), item); + QString depthLabel = get_depth_string(gc.pi.meandepth, true, true); + plot_text(&tro, QPointF(gc.leftx, gc.pi.meandepth), depthLabel, item); tro.hpos = RIGHT; - plot_text(&tro, QPointF(gc.pi.entry[gc.pi.nr - 1].sec, gc.pi.meandepth), QString("%1").arg(QString::number(gc.pi.meandepth / 1000.0, 'f', 1)), item); + plot_text(&tro, QPointF(gc.pi.entry[gc.pi.nr - 1].sec, gc.pi.meandepth), depthLabel, item); } #if 0 -- cgit v1.2.3-70-g09d2 From 0c3075dc41cc9a6256bd5846e1654bc6c157d331 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 6 Jan 2014 20:00:10 -0200 Subject: Add CaseInsensitivity to all of the completers. Just one of the completers had Qt::CaseInsentitive set, setting for all of them. Fixes #400 Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/maintab.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 8da113700..d149815f6 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -91,6 +91,11 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), completers.location = new QCompleter(LocationCompletionModel::instance(), ui.location); completers.suit = new QCompleter(SuitCompletionModel::instance(), ui.suit); completers.tags = new QCompleter(TagCompletionModel::instance(), ui.tagWidget); + completers.buddy->setCaseSensitivity(Qt::CaseInsensitive); + completers.divemaster->setCaseSensitivity(Qt::CaseInsensitive); + completers.location->setCaseSensitivity(Qt::CaseInsensitive); + completers.suit->setCaseSensitivity(Qt::CaseInsensitive); + completers.buddy->setCaseSensitivity(Qt::CaseInsensitive); completers.tags->setCaseSensitivity(Qt::CaseInsensitive); ui.buddy->setCompleter(completers.buddy); ui.divemaster->setCompleter(completers.divemaster); -- cgit v1.2.3-70-g09d2 From 7f4d1a9f32987a92d6418bc6d18e6359536289ff Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 6 Jan 2014 20:13:21 -0200 Subject: Setting dive as 'current' when restoring selection Restoring the selection was not setting the selected dive as current, and thus, breaking keyboard navigation. Fixes #402 Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/divelistview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp index 0af6fbb10..9f5b0c0a7 100644 --- a/qt-ui/divelistview.cpp +++ b/qt-ui/divelistview.cpp @@ -203,7 +203,7 @@ void DiveListView::selectDive(int i, bool scrollto, bool toggle) QModelIndex idx = match.first(); flags = toggle ? QItemSelectionModel::Toggle : QItemSelectionModel::Select; flags |= QItemSelectionModel::Rows; - selectionModel()->select(idx, flags); + selectionModel()->setCurrentIndex(idx, flags); if(idx.parent().isValid()){ setAnimated(false); expand(idx.parent()); -- cgit v1.2.3-70-g09d2 From 304f5e8569fb7786d50bd529da09ba866edd3b1c Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Tue, 7 Jan 2014 16:41:19 +0200 Subject: windows.c: Fix possible assert when passing NULL to *open() On Win32 subsurface_fopen() can reach an assert in windows.c: utf8_to_utf16(), if NULL is passed for 'path'. Let's return NULL/-1 for some of the *open() functions in there. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Dirk Hohndel --- windows.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/windows.c b/windows.c index 9288af45f..7c537f6e5 100644 --- a/windows.c +++ b/windows.c @@ -114,6 +114,8 @@ static wchar_t *utf8_to_utf16_fl(const char *utf8, char *file, int line) int subsurface_open(const char *path, int oflags, mode_t mode) { int ret = -1; + if (!path) + return -1; wchar_t *wpath = utf8_to_utf16(path); if (wpath) { ret = _wopen(wpath, oflags, mode); @@ -126,6 +128,8 @@ int subsurface_open(const char *path, int oflags, mode_t mode) FILE *subsurface_fopen(const char *path, const char *mode) { FILE *ret = NULL; + if (!path) + return ret; wchar_t *wpath = utf8_to_utf16(path); if (wpath) { const int len = strlen(mode); @@ -144,6 +148,8 @@ FILE *subsurface_fopen(const char *path, const char *mode) void *subsurface_opendir(const char *path) { _WDIR *ret = NULL; + if (!path) + return ret; wchar_t *wpath = utf8_to_utf16(path); if (wpath) { ret = _wopendir(wpath); -- cgit v1.2.3-70-g09d2 From 065221aac7ec7b762e642a0bf71b58cef7078e85 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Tue, 7 Jan 2014 16:41:20 +0200 Subject: libdivecomputer.c: Try not to pass NULL to fopen() C99 7.1.4, says nothing about passing NULL to fopen(), which means that it isn't portable and there are no guaranties that the return will be a NULL pointer or that that a library implementation will not assert or SYSSEGV in the middle of the fopen() branch. libdivecomputer.c's 'dumpfile_name' and 'logfile_name' could cause problems in that regard. A possible fix for #411 Signed-off-by: Lubomir I. Ivanov Signed-off-by: Dirk Hohndel --- libdivecomputer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libdivecomputer.c b/libdivecomputer.c index 105a08133..78d3808f9 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -676,7 +676,7 @@ static const char *do_device_import(device_data_t *data) dc_buffer_t *buffer = dc_buffer_new (0); rc = dc_device_dump (device, buffer); - if (rc == DC_STATUS_SUCCESS) { + if (rc == DC_STATUS_SUCCESS && dumpfile_name) { FILE* fp = subsurface_fopen(dumpfile_name, "wb"); if (fp != NULL) { fwrite (dc_buffer_get_data (buffer), 1, dc_buffer_get_size (buffer), fp); @@ -721,7 +721,7 @@ const char *do_libdivecomputer_import(device_data_t *data) data->device = NULL; data->context = NULL; - if (data->libdc_log) + if (data->libdc_log && logfile_name) fp = subsurface_fopen(logfile_name, "w"); rc = dc_context_new(&data->context); -- cgit v1.2.3-70-g09d2 From 7d56e404fdd09c1ec24b966eb00ba31c8f87ba70 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Tue, 7 Jan 2014 16:41:21 +0200 Subject: DownloadFromDCWidget: prevent possible leaks for log/dump files If the 'logfile_name' and 'dumpfile_name' were NULL we can simply strdup() them with a new value, but if there was a previous value we need to free() first. C99 6.7.8 allows us to keep said variables without the explicit NULL initialiazation. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Dirk Hohndel --- qt-ui/downloadfromdivecomputer.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp index b9eee912a..81bc04309 100644 --- a/qt-ui/downloadfromdivecomputer.cpp +++ b/qt-ui/downloadfromdivecomputer.cpp @@ -288,8 +288,11 @@ void DownloadFromDCWidget::pickLogFile() filename = fi.absolutePath().append(QDir::separator()).append("subsurface.log"); logFile = QFileDialog::getSaveFileName(this, tr("Choose file for divecomputer download logfile"), filename, tr("Log files (*.log)")); - if (!logFile.isEmpty()) + if (!logFile.isEmpty()) { + if (logfile_name) + free(logfile_name); logfile_name = strdup(logFile.toUtf8().data()); + } } void DownloadFromDCWidget::checkDumpFile(int state) @@ -314,8 +317,11 @@ void DownloadFromDCWidget::pickDumpFile() filename = fi.absolutePath().append(QDir::separator()).append("subsurface.bin"); dumpFile = QFileDialog::getSaveFileName(this, tr("Choose file for divecomputer binary dump file"), filename, tr("Dump files (*.bin)")); - if (!dumpFile.isEmpty()) + if (!dumpFile.isEmpty()) { + if (dumpfile_name) + free(dumpfile_name); dumpfile_name = strdup(dumpFile.toUtf8().data()); + } } void DownloadFromDCWidget::reject() -- cgit v1.2.3-70-g09d2 From 8626778918b4dd5a304cbe970eded6cad759431b Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Tue, 7 Jan 2014 20:38:36 +0100 Subject: Write the event data to the libdivecomputer log. For some devices, the event data contains important data that is required for parsing the dives, but which is not present in the full memory dump. Signed-off-by: Jef Driesen Signed-off-by: Dirk Hohndel --- libdivecomputer.c | 23 ++++++++++++++++++++++- libdivecomputer.h | 1 + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/libdivecomputer.c b/libdivecomputer.c index 78d3808f9..48b8151d2 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -610,6 +610,7 @@ static void event_cb(dc_device_t *device, dc_event_type_t event, const void *dat const dc_event_progress_t *progress = data; const dc_event_devinfo_t *devinfo = data; const dc_event_clock_t *clock = data; + const dc_event_vendor_t *vendor = data; device_data_t *devdata = userdata; unsigned int serial; @@ -627,6 +628,12 @@ static void event_cb(dc_device_t *device, dc_event_type_t event, const void *dat devinfo->model, devinfo->model, devinfo->firmware, devinfo->firmware, devinfo->serial, devinfo->serial); + if (devdata->libdc_logfile) { + fprintf(devdata->libdc_logfile, "Event: model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)\n", + devinfo->model, devinfo->model, + devinfo->firmware, devinfo->firmware, + devinfo->serial, devinfo->serial); + } /* * libdivecomputer doesn't give serial numbers in the proper string form, * so we have to see if we can do some vendor-specific munging. @@ -640,6 +647,18 @@ static void event_cb(dc_device_t *device, dc_event_type_t event, const void *dat case DC_EVENT_CLOCK: dev_info(devdata, translate("gettextFromC","Event: systime=%"PRId64", devtime=%u\n"), (uint64_t)clock->systime, clock->devtime); + if (devdata->libdc_logfile) { + fprintf(devdata->libdc_logfile, "Event: systime=%"PRId64", devtime=%u\n", + (uint64_t)clock->systime, clock->devtime); + } + break; + case DC_EVENT_VENDOR: + if (devdata->libdc_logfile) { + fprintf(devdata->libdc_logfile, "Event: vendor="); + for (unsigned int i = 0; i < vendor->size; ++i) + fprintf(devdata->libdc_logfile, "%02X", vendor->data[i]); + fprintf(devdata->libdc_logfile,"\n"); + } break; default: break; @@ -662,7 +681,7 @@ static const char *do_device_import(device_data_t *data) data->model = str_printf("%s %s", data->vendor, data->product); // Register the event handler. - int events = DC_EVENT_WAITING | DC_EVENT_PROGRESS | DC_EVENT_DEVINFO | DC_EVENT_CLOCK; + int events = DC_EVENT_WAITING | DC_EVENT_PROGRESS | DC_EVENT_DEVINFO | DC_EVENT_CLOCK | DC_EVENT_VENDOR; rc = dc_device_set_events(device, events, event_cb, data); if (rc != DC_STATUS_SUCCESS) return translate("gettextFromC","Error registering the event handler."); @@ -724,6 +743,8 @@ const char *do_libdivecomputer_import(device_data_t *data) if (data->libdc_log && logfile_name) fp = subsurface_fopen(logfile_name, "w"); + data->libdc_logfile = fp; + rc = dc_context_new(&data->context); if (rc != DC_STATUS_SUCCESS) return translate("gettextFromC","Unable to create libdivecomputer context"); diff --git a/libdivecomputer.h b/libdivecomputer.h index 754a98f44..8285f5a9f 100644 --- a/libdivecomputer.h +++ b/libdivecomputer.h @@ -26,6 +26,7 @@ typedef struct device_data_t { bool force_download; bool libdc_log; bool libdc_dump; + FILE *libdc_logfile; } device_data_t; const char *do_libdivecomputer_import(device_data_t *data); -- cgit v1.2.3-70-g09d2 From b9d7e440fd37a4da8455d80a71911a4fbcdbfa11 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 8 Jan 2014 14:24:35 +0800 Subject: Make 'string_to_grams()' use proper type safe types Make it use 'weight_t' and hide the "grams" part inside the type. That was the whole point of the weight_t type, after all. Returning a "double" was always bogus, since we internally always do integer grams (and the function actually used "rint()" to get all the rounding right anyway). As a result, it's now called "string_to_weight()". Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- qt-ui/models.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index aa9db450b..cb956702b 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -464,13 +464,14 @@ void WeightModel::passInData(const QModelIndex& index, const QVariant& value) } } -double string_to_grams(char *str) +weight_t string_to_weight(char *str) { char *end; double value = strtod_flags(str, &end, 0); QString rest = QString(end).trimmed(); QString local_kg = WeightModel::tr("kg"); QString local_lbs = WeightModel::tr("lbs"); + weight_t weight; if (rest.startsWith("kg") || rest.startsWith(local_kg)) goto kg; @@ -480,9 +481,11 @@ double string_to_grams(char *str) if (prefs.units.weight == prefs.units.LBS) goto lbs; kg: - return rint(value * 1000); + weight.grams = rint(value * 1000); + return weight; lbs: - return lbs_to_grams(value); + weight.grams = lbs_to_grams(value); + return weight; } bool WeightModel::setData(const QModelIndex& index, const QVariant& value, int role) @@ -509,7 +512,7 @@ bool WeightModel::setData(const QModelIndex& index, const QVariant& value, int r break; case WEIGHT: if (CHANGED(data, "", "")) { - ws->weight.grams = string_to_grams(vString.toUtf8().data()); + ws->weight = string_to_weight(vString.toUtf8().data()); // now update the ws_info changed = true; WSInfoModel *wsim = WSInfoModel::instance(); -- cgit v1.2.3-70-g09d2 From 1c72b8b0545e6a13ea3db917a1434152c73a3c3b Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 8 Jan 2014 14:51:22 +0800 Subject: const'ify our strtod() helper functions The C library doesn't use const char pointers for legacy reasons (and because you *can* modify the string the end pointer points to), but let's do it in our internal implementation just because it's a nice guarantee to have. We actually used to have a non-const end pointer and replace a decimal comma with a decimal dot, but that was because we didn't have the fancy "allow commas" flags. So by using our own strtod_flags() function, we can now keep all the strings we parse read-only rather than modify them as we parse them. Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- dive.h | 2 +- parse-xml.c | 11 +++++------ qt-ui/models.cpp | 4 ++-- strtod.c | 5 +++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dive.h b/dive.h index a0c22935f..11afa99b1 100644 --- a/dive.h +++ b/dive.h @@ -789,7 +789,7 @@ extern void remove_weightsystem(struct dive *dive, int idx); #define STRTOD_NO_DOT 0x02 #define STRTOD_NO_COMMA 0x04 #define STRTOD_NO_EXPONENT 0x08 -extern double strtod_flags(char *str, char **ptr, unsigned int flags); +extern double strtod_flags(const char *str, const char **ptr, unsigned int flags); #define STRTOD_ASCII (STRTOD_NO_COMMA) diff --git a/parse-xml.c b/parse-xml.c index 59e04efb1..8fc504a3f 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -263,7 +263,7 @@ enum number_type { FLOAT }; -static enum number_type parse_float(char *buffer, double *res, char **endp) +static enum number_type parse_float(const char *buffer, double *res, const char **endp) { double val; static bool first_time = TRUE; @@ -281,9 +281,8 @@ static enum number_type parse_float(char *buffer, double *res, char **endp) fprintf(stderr, "Floating point value with decimal comma (%s)?\n", buffer); first_time = FALSE; } - /* Try again */ - **endp = '.'; - val = ascii_strtod(buffer, endp); + /* Try again in permissive mode*/ + val = strtod_flags(buffer, endp, 0); } } @@ -297,7 +296,7 @@ union int_or_float { static enum number_type integer_or_float(char *buffer, union int_or_float *res) { - char *end; + const char *end; return parse_float(buffer, &res->fp, &end); } @@ -459,7 +458,7 @@ static void percent(char *buffer, void *_fraction) { fraction_t *fraction = _fraction; double val; - char *end; + const char *end; switch (parse_float(buffer, &val, &end)) { case FLOAT: diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index cb956702b..35696a778 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -464,9 +464,9 @@ void WeightModel::passInData(const QModelIndex& index, const QVariant& value) } } -weight_t string_to_weight(char *str) +weight_t string_to_weight(const char *str) { - char *end; + const char *end; double value = strtod_flags(str, &end, 0); QString rest = QString(end).trimmed(); QString local_kg = WeightModel::tr("kg"); diff --git a/strtod.c b/strtod.c index 4643cfe9d..fe7319887 100644 --- a/strtod.c +++ b/strtod.c @@ -29,9 +29,10 @@ #include #include "dive.h" -double strtod_flags(char *str, char **ptr, unsigned int flags) +double strtod_flags(const char *str, const char **ptr, unsigned int flags) { - char *p = str, c, *ep; + char c; + const char *p = str, *ep; double val = 0.0; double decimal = 1.0; int sign = 0, esign = 0; -- cgit v1.2.3-70-g09d2 From 262bc9c84b1ab04934e84d6671e6a2b7c19c9af3 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 8 Jan 2014 14:55:47 +0800 Subject: Add a string_to_depth() helper function to match our string_to_weight one It's currently only used for the setting of the cylinder switching depth, but now that one should work with user-specified units (so you can set a max depth in feet even if you use metric, and vice versa). In the future, if we also make the unit preferences something you can pass in (with user preferences as a default argument value), we might want to use this for parsing the XML too, so that we'd honor explicit units in the XML strings. But the XML input unit preferences are not necessarily at all the same as the user preferences, so that does require us to extend the conversion functions to do possibly explicit unit preference selection. Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- dive.h | 3 +++ qt-ui/models.cpp | 33 +++++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dive.h b/dive.h index 11afa99b1..ecb0bfd50 100644 --- a/dive.h +++ b/dive.h @@ -799,6 +799,9 @@ extern double strtod_flags(const char *str, const char **ptr, unsigned int flags } #endif +extern weight_t string_to_weight(const char *str); +extern depth_t string_to_depth(const char *str); + #include "pref.h" #endif /* DIVE_H */ diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 35696a778..7d08be288 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -287,14 +287,8 @@ bool CylindersModel::setData(const QModelIndex& index, const QVariant& value, in } break; case DEPTH: - if (CHANGED(toDouble, "ft", "m")) { - if (vString.toInt() != 0) { - if (prefs.units.length == prefs.units.FEET) - cyl->depth.mm = feet_to_mm(vString.toInt()); - else - cyl->depth.mm = vString.toInt() * 1000; - } - } + if (CHANGED(data, "", "")) + cyl->depth = string_to_depth(vString.toUtf8().data()); } dataChanged(index, index); if (addDiveMode) @@ -488,6 +482,29 @@ lbs: return weight; } +depth_t string_to_depth(const char *str) +{ + const char *end; + double value = strtod_flags(str, &end, 0); + QString rest = QString(end).trimmed(); + QString local_ft = WeightModel::tr("ft"); + QString local_m = WeightModel::tr("m"); + depth_t depth; + + if (rest.startsWith("m") || rest.startsWith(local_m)) + goto m; + if (rest.startsWith("ft") || rest.startsWith(local_ft)) + goto ft; + if (prefs.units.length == prefs.units.FEET) + goto ft; +m: + depth.mm = rint(value * 1000); + return depth; +ft: + depth.mm = feet_to_mm(value); + return depth; +} + bool WeightModel::setData(const QModelIndex& index, const QVariant& value, int role) { QString vString = value.toString(); -- cgit v1.2.3-70-g09d2 From 0d93470c50e6ebaa0128ba182a94090d6d000278 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 8 Jan 2014 21:46:27 +0800 Subject: Change fake profile behavior If no average depth is known the current fake profile behavior is rather unintuitive (we make up an average depth). Instead we should assume that this is a PADI style dive log and give the user a "rectangular" profile (actually, it's a trapecoid as we at least try to enforce a sane ascent / descent speed). If the dive is somewhat longer or deeper (10 min / 10 m) we even add a 3m safety stop at 5m. Added a new dives/test0b that tries to capture the typical cases to test this. Fixes #398 Signed-off-by: Dirk Hohndel --- device.c | 38 +++++++++++++++++++++++++++++++++++--- dives/test0.xml | 4 ++-- dives/test0b.xml | 15 +++++++++++++++ 3 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 dives/test0b.xml diff --git a/device.c b/device.c index 4084c4edb..030368c60 100644 --- a/device.c +++ b/device.c @@ -12,10 +12,10 @@ * To do that, we generate a 6-point profile: * * (0, 0) - * (t0, max_d) * (t1, max_d) - * (t2, d) + * (t2, max_d) * (t3, d) + * (t4, d) * (max_t, 0) * * with the same ascent/descent rates between the @@ -80,6 +80,28 @@ static int fill_samples(struct sample *s, int max_d, int avg_d, int max_t, doubl return 1; } +/* we have no average depth; instead of making up a random average depth + * we should assume either a PADI recrangular profile (for short and/or + * shallow dives) or more reasonably a six point profile with a 3 minute + * safety stop at 5m */ +static void fill_samples_no_avg(struct sample *s, int max_d, int max_t, double slope) +{ + // shallow or short dives are just trapecoids based on the given slope + if (max_d < 10000 || max_t < 600) { + s[1].time.seconds = max_d / slope; s[1].depth.mm = max_d; + s[2].time.seconds = max_t - max_d / slope; s[2].depth.mm = max_d; + } else { + s[1].time.seconds = max_d / slope; + s[1].depth.mm = max_d; + s[2].time.seconds = max_t - max_d / slope - 180; + s[2].depth.mm = max_d; + s[3].time.seconds = max_t - 5000 / slope - 180; + s[3].depth.mm = 5000; + s[4].time.seconds = max_t - 5000 / slope; + s[4].depth.mm = 5000; + } +} + struct divecomputer* fake_dc(struct divecomputer* dc) { static struct sample fake[6]; @@ -105,7 +127,17 @@ struct divecomputer* fake_dc(struct divecomputer* dc) * a reasonable average, let's just make something * up. Note that 'avg_d == max_d' is _not_ a reasonable * average. - */ + * We explicitly treat avg_d == 0 differently */ + if (avg_d == 0) { + /* we try for a sane slope, but bow to the insanity of + * the user supplied data */ + fill_samples_no_avg(fake, max_d, max_t, MAX(2.0 * max_d / max_t, 5000.0 / 60)); + if(fake[3].time.seconds == 0) { // just a 4 point profile + fakedc.samples = 4; + fake[3].time.seconds = max_t; + } + return &fakedc; + } if (avg_d < max_d / 10 || avg_d >= max_d) { avg_d = (max_d+10000)/3; if (avg_d > max_d) diff --git a/dives/test0.xml b/dives/test0.xml index 1d15fac85..6ade06519 100644 --- a/dives/test0.xml +++ b/dives/test0.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/dives/test0b.xml b/dives/test0b.xml new file mode 100644 index 000000000..30e6f34b6 --- /dev/null +++ b/dives/test0b.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 110c07e27b61cacacf4daba3a4606974c995721d Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 9 Jan 2014 08:49:21 +0800 Subject: Add unit-aware conversion of pressure data This just adds (and uses) a string_to_pressure() to parse pressure units correctly when filling in cylinder pressures. Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- dive.h | 1 + qt-ui/models.cpp | 64 +++++++++++++++++++++++++++++++------------------------- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/dive.h b/dive.h index ecb0bfd50..a9df1a09f 100644 --- a/dive.h +++ b/dive.h @@ -801,6 +801,7 @@ extern double strtod_flags(const char *str, const char **ptr, unsigned int flags extern weight_t string_to_weight(const char *str); extern depth_t string_to_depth(const char *str); +extern pressure_t string_to_pressure(const char *str); #include "pref.h" diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 7d08be288..db180a27a 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -232,40 +232,25 @@ bool CylindersModel::setData(const QModelIndex& index, const QVariant& value, in } break; case WORKINGPRESS: - if (CHANGED(toDouble, "psi", "bar")) { - if (vString.toDouble() != 0.0) { - TankInfoModel *tanks = TankInfoModel::instance(); - QModelIndexList matches = tanks->match(tanks->index(0,0), Qt::DisplayRole, cyl->type.description); - if (prefs.units.pressure == prefs.units.PSI) - cyl->type.workingpressure.mbar = psi_to_mbar(vString.toDouble()); - else - cyl->type.workingpressure.mbar = vString.toDouble() * 1000; - if (!matches.isEmpty()) - tanks->setData(tanks->index(matches.first().row(), TankInfoModel::BAR), cyl->type.workingpressure.mbar / 1000.0); - changed = true; - } + if (CHANGED(data, "", "")) { + TankInfoModel *tanks = TankInfoModel::instance(); + QModelIndexList matches = tanks->match(tanks->index(0,0), Qt::DisplayRole, cyl->type.description); + cyl->type.workingpressure = string_to_pressure(vString.toUtf8().data()); + if (!matches.isEmpty()) + tanks->setData(tanks->index(matches.first().row(), TankInfoModel::BAR), cyl->type.workingpressure.mbar / 1000.0); + changed = true; } break; case START: - if (CHANGED(toDouble, "psi", "bar")) { - if (vString.toDouble() != 0.0) { - if (prefs.units.pressure == prefs.units.PSI) - cyl->start.mbar = psi_to_mbar(vString.toDouble()); - else - cyl->start.mbar = vString.toDouble() * 1000; - changed = true; - } + if (CHANGED(data, "", "")) { + cyl->start = string_to_pressure(vString.toUtf8().data()); + changed = true; } break; case END: - if (CHANGED(toDouble, "psi", "bar")) { - if (vString.toDouble() != 0.0) { - if (prefs.units.pressure == prefs.units.PSI) - cyl->end.mbar = psi_to_mbar(vString.toDouble()); - else - cyl->end.mbar = vString.toDouble() * 1000; - changed = true; - } + if (CHANGED(data, "", "")) { + cyl->end = string_to_pressure(vString.toUtf8().data()); + changed = true; } break; case O2: @@ -505,6 +490,29 @@ ft: return depth; } +pressure_t string_to_pressure(const char *str) +{ + const char *end; + double value = strtod_flags(str, &end, 0); + QString rest = QString(end).trimmed(); + QString local_psi = CylindersModel::tr("psi"); + QString local_bar = CylindersModel::tr("bar"); + pressure_t pressure; + + if (rest.startsWith("bar") || rest.startsWith(local_bar)) + goto bar; + if (rest.startsWith("psi") || rest.startsWith(local_psi)) + goto psi; + if (prefs.units.pressure == prefs.units.PSI) + goto psi; +bar: + pressure.mbar = rint(value * 1000); + return pressure; +psi: + pressure.mbar = psi_to_mbar(value); + return pressure; +} + bool WeightModel::setData(const QModelIndex& index, const QVariant& value, int role) { QString vString = value.toString(); -- cgit v1.2.3-70-g09d2 From 39fb3b2c13d5d8383340f08dff893553111f6b7c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 9 Jan 2014 09:43:31 +0800 Subject: Prepare for Subsurface 4.0.2 release Update version numbers and add "new in 4.0.2" summary to ReleaseNotes. Signed-off-by: Dirk Hohndel --- README | 8 ++++---- ReleaseNotes.txt | 19 ++++++++++++++++++- subsurface.pro | 2 +- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/README b/README index 4f0fe5974..849e13066 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -This is the README file for Subsurface 4.0.1 +This is the README file for Subsurface 4.0.2 After the release of Subsurface 3.1 the Subsurface developer team decided to make a major change in the development direction of the @@ -24,7 +24,7 @@ As always in a massive rewrite like this, there are still a small handful of known bugs and issues - please check ReleaseNotes.txt and our bug tracker at trac.hohndel.org. -The latest public version is Subsurface 4.0.1, released in January of 2014. +The latest public version is Subsurface 4.0.2, released in January of 2014. License: GPLv2 @@ -40,12 +40,12 @@ You can also browse the sources via gitweb at git.hohndel.org If you want the latest release (instead of the bleeding edge development version) you can either get this via -git checkout v4.0.1 (or whatever the last release is) +git checkout v4.0.2 (or whatever the last release is) if you have already cloned the git repository as shown above or you can get a tar ball from -http://subsurface.hohndel.org/downloads/Subsurface-4.0.1.tgz +http://subsurface.hohndel.org/downloads/Subsurface-4.0.2.tgz Basic Usage: diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index e10869497..a07542419 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,4 +1,4 @@ - Subsurface 4.0.1 + Subsurface 4.0.2 ================ The Subsurface developer team is proud to announce the release of the @@ -37,6 +37,23 @@ available, the tank pressure curve) in very innovative ways that give the user additional information on relative velocity (and momentary air consumption) during the dive through the coloring of the graphs. +New in version 4.0.2 (compared to Subsurface 4.0.1): +---------------------------------------------------- + +- fixed potential crash when importing dive data without dive computer + model information +- improve parsing of equipment data; this now accepts localized units + as well as input in units that are not the display units (so if you + run Subsurface in metric, but went diving in a place where weights + are in US Pounds (lbs), you can now enter the weight in lbs and + Subsurface does the right thing) +- fix temperature conversion when downloading data from Uemis SDA +- improve autocompletion to always be case insensitive +- improve selection handling in the dive list +- include event data in libdivecomputer dump +- improve profiles generated for dives with no depth samples and no + average depth + New in version 4.0.1 (compared to Subsurface 4.0): -------------------------------------------------- diff --git a/subsurface.pro b/subsurface.pro index 244359271..5d51d242a 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -6,7 +6,7 @@ INCLUDEPATH += qt-ui $$PWD mac: TARGET = Subsurface else: TARGET = subsurface -VERSION = 4.0.1 +VERSION = 4.0.2 HEADERS = \ color.h \ -- cgit v1.2.3-70-g09d2 From a79ddde1b9b4d2149c0e2a34a4f63a6ab5ae176d Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 9 Jan 2014 10:34:25 +0800 Subject: Add unit-aware cylinder size string parserc Whittling down on the string parsing that doesn't check user-specified units. Still need to handle temperatures (and will do percentages to match the pattern too), but this is getting us closer to always honoring user-specified units. With this you can say that you have a "10l" cylinder at "3000psi", and it will do the right thing (it's basically a 72 cuft cylinder in imperial measurements). Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- dive.h | 1 + qt-ui/models.cpp | 64 ++++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 23 deletions(-) diff --git a/dive.h b/dive.h index a9df1a09f..d1f9797fe 100644 --- a/dive.h +++ b/dive.h @@ -802,6 +802,7 @@ extern double strtod_flags(const char *str, const char **ptr, unsigned int flags extern weight_t string_to_weight(const char *str); extern depth_t string_to_depth(const char *str); extern pressure_t string_to_pressure(const char *str); +extern volume_t string_to_volume(const char *str, pressure_t workp); #include "pref.h" diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index db180a27a..f411d282d 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -206,29 +206,15 @@ bool CylindersModel::setData(const QModelIndex& index, const QVariant& value, in } break; case SIZE: - if (CHANGED(toDouble, "cuft", "l")) { - // if units are CUFT then this value is meaningless until we have working pressure - if (vString.toDouble() != 0.0) { - TankInfoModel *tanks = TankInfoModel::instance(); - QModelIndexList matches = tanks->match(tanks->index(0,0), Qt::DisplayRole, cyl->type.description); - int mbar = cyl->type.workingpressure.mbar; - int mliter; - - if (mbar && prefs.units.volume == prefs.units.CUFT) { - double liters = cuft_to_l(vString.toDouble()); - liters /= bar_to_atm(mbar / 1000.0); - mliter = rint(liters * 1000); - } else { - mliter = rint(vString.toDouble() * 1000); - } - if (cyl->type.size.mliter != mliter) { - mark_divelist_changed(TRUE); - cyl->type.size.mliter = mliter; - if (!matches.isEmpty()) - tanks->setData(tanks->index(matches.first().row(), TankInfoModel::ML), cyl->type.size.mliter); - } - changed = true; - } + if (CHANGED(data, "", "")) { + TankInfoModel *tanks = TankInfoModel::instance(); + QModelIndexList matches = tanks->match(tanks->index(0,0), Qt::DisplayRole, cyl->type.description); + + cyl->type.size = string_to_volume(vString.toUtf8().data(), cyl->type.workingpressure); + mark_divelist_changed(TRUE); + if (!matches.isEmpty()) + tanks->setData(tanks->index(matches.first().row(), TankInfoModel::ML), cyl->type.size.mliter); + changed = true; } break; case WORKINGPRESS: @@ -513,6 +499,38 @@ psi: return pressure; } +/* Imperial cylinder volumes need working pressure to be meaningful */ +volume_t string_to_volume(const char *str, pressure_t workp) +{ + const char *end; + double value = strtod_flags(str, &end, 0); + QString rest = QString(end).trimmed(); + QString local_l = CylindersModel::tr("l"); + QString local_cuft = CylindersModel::tr("cuft"); + volume_t volume; + + if (rest.startsWith("l") || rest.startsWith(local_l)) + goto l; + if (rest.startsWith("cuft") || rest.startsWith(local_cuft)) + goto cuft; + /* + * If we don't have explicit units, and there is no working + * pressure, we're going to assume "liter" even in imperial + * measurements. + */ + if (!workp.mbar) + goto l; + if (prefs.units.volume == prefs.units.LITER) + goto l; +cuft: + if (workp.mbar) + value /= bar_to_atm(workp.mbar / 1000.0); + value = cuft_to_l(value); +l: + volume.mliter = rint(value * 1000); + return volume; +} + bool WeightModel::setData(const QModelIndex& index, const QVariant& value, int role) { QString vString = value.toString(); -- cgit v1.2.3-70-g09d2 From 3734bb9068d4b66fa76b0e13a027b1a8497ae27f Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 9 Jan 2014 10:43:28 +0800 Subject: Add and use 'string_to_fraction()' helper converter function This matches the pattern of unit conversion, and will allow us to remove all the code that uses the old complex "CHANGED()" macro that tries to remove units or percent signs. Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- dive.h | 1 + qt-ui/models.cpp | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dive.h b/dive.h index d1f9797fe..2f800c5e5 100644 --- a/dive.h +++ b/dive.h @@ -803,6 +803,7 @@ extern weight_t string_to_weight(const char *str); extern depth_t string_to_depth(const char *str); extern pressure_t string_to_pressure(const char *str); extern volume_t string_to_volume(const char *str, pressure_t workp); +extern fraction_t string_to_fraction(const char *str); #include "pref.h" diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index f411d282d..323086196 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -240,21 +240,15 @@ bool CylindersModel::setData(const QModelIndex& index, const QVariant& value, in } break; case O2: - if (CHANGED(toDouble, "%", "%")) { - int o2 = vString.toDouble() * 10 + 0.5; - if (cyl->gasmix.he.permille + o2 <= 1000) { - cyl->gasmix.o2.permille = o2; - changed = true; - } + if (CHANGED(data, "", "")) { + cyl->gasmix.o2 = string_to_fraction(vString.toUtf8().data()); + changed = true; } break; case HE: - if (CHANGED(toDouble, "%", "%")) { - int he = vString.toDouble() * 10 + 0.5; - if (cyl->gasmix.o2.permille + he <= 1000) { - cyl->gasmix.he.permille = he; - changed = true; - } + if (CHANGED(data, "", "")) { + cyl->gasmix.he = string_to_fraction(vString.toUtf8().data()); + changed = true; } break; case DEPTH: @@ -531,6 +525,16 @@ l: return volume; } +fraction_t string_to_fraction(const char *str) +{ + const char *end; + double value = strtod_flags(str, &end, 0); + fraction_t fraction; + + fraction.permille = rint(value * 10); + return fraction; +} + bool WeightModel::setData(const QModelIndex& index, const QVariant& value, int role) { QString vString = value.toString(); -- cgit v1.2.3-70-g09d2 From 0646f3e9ff3e5289b65d24d5f41408ee5be4a845 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 9 Jan 2014 10:47:28 +0800 Subject: Remove now stale arguments to "CHANGED()" macro We now never remove units or percentage signs, and always just compare the string data, so we should remove the hacky arguments that are no longer used. Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- qt-ui/models.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 323086196..b981793fb 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -182,9 +182,9 @@ void CylindersModel::passInData(const QModelIndex& index, const QVariant& value) } } -#define CHANGED(_t,_u1,_u2) \ - (vString = value.toString().remove(_u1).remove(_u2))._t() != \ - data(index, role).toString().remove(_u1).remove(_u2)._t() +/* Has the string value changed */ +#define CHANGED() \ + (vString = value.toString()) != data(index, role).toString() bool CylindersModel::setData(const QModelIndex& index, const QVariant& value, int role) { @@ -206,7 +206,7 @@ bool CylindersModel::setData(const QModelIndex& index, const QVariant& value, in } break; case SIZE: - if (CHANGED(data, "", "")) { + if (CHANGED()) { TankInfoModel *tanks = TankInfoModel::instance(); QModelIndexList matches = tanks->match(tanks->index(0,0), Qt::DisplayRole, cyl->type.description); @@ -218,7 +218,7 @@ bool CylindersModel::setData(const QModelIndex& index, const QVariant& value, in } break; case WORKINGPRESS: - if (CHANGED(data, "", "")) { + if (CHANGED()) { TankInfoModel *tanks = TankInfoModel::instance(); QModelIndexList matches = tanks->match(tanks->index(0,0), Qt::DisplayRole, cyl->type.description); cyl->type.workingpressure = string_to_pressure(vString.toUtf8().data()); @@ -228,31 +228,31 @@ bool CylindersModel::setData(const QModelIndex& index, const QVariant& value, in } break; case START: - if (CHANGED(data, "", "")) { + if (CHANGED()) { cyl->start = string_to_pressure(vString.toUtf8().data()); changed = true; } break; case END: - if (CHANGED(data, "", "")) { + if (CHANGED()) { cyl->end = string_to_pressure(vString.toUtf8().data()); changed = true; } break; case O2: - if (CHANGED(data, "", "")) { + if (CHANGED()) { cyl->gasmix.o2 = string_to_fraction(vString.toUtf8().data()); changed = true; } break; case HE: - if (CHANGED(data, "", "")) { + if (CHANGED()) { cyl->gasmix.he = string_to_fraction(vString.toUtf8().data()); changed = true; } break; case DEPTH: - if (CHANGED(data, "", "")) + if (CHANGED()) cyl->depth = string_to_depth(vString.toUtf8().data()); } dataChanged(index, index); @@ -558,7 +558,7 @@ bool WeightModel::setData(const QModelIndex& index, const QVariant& value, int r } break; case WEIGHT: - if (CHANGED(data, "", "")) { + if (CHANGED()) { ws->weight = string_to_weight(vString.toUtf8().data()); // now update the ws_info changed = true; -- cgit v1.2.3-70-g09d2 From a15485874153336f416889c9cd31d620e89f1bd0 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 9 Jan 2014 16:09:43 +0800 Subject: Update translations I'm not the author, just importing the translations from Transifex. Signed-off-by: Dirk Hohndel --- translations/subsurface_bg_BG.ts | 244 ++++++++++-------- translations/subsurface_da_DK.ts | 244 ++++++++++-------- translations/subsurface_de_CH.ts | 244 ++++++++++-------- translations/subsurface_de_DE.ts | 244 ++++++++++-------- translations/subsurface_es_ES.ts | 274 +++++++++++--------- translations/subsurface_et_EE.ts | 274 +++++++++++--------- translations/subsurface_fi_FI.ts | 244 ++++++++++-------- translations/subsurface_fr_FR.ts | 244 ++++++++++-------- translations/subsurface_he.ts | 508 ++++++++++++++++++++------------------ translations/subsurface_hr_HR.ts | 248 +++++++++++-------- translations/subsurface_id.ts | 248 +++++++++++-------- translations/subsurface_it_IT.ts | 438 +++++++++++++++++--------------- translations/subsurface_nb_NO.ts | 274 +++++++++++--------- translations/subsurface_nl_NL.ts | 244 ++++++++++-------- translations/subsurface_pl_PL.ts | 244 ++++++++++-------- translations/subsurface_pt_BR.ts | 364 +++++++++++++++------------ translations/subsurface_pt_PT.ts | 244 ++++++++++-------- translations/subsurface_ru_RU.ts | 244 ++++++++++-------- translations/subsurface_sk_SK.ts | 266 +++++++++++--------- translations/subsurface_source.ts | 232 ++++++++++------- translations/subsurface_sv_SE.ts | 274 +++++++++++--------- translations/subsurface_vi.ts | 248 +++++++++++-------- translations/subsurface_zh_TW.ts | 274 +++++++++++--------- 23 files changed, 3622 insertions(+), 2740 deletions(-) diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index b0e010de8..db41b46bc 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -122,15 +120,35 @@ Кликнете тук за да изтриете бутилка - + Cylinder cannot be removed Бутилката не може да бъде премахната - + This gas in use. Only cylinders that are not used in the dive can be removed. Този газ се използвза. Само бутилки, които не се използват в гмуркане могат да бъдат премахнати. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -155,22 +173,22 @@ DiveComputerModel - + Model Модел - + Device ID Име на устройство - + Nickname Прякор - + Clicking here will remove this divecomputer. Кликнете тук за да изтриете гмуркачески компютър. @@ -178,12 +196,12 @@ DiveItem - + l/min л/мин - + cuft/min кб.фута/мин @@ -408,67 +426,67 @@ Please, remove them first. DiveTripModel - + # № - + date дата - + m м - + ft фута - + min мин - + kg кг - + lbs паунда - + suit водолазен костюм - + cyl бут. - + location местонахождение - + SAC SAC - + OTU OTU - + maxCNS макс CNS @@ -618,22 +636,22 @@ Please, remove them first. Регистър файлове (*.log) - + Warning Предупреждение - + Saving the libdivecomputer dump will NOT download dives to the dive list. Записването на libdivecomputer дъмп НЕ обновява списъка на гмуркания - + Choose file for divecomputer binary dump file Изберете файл за libdivecomputer дъмп - + Dump files (*.bin) Дъмп файлове (*.bin) @@ -710,13 +728,13 @@ Please, remove them first. MainTab - + Dive Notes Бележки - + Location Местонахождение @@ -772,7 +790,7 @@ Please, remove them first. - + Notes Бележки @@ -903,13 +921,13 @@ Please, remove them first. Добави система за тежест - + Trip Location Местонахождение на пътуване - - + + Trip Notes Бележки за пътуване @@ -924,51 +942,51 @@ Please, remove them first. Отмяна - + This trip is being edited. Това пътуване се редактира. - + Multiple dives are being edited. Редактира се повече от едно гмуркане. - + This dive is being edited. Това гмуркане се редактира. - - - - - + + + + + /min /м - + unknown неизвестно - + N С - + S Ю - + E И - + W З @@ -1986,72 +2004,72 @@ Please, remove them first. ProfilePrintModel - + unknown неизвестно - + Dive #%1 - %2 Гмуркане №%1 - %2 - + Max depth: %1 %2 Макс. дълбочина: %1 %2 - + Duration: %1 min Времетраене: %1 мин - + Gas Used: Използван газ: - + SAC: SAC: - + Max. CNS: Макс. CNS - + Weights: Тежести: - + Notes: Бележки: - + Divemaster: Водач: - + Buddy: Партньор: - + Suit: Водолазен костюм: - + Viz: Видимост: - + Rating: Оценка: @@ -2212,17 +2230,17 @@ Please, remove them first. TankInfoModel - + Description Описание - + ml мл. - + bar бара @@ -2230,7 +2248,7 @@ Please, remove them first. ToolTipItem - + Information Информация @@ -2238,12 +2256,12 @@ Please, remove them first. WSInfoModel - + Description Описание - + kg кг @@ -2299,97 +2317,117 @@ Please, remove them first. WeightModel - + Type Тип - + Weight Тежест - + Clicking here will remove this weigthsystem. Кликнете тук за да изтриете система за тежест. + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip Година > Месец / Пътуване - + # № - + Duration Total Продължителност Общо - + Average Средно - + Shortest Най-късо - + Longest Най-дълго - + Depth (%1) Average Дълбочина (%1) Средно - - - + + + Minimum Минимум - - - + + + Maximum Максимум - + SAC (%1) Average SAC (%1) Средно - + Temp. (%1) Average Темп. (%1) @@ -2708,82 +2746,82 @@ Maximum Грешка при рaзряд на стойности - + Event: waiting for user action Събитие: изчаквание на действие от потребителя - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) - + Error registering the event handler. Грешка при регистриране на направление за събития - + Error registering the cancellation handler. Грешка при регистриране на направление за отменяне - + Dive data import error Грешка при вход на данни - + Unable to create libdivecomputer context Не може да бъде създаден libdivecomputer контекст - + Unable to open %s %s (%s) Не може да бъдe отворен %s %s (%s) - + Strange percentage reading %s Неразпозната стойност за проценти %s - - Failed to parse '%s'. + + Failed to parse '%s'. Не може да бъде напревен разбор на '%s'. - + Failed to parse '%s' Не може да бъде напревен разбор на '%s' - + Database query get_events failed. Базата данни не може да изпълни get_events. - - Database connection failed '%s'. + + Database connection failed '%s'. Няма връзка към базата данни '%s'. - - Database query failed '%s'. + + Database query failed '%s'. Грешка при заява към база данни '%s'. - + Can't open stylesheet %s Не може да бъде отворен стилов файл %s @@ -3533,4 +3571,4 @@ Uemis Zurich включен ли е правилно? Тревога: слаба батерия - + \ No newline at end of file diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index 241e961b1..c5e7c13d1 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -122,15 +120,35 @@ Klik her vil fjerne flasken - + Cylinder cannot be removed Flasken kan ikke fjernes - + This gas in use. Only cylinders that are not used in the dive can be removed. Denne flaske er i brug. Kun flasker som ikke er i brug kan slettes + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -155,22 +173,22 @@ fjerne den valgte dykkercomputer? DiveComputerModel - + Model Model - + Device ID Enheds ID - + Nickname Kaldenavn - + Clicking here will remove this divecomputer. Klik her, vil fjerne denne dykkercomputer @@ -178,12 +196,12 @@ fjerne den valgte dykkercomputer? DiveItem - + l/min l/min - + cuft/min cuft/min @@ -408,67 +426,67 @@ slet dem venligst først. DiveTripModel - + # # - + date Dato - + m m - + ft fod - + min min. - + kg kg - + lbs lbs - + suit Dragt - + cyl Flaske - + location Sted - + SAC SAC - + OTU OTU - + maxCNS MaxCNS @@ -618,22 +636,22 @@ slet dem venligst først. Logfiler (*.log) - + Warning Advarsel - + Saving the libdivecomputer dump will NOT download dives to the dive list. Gem af libdivecomputer dump vil IKKE downloade dyk til listen - + Choose file for divecomputer binary dump file Vælg fil for dykkercomputerens binære dump fil - + Dump files (*.bin) Dump filer (*.bin) @@ -710,13 +728,13 @@ slet dem venligst først. MainTab - + Dive Notes Dyk Noter - + Location Position @@ -772,7 +790,7 @@ slet dem venligst først. - + Notes Noter @@ -903,13 +921,13 @@ slet dem venligst først. Tilføj vægt system - + Trip Location Tur position - - + + Trip Notes Tur noter @@ -924,51 +942,51 @@ slet dem venligst først. Fortryd - + This trip is being edited. Turen er ved at blive rettet. - + Multiple dives are being edited. Flere dyk bliver rettet. - + This dive is being edited. Dette dyk bliver rettet. - - - - - + + + + + /min /min - + unknown Ukendt - + N N - + S S - + E Ø - + W V @@ -1986,72 +2004,72 @@ slet dem venligst først. ProfilePrintModel - + unknown Ukendt - + Dive #%1 - %2 Dyk #%1 - %2 - + Max depth: %1 %2 Max dybde: %1 %2 - + Duration: %1 min Varighed: %1 min - + Gas Used: Gas brugt: - + SAC: SAC: - + Max. CNS: Max. CNS: - + Weights: Vægt: - + Notes: Noter: - + Divemaster: Divemaster: - + Buddy: Makker: - + Suit: Dragt: - + Viz: Sigt: - + Rating: Vurdering: @@ -2212,17 +2230,17 @@ slet dem venligst først. TankInfoModel - + Description Beskrivelse - + ml ml - + bar bar @@ -2230,7 +2248,7 @@ slet dem venligst først. ToolTipItem - + Information Information @@ -2238,12 +2256,12 @@ slet dem venligst først. WSInfoModel - + Description Beskrivelse - + kg kg @@ -2299,97 +2317,117 @@ slet dem venligst først. WeightModel - + Type Type - + Weight Vægt - + Clicking here will remove this weigthsystem. Klik her, vil fjerne dette vægtsystem + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip År >Måned / Tur - + # # - + Duration Total Varighed Ialt - + Average Gennemsnit - + Shortest Kortest - + Longest Længst - + Depth (%1) Average Dybde (%1) Gennemsnit - - - + + + Minimum Minimum - - - + + + Maximum Maximum - + SAC (%1) Average SAC (%1) Gennemsnit - + Temp. (%1) Average Temp. (%1) @@ -2708,82 +2746,82 @@ Gennemsnit Fejl i fortolkning af prøver - + Event: waiting for user action Event: waiting for user action - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) - + Error registering the event handler. Fejl: registering the event handler. - + Error registering the cancellation handler. Fejl: registering the cancellation handler. - + Dive data import error Import fejl i dykker data - + Unable to create libdivecomputer context Kan ikke danne libdivecomputer context - + Unable to open %s %s (%s) Kan ikke åbne %s %s (%s) - + Strange percentage reading %s Mærkelig procent læsning %s - - Failed to parse '%s'. + + Failed to parse '%s'. Kunne ikke fortolke '%s'. - + Failed to parse '%s' Fejl i fortolkning af '%s' - + Database query get_events failed. Database forespørgsel get_events fejlede - - Database connection failed '%s'. + + Database connection failed '%s'. Database forbindelse fejlede '%s'. - - Database query failed '%s'. + + Database query failed '%s'. Database forespørgsel fejlede '%s'. - + Can't open stylesheet %s Kan ikke åbne stylesheet %s @@ -3536,4 +3574,4 @@ Er Uemis Zurich tilsluttet korrekt? Lav batteri alarm - + \ No newline at end of file diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index 3793f274f..665177f9d 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -122,15 +120,35 @@ Hier klicken entfernt diese Flasche. - + Cylinder cannot be removed Flasche kann nicht entfernt werden - + This gas in use. Only cylinders that are not used in the dive can be removed. Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden. + + + psi + psi + + + + bar + bar + + + + l + l + + + + cuft + cuft + DiveComputerManagementDialog @@ -154,22 +172,22 @@ DiveComputerModel - + Model Modell - + Device ID Gerätebezeichnung - + Nickname Gerätename - + Clicking here will remove this divecomputer. Hier klicken entfernt diesen Tauchcomputer. @@ -177,12 +195,12 @@ DiveItem - + l/min l/min - + cuft/min cuft/min @@ -407,67 +425,67 @@ Bitte entferne diese zuerst. DiveTripModel - + # Nr. - + date Datum - + m m - + ft ft - + min min - + kg kg - + lbs US Pfund - + suit Anzug - + cyl Flasche - + location Tauchplatz - + SAC SAC - + OTU OTU - + maxCNS max. CNS @@ -617,22 +635,22 @@ Bitte entferne diese zuerst. Log Dateien (*.log) - + Warning Warnung - + Saving the libdivecomputer dump will NOT download dives to the dive list. Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt. - + Choose file for divecomputer binary dump file Datei auswählen, in die der libdivecomputer Dump gespeichert wird - + Dump files (*.bin) Dump Dateien (*.bin) @@ -709,13 +727,13 @@ Bitte entferne diese zuerst. MainTab - + Dive Notes Notizen - + Location Ort @@ -771,7 +789,7 @@ Bitte entferne diese zuerst. - + Notes Notizen @@ -902,13 +920,13 @@ Bitte entferne diese zuerst. Gewichtsystem hinzufügen - + Trip Location Ziel der Reise - - + + Trip Notes Reisenotizen @@ -923,51 +941,51 @@ Bitte entferne diese zuerst. Abbrechen - + This trip is being edited. Diese Reise wird bearbeitet. - + Multiple dives are being edited. Mehrere Tauchgänge werden bearbeitet. - + This dive is being edited. Dieser Tauchgang wird bearbeitet. - - - - - + + + + + /min /min - + unknown unbekannt - + N N - + S S - + E O - + W W @@ -1985,72 +2003,72 @@ Bitte entferne diese zuerst. ProfilePrintModel - + unknown unbekannt - + Dive #%1 - %2 Tauchgang Nr %1 - %2 - + Max depth: %1 %2 max Tiefe: %1 %2 - + Duration: %1 min Dauer: %1 Minuten - + Gas Used: Verw. Gas: - + SAC: SAC: - + Max. CNS: Max. CNS: - + Weights: Blei: - + Notes: Notizen: - + Divemaster: Divemaster: - + Buddy: Buddy: - + Suit: Anzug: - + Viz: Sicht: - + Rating: Bewertung: @@ -2211,17 +2229,17 @@ Bitte entferne diese zuerst. TankInfoModel - + Description Beschreibung - + ml ml - + bar bar @@ -2229,7 +2247,7 @@ Bitte entferne diese zuerst. ToolTipItem - + Information Information @@ -2237,12 +2255,12 @@ Bitte entferne diese zuerst. WSInfoModel - + Description Beschreibung - + kg kg @@ -2298,97 +2316,117 @@ Bitte entferne diese zuerst. WeightModel - + Type Typ - + Weight Gewicht - + Clicking here will remove this weigthsystem. Hier klicken entfernt dieses Gewichtssystem. + + + kg + kg + + + + lbs + US Pfund + + + + ft + ft + + + + m + m + YearlyStatisticsModel - + Year > Month / Trip Jahr > Monat / Reise - + # Nr. - + Duration Total Dauer Gesamt - + Average Ø - + Shortest Kürzester - + Longest Längster - + Depth (%1) Average Tiefe (%1) Durchschnitt - - - + + + Minimum Minimum - - - + + + Maximum Maximum - + SAC (%1) Average SAC (%1) Durchschnitt - + Temp. (%1) Average Temp. (%1) @@ -2707,82 +2745,82 @@ Mittel Fehler beim Lesen der Samples - + Event: waiting for user action Ereignis: warte auf Benutzeraktion - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) - + Error registering the event handler. Fehler beim Registrieren der Ereignisbehandlung - + Error registering the cancellation handler. Fehler bei der Registrierung der Abbruchbehandlung - + Dive data import error Fehler beim Importieren der Tauchgangsdaten - + Unable to create libdivecomputer context Fehler beim Erzeugen des libdivecomputer Contexts - + Unable to open %s %s (%s) Fehler beim Öffnen von %s %s (%s) - + Strange percentage reading %s Unverständliche Prozentangabe %s - - Failed to parse '%s'. + + Failed to parse '%s'. Fehler beim Lesen von '%s'. - + Failed to parse '%s' Fehler beim Lesen von '%s' - + Database query get_events failed. Datenbank Anfrage 'get_events' fehlgeschlagen. - - Database connection failed '%s'. + + Database connection failed '%s'. Datenbank Verbindung fehlgeschlagen '%s'. - - Database query failed '%s'. + + Database query failed '%s'. Datenbank Anfrage fehlgeschlagen '%s'. - + Can't open stylesheet %s Kann Stylesheet %s nicht öffnen @@ -3533,4 +3571,4 @@ Ist der Uemis Zürich korrekt verbunden? Alarm: Batterie schwach - + \ No newline at end of file diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index 74ed36077..4314d565e 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -122,15 +120,35 @@ Hier klicken entfernt diese Flasche. - + Cylinder cannot be removed Flasche kann nicht entfernt werden - + This gas in use. Only cylinders that are not used in the dive can be removed. Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden. + + + psi + psi + + + + bar + bar + + + + l + l + + + + cuft + cu.ft. + DiveComputerManagementDialog @@ -154,22 +172,22 @@ DiveComputerModel - + Model Modell - + Device ID Gerätebezeichnung - + Nickname Gerätename - + Clicking here will remove this divecomputer. Hier klicken entfernt diesen Tauchcomputer. @@ -177,12 +195,12 @@ DiveItem - + l/min l/min - + cuft/min cuft/min @@ -407,67 +425,67 @@ Bitte entferne diese zuerst. DiveTripModel - + # Nr. - + date Datum - + m m - + ft ft - + min min - + kg kg - + lbs US Pfund - + suit Anzug - + cyl Flasche - + location Tauchplatz - + SAC AMV - + OTU OTU - + maxCNS max. CNS @@ -617,22 +635,22 @@ Bitte entferne diese zuerst. Log Dateien (*.log) - + Warning Warnung - + Saving the libdivecomputer dump will NOT download dives to the dive list. Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt. - + Choose file for divecomputer binary dump file Datei auswählen, in die der libdivecomputer Dump gespeichert wird - + Dump files (*.bin) Dump Dateien (*.bin) @@ -709,13 +727,13 @@ Bitte entferne diese zuerst. MainTab - + Dive Notes Notizen - + Location Ort @@ -771,7 +789,7 @@ Bitte entferne diese zuerst. - + Notes Notizen @@ -902,13 +920,13 @@ Bitte entferne diese zuerst. Gewichtsystem hinzufügen - + Trip Location Ziel der Reise - - + + Trip Notes Reisenotizen @@ -923,51 +941,51 @@ Bitte entferne diese zuerst. Abbrechen - + This trip is being edited. Diese Reise wird bearbeitet. - + Multiple dives are being edited. Mehrere Tauchgänge werden bearbeitet. - + This dive is being edited. Dieser Tauchgang wird bearbeitet. - - - - - + + + + + /min /min - + unknown unbekannt - + N N - + S S - + E O - + W W @@ -1985,72 +2003,72 @@ Bitte entferne diese zuerst. ProfilePrintModel - + unknown unbekannt - + Dive #%1 - %2 Tauchgang Nr %1 - %2 - + Max depth: %1 %2 max Tiefe: %1 %2 - + Duration: %1 min Dauer: %1 Minuten - + Gas Used: Verw. Gas: - + SAC: AMV: - + Max. CNS: Max. CNS: - + Weights: Blei: - + Notes: Notizen: - + Divemaster: Tauchgruppenleiter: - + Buddy: Partner: - + Suit: Anzug: - + Viz: Sicht: - + Rating: Bewertung: @@ -2211,17 +2229,17 @@ Bitte entferne diese zuerst. TankInfoModel - + Description Beschreibung - + ml ml - + bar bar @@ -2229,7 +2247,7 @@ Bitte entferne diese zuerst. ToolTipItem - + Information Information @@ -2237,12 +2255,12 @@ Bitte entferne diese zuerst. WSInfoModel - + Description Beschreibung - + kg kg @@ -2298,97 +2316,117 @@ Bitte entferne diese zuerst. WeightModel - + Type Typ - + Weight Gewicht - + Clicking here will remove this weigthsystem. Hier klicken entfernt dieses Gewichtssystem. + + + kg + kg + + + + lbs + US Pfund + + + + ft + ft + + + + m + m + YearlyStatisticsModel - + Year > Month / Trip Jahr > Monat / Reise - + # Nr. - + Duration Total Dauer Gesamt - + Average Ø - + Shortest Kürzester - + Longest Längster - + Depth (%1) Average Tiefe (%1) Durchschnitt - - - + + + Minimum Minimum - - - + + + Maximum Maximum - + SAC (%1) Average AMV (%1) Durchschnitt - + Temp. (%1) Average Temp. (%1) @@ -2707,82 +2745,82 @@ Mittel Fehler beim Lesen der Samples - + Event: waiting for user action Ereignis: warte auf Benutzeraktion - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) - + Error registering the event handler. Fehler beim Registrieren der Ereignisbehandlung - + Error registering the cancellation handler. Fehler bei der Registrierung der Abbruchbehandlung - + Dive data import error Fehler beim Importieren der Tauchgangsdaten - + Unable to create libdivecomputer context Fehler beim Erzeugen des libdivecomputer Contexts - + Unable to open %s %s (%s) Fehler beim Öffnen von %s %s (%s) - + Strange percentage reading %s Unverständliche Prozentangabe %s - - Failed to parse '%s'. + + Failed to parse '%s'. Fehler beim Lesen von '%s'. - + Failed to parse '%s' Fehler beim Lesen von '%s' - + Database query get_events failed. Datenbank Anfrage 'get_events' fehlgeschlagen. - - Database connection failed '%s'. + + Database connection failed '%s'. Datenbank Verbindung fehlgeschlagen '%s'. - - Database query failed '%s'. + + Database query failed '%s'. Datenbank Anfrage fehlgeschlagen '%s'. - + Can't open stylesheet %s Kann Stylesheet %s nicht öffnen @@ -3533,4 +3571,4 @@ Ist der Uemis Zürich korrekt verbunden? Alarm: Batterie schwach - + \ No newline at end of file diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index e4c112af3..b4b64b331 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -71,7 +69,7 @@ CSV Files (*.csv);;All Files(*) - + Archivos CSV (*.csv);;Todos los Archivos(*) @@ -122,15 +120,35 @@ Pulsar aquí borrará esta botella - + Cylinder cannot be removed La botella no puede borrarse - + This gas in use. Only cylinders that are not used in the dive can be removed. Gas en uso. Solo pueden borrarse botellas que no se usan en la inmersión. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -155,22 +173,22 @@ el ordenador de buceo seleccionado? DiveComputerModel - + Model Modelo - + Device ID ID del dispositivo - + Nickname Nombre - + Clicking here will remove this divecomputer. Pulsar aquí borrará este ordenador de buceo. @@ -178,12 +196,12 @@ el ordenador de buceo seleccionado? DiveItem - + l/min l/min - + cuft/min Pie³/min @@ -408,67 +426,67 @@ Por favor, bórralas antes. DiveTripModel - + # N.º - + date Fecha - + m m - + ft ft - + min min - + kg kg - + lbs lbs - + suit traje - + cyl bot - + location Ubicación - + SAC SAC - + OTU OTU - + maxCNS maxCNS @@ -498,27 +516,27 @@ Por favor, bórralas antes. no dives were selected - + No se seleccionó ninguna inmersión failed to create zip file for upload: %1 - + Fallo al crear archivo zip para subir: %1 cannot create temporary file: %1 - + No se puede crear archivo temporal: %1 internal error: %1 - + Error interno: %1 internal error - + Error interno @@ -610,32 +628,32 @@ Por favor, bórralas antes. Choose file for divecomputer download logfile - + Selecciona archivo para registro de descarga de libdivecomputer Log files (*.log) - + Archivos Log (*.log) - + Warning Advertencia - + Saving the libdivecomputer dump will NOT download dives to the dive list. - + Guardar el volcado de libdivecomputer NO descargará buceos a la lista de inmersiones. - + Choose file for divecomputer binary dump file - + Selecciona archivo para el volcado binario del ordenador de buceo - + Dump files (*.bin) - + Archivos de volcado (*.bin) @@ -690,12 +708,12 @@ Por favor, bórralas antes. Save libdivecomputer logfile - + Guardar registro de libdivecomputer Save libdivecomputer dumpfile - + Guardar volcado de libdivecomputer @@ -710,13 +728,13 @@ Por favor, bórralas antes. MainTab - + Dive Notes Notas de la inmersión - + Location Ubicación @@ -772,7 +790,7 @@ Por favor, bórralas antes. - + Notes Notas @@ -903,13 +921,13 @@ Por favor, bórralas antes. Añadir sistema de lastre - + Trip Location Ubicación del viaje - - + + Trip Notes Notas del viaje @@ -924,51 +942,51 @@ Por favor, bórralas antes. Cancelar - + This trip is being edited. Este viaje está siendo editado. - + Multiple dives are being edited. Se están editando varias inmersiones. - + This dive is being edited. Esta inmersión esta siendo editada. - - - - - + + + + + /min /min - + unknown desconocido - + N N - + S S - + E E - + W O @@ -1880,7 +1898,7 @@ Por favor, bórralas antes. Unhide all events - + Revelar todos los eventos @@ -1986,72 +2004,72 @@ Por favor, bórralas antes. ProfilePrintModel - + unknown desconocido - + Dive #%1 - %2 Inmersión n.º %1 - %2 - + Max depth: %1 %2 Profundidad máxima: %1 %2 - + Duration: %1 min Duración: %1 min - + Gas Used: Gas usado: - + SAC: CAS: - + Max. CNS: Max. CNS: - + Weights: Lastre: - + Notes: Notas: - + Divemaster: Divemaster: - + Buddy: Compañero: - + Suit: Traje: - + Viz: Visibilidad: - + Rating: Calificación: @@ -2212,17 +2230,17 @@ Por favor, bórralas antes. TankInfoModel - + Description Descripción - + ml ml - + bar bar @@ -2230,7 +2248,7 @@ Por favor, bórralas antes. ToolTipItem - + Information Información @@ -2238,12 +2256,12 @@ Por favor, bórralas antes. WSInfoModel - + Description Descripción - + kg kg @@ -2299,97 +2317,117 @@ Por favor, bórralas antes. WeightModel - + Type Tipo - + Weight Peso - + Clicking here will remove this weigthsystem. Pulsar aquí borrará este sistema de lastre. + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip Año > Mes / Viaje - + # N.º - + Duration Total Duración Total - + Average Media - + Shortest Más corta - + Longest Más larga - + Depth (%1) Average Profundidad (%1) Media - - - + + + Minimum Mínimo - - - + + + Maximum Máximo - + SAC (%1) Average CAS (%1) Medio - + Temp. (%1) Average Temp. (%1) @@ -2708,84 +2746,84 @@ Media Error al analizar las muestras - + Event: waiting for user action Evento: esperando acción del usuario - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) modelo=%u (0x%08x), firmware=%u (0x%08x), n.º de serie=%u (0x%08x) - + Error registering the event handler. Error al registrar el manejador de eventos - + Error registering the cancellation handler. Error al registrar el manejador de cancelación - + Dive data import error Error al importar datos de inmersiones - + Unable to create libdivecomputer context No es posible crear el contexto de libdivecomputer - + Unable to open %s %s (%s) No se pudo abrir %s %s (%s) - + Strange percentage reading %s Porcentaje extraño al leer %s - - Failed to parse '%s'. + + Failed to parse '%s'. No se pudo analizar «%s». - + Failed to parse '%s' No se pudo analizar «%s» - + Database query get_events failed. Falló la petición get_events a la base de datos. - - Database connection failed '%s'. + + Database connection failed '%s'. Falló la conexión a la base de datos «%s». - - Database query failed '%s'. + + Database query failed '%s'. Falló la petición a la base de datos «%s». - + Can't open stylesheet %s - + No se puede abrir la hoja de estilo %s @@ -3534,4 +3572,4 @@ Is the Uemis Zurich plugged in correctly? Alerta de batería baja - + \ No newline at end of file diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index 75e70755a..92c1b8fdd 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -71,7 +69,7 @@ CSV Files (*.csv);;All Files(*) - + @@ -122,15 +120,35 @@ Siin klikkamine eemaldab selle ballooni - + Cylinder cannot be removed Ballooni ei saa eemaldada - + This gas in use. Only cylinders that are not used in the dive can be removed. See gaas on kasutusel. Eemaldada saab ainult neid balloone mida ei kasutata sellel sukeldumisel. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -155,22 +173,22 @@ DiveComputerModel - + Model Mudel - + Device ID Seadme ID - + Nickname Hüüdnimi - + Clicking here will remove this divecomputer. Siin klikkamine eemaldab selle kompuutri. @@ -178,12 +196,12 @@ DiveItem - + l/min l/min - + cuft/min kuupjalga/min @@ -408,67 +426,67 @@ palun eemalda need esmalt. DiveTripModel - + # # - + date kuupäev - + m m - + ft jalg - + min min - + kg kg - + lbs nael - + suit ülikond - + cyl ball - + location asukoht - + SAC SAC - + OTU Hapnikumürgistuse ühik (OTU) - + maxCNS maxCNS @@ -498,27 +516,27 @@ palun eemalda need esmalt. no dives were selected - + failed to create zip file for upload: %1 - + cannot create temporary file: %1 - + internal error: %1 - + internal error - + @@ -610,32 +628,32 @@ palun eemalda need esmalt. Choose file for divecomputer download logfile - + Log files (*.log) - + - + Warning Hoiatus - + Saving the libdivecomputer dump will NOT download dives to the dive list. - + - + Choose file for divecomputer binary dump file - + - + Dump files (*.bin) - + @@ -690,12 +708,12 @@ palun eemalda need esmalt. Save libdivecomputer logfile - + Save libdivecomputer dumpfile - + @@ -710,13 +728,13 @@ palun eemalda need esmalt. MainTab - + Dive Notes Sukeldumise märkmed - + Location Asukoht @@ -772,7 +790,7 @@ palun eemalda need esmalt. - + Notes Märkmed @@ -903,13 +921,13 @@ palun eemalda need esmalt. Lisa raskuste süsteem - + Trip Location Väljasõidu koht - - + + Trip Notes Väljasõidu märkmed @@ -924,51 +942,51 @@ palun eemalda need esmalt. Loobu - + This trip is being edited. Seda väljasõitu toimetatakse - + Multiple dives are being edited. Mitut sukeldumist toimetatakse - + This dive is being edited. Seda sukeldumist toimetatakse. - - - - - + + + + + /min /min - + unknown tundmatu - + N N - + S S - + E E - + W W @@ -1880,7 +1898,7 @@ palun eemalda need esmalt. Unhide all events - + @@ -1986,72 +2004,72 @@ palun eemalda need esmalt. ProfilePrintModel - + unknown tundmatu - + Dive #%1 - %2 Sukeldumine #%1 - %2 - + Max depth: %1 %2 Max sügavus: %1 %2 - + Duration: %1 min Kestus: %1 min - + Gas Used: Kasutatud gaas: - + SAC: SAC: - + Max. CNS: Max CNS: - + Weights: Raskused: - + Notes: Märkmed: - + Divemaster: Divemaster: - + Buddy: Semu: - + Suit: Ülikond: - + Viz: Nähtavus: - + Rating: Hinne: @@ -2212,17 +2230,17 @@ palun eemalda need esmalt. TankInfoModel - + Description Kirjeldus - + ml ml - + bar bar @@ -2230,7 +2248,7 @@ palun eemalda need esmalt. ToolTipItem - + Information Info @@ -2238,12 +2256,12 @@ palun eemalda need esmalt. WSInfoModel - + Description Kirjeldus - + kg kg @@ -2299,97 +2317,117 @@ palun eemalda need esmalt. WeightModel - + Type Tüüp - + Weight Raskus - + Clicking here will remove this weigthsystem. Siin klikkamine kõrvaldab selle raskuste süsteemi + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip Aasta > Kuu / väljasõit - + # # - + Duration Total Kestus kokku - + Average Keskmine - + Shortest Lühim - + Longest Pikim - + Depth (%1) Average Sügavus (%1) keskmine - - - + + + Minimum Miinimum - - - + + + Maximum Maksimum - + SAC (%1) Average SAC (%1) keskmine - + Temp. (%1) Average Temp. (%1) @@ -2708,84 +2746,84 @@ Maksimum Viga proovide tuvastamisel - + Event: waiting for user action Sündmus: ootan kasutaja sekkumist - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) mudel=%u (0x%08x), püsivara=%u (0x%08x), seerianr=%u (0x%08x) - + Error registering the event handler. Viga sündmuste draiveri registreerimisel. - + Error registering the cancellation handler. Viga tühistamise draiveri registreerimisel - + Dive data import error Viga sukeldumise andmete impordil - + Unable to create libdivecomputer context Ei saa luua libdivecomputer konteksti - + Unable to open %s %s (%s) Ei saa avada %s %s (%s) - + Strange percentage reading %s Imelik protsendilugem %s - - Failed to parse '%s'. + + Failed to parse '%s'. '%s' tuvastamine ebaõnnestus. - + Failed to parse '%s' '%s' tuvastamine ebaõnnestus - + Database query get_events failed. Andmebaasi päring get_events ebaõnnestus. - - Database connection failed '%s'. + + Database connection failed '%s'. Andmebaasi ühendus ebaõnnestus '%s'. - - Database query failed '%s'. + + Database query failed '%s'. Andmebaasi päring ebaõnnestus '%s'. - + Can't open stylesheet %s - + @@ -3531,4 +3569,4 @@ Kas Uemis Zurich on ühendatud korrektselt? Patarei tühjenemise häire - + \ No newline at end of file diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index db72e72e9..20f505c0c 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -122,15 +120,35 @@ Poista säiliö. - + Cylinder cannot be removed Säiliötä ei voida poistaa - + This gas in use. Only cylinders that are not used in the dive can be removed. Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -155,22 +173,22 @@ poistaa valitun sukellustietokoneen? DiveComputerModel - + Model Malli - + Device ID Laite ID - + Nickname Lempinimi - + Clicking here will remove this divecomputer. Poista sukellustietokone. @@ -178,12 +196,12 @@ poistaa valitun sukellustietokoneen? DiveItem - + l/min l/min - + cuft/min jalkaa/min @@ -408,67 +426,67 @@ poista ensin pysähdykset. DiveTripModel - + # # - + date päiväys - + m m - + ft ft - + min min - + kg kg - + lbs pauna - + suit puku - + cyl säiliöt - + location kohde - + SAC Pintakulutus - + OTU Happikertymä - + maxCNS maxCNS @@ -618,22 +636,22 @@ poista ensin pysähdykset. Lokitiedostot (*.log) - + Warning Varoitus - + Saving the libdivecomputer dump will NOT download dives to the dive list. Kun sukellustietokoneen latauksesta tallennetaan raakatiedosto, sukelluksia EI tallenneta sukelluslistaan. - + Choose file for divecomputer binary dump file Valitse tiedosto sukellustietokoneen latauksen raakatiedostolle - + Dump files (*.bin) Raakatiedostot (*.bin) @@ -710,13 +728,13 @@ poista ensin pysähdykset. MainTab - + Dive Notes Muistiinpanot - + Location Kohde @@ -772,7 +790,7 @@ poista ensin pysähdykset. - + Notes Muistiinpanot @@ -903,13 +921,13 @@ poista ensin pysähdykset. Lisää painojärjestelmä - + Trip Location Matkakohde - - + + Trip Notes Matkan muistiinpanot @@ -924,51 +942,51 @@ poista ensin pysähdykset. Peruuta - + This trip is being edited. Tätä sukellusretkeä muokataan. - + Multiple dives are being edited. Muokataan useita sukelluksia. - + This dive is being edited. Tätä sukellusta muokataan. - - - - - + + + + + /min /min - + unknown tuntematon - + N N - + S S - + E E - + W W @@ -1987,72 +2005,72 @@ poista ensin pysähdykset. ProfilePrintModel - + unknown tuntematon - + Dive #%1 - %2 Sukellus #%1 - %2 - + Max depth: %1 %2 Suurin syvyys: %1 %2 - + Duration: %1 min Kesto: %1 min - + Gas Used: Kaasu: - + SAC: Pintakulutus: - + Max. CNS: Max CNS: - + Weights: Painot: - + Notes: Muistiinpanot: - + Divemaster: Sukellusvanhin: - + Buddy: Sukelluspari: - + Suit: Puku: - + Viz: Näkyvyys: - + Rating: Yleisarvio: @@ -2213,17 +2231,17 @@ poista ensin pysähdykset. TankInfoModel - + Description Kuvaus - + ml ml - + bar bar @@ -2231,7 +2249,7 @@ poista ensin pysähdykset. ToolTipItem - + Information Tiedot @@ -2239,12 +2257,12 @@ poista ensin pysähdykset. WSInfoModel - + Description Kuvaus - + kg kg @@ -2300,97 +2318,117 @@ poista ensin pysähdykset. WeightModel - + Type Tyyppi - + Weight Painot - + Clicking here will remove this weigthsystem. Poista painojärjestelmä näpäyttämällä ikonia. + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip Vuosi > Kuukausi / Retki - + # # - + Duration Total Kesto Kokonais - + Average Keskim. - + Shortest Lyhin - + Longest Pisin - + Depth (%1) Average Dyvyys (%1) Keski - - - + + + Minimum Alin - - - + + + Maximum Suurin - + SAC (%1) Average SAC (%1) Keski - + Temp. (%1) Average Lämpö (%1) @@ -2709,82 +2747,82 @@ Keski Virhe näytteiden tulkinnassa - + Event: waiting for user action Tapahtuma: odotetaan käyttäjän toimia - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x) - + Error registering the event handler. Virhe tapahtumakäsittelijän rekisteröinnissä. - + Error registering the cancellation handler. Virhe perumiskäsittelijän rekisteröinnissä. - + Dive data import error Virhe sukellusten jäsentämisessä - + Unable to create libdivecomputer context libdivecomputer-kontekstin luominen epäonnistui - + Unable to open %s %s (%s) Avaaminen epäonnistui: %s %s (%s) - + Strange percentage reading %s Outo prosenttiosuus: %s - - Failed to parse '%s'. + + Failed to parse '%s'. Tiedoston '%s' lukeminen epäonnistui. - + Failed to parse '%s' Tiedoston '%s' lukeminen epäonnistui. - + Database query get_events failed. Tietokantakysely 'get_events' (nouda tapahtumat) epäonnistui. - - Database connection failed '%s'. + + Database connection failed '%s'. Tietokantayhteys epäonnistui '%s'. - - Database query failed '%s'. + + Database query failed '%s'. Tietokantakysely epäonnistui '%s'. - + Can't open stylesheet %s Tyylitiedoston %1 avaus ei onnistu @@ -3535,4 +3573,4 @@ Onko Uemis Zurich kytketty oikein? Hälytys: heikko paristo - + \ No newline at end of file diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 29f75af0c..cdf648b59 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -122,15 +120,35 @@ Cliquer ici retirera ce bloc. - + Cylinder cannot be removed Le bloc ne peut être retiré. - + This gas in use. Only cylinders that are not used in the dive can be removed. Ce gaz est utilisé. Seuls les blocs qui ne sont pas utilisés dans la plongée peuvent être retirés. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -155,22 +173,22 @@ l'ordinateur de plongée sélectionné ? DiveComputerModel - + Model Modèle - + Device ID Identifiant du périphérique - + Nickname Nom - + Clicking here will remove this divecomputer. Cliquer ici retirera cet ordinateur de plongée. @@ -178,12 +196,12 @@ l'ordinateur de plongée sélectionné ? DiveItem - + l/min l/min - + cuft/min cuft/min @@ -408,67 +426,67 @@ Veuillez d'abord les supprimer. DiveTripModel - + # N° - + date date - + m m - + ft pied - + min min - + kg kg - + lbs livre US - + suit combinaison - + cyl blk - + location lieu - + SAC Consommation d'air - + OTU OTU - + maxCNS SNCmax @@ -618,22 +636,22 @@ Veuillez d'abord les supprimer. Fichier de log (*.log) - + Warning Avertissement - + Saving the libdivecomputer dump will NOT download dives to the dive list. Sauvegarder le déchargement de libdivecomputer ne téléchargera pas les plongées dans la liste des plongées - + Choose file for divecomputer binary dump file Choisir le fichier pour le fichier de déchargement de libdivecomputer - + Dump files (*.bin) Fichiers de décharge (*.bin) @@ -710,13 +728,13 @@ Veuillez d'abord les supprimer. MainTab - + Dive Notes Notes de plongée - + Location Lieu @@ -772,7 +790,7 @@ Veuillez d'abord les supprimer. - + Notes Notes @@ -903,13 +921,13 @@ Veuillez d'abord les supprimer. Ajouter un système de poids - + Trip Location Lieu du groupe - - + + Trip Notes Notes du groupe @@ -924,51 +942,51 @@ Veuillez d'abord les supprimer. Annuler - + This trip is being edited. Ce groupe est en train d'être édité. - + Multiple dives are being edited. Plusieurs plongées sont en train d'être éditées. - + This dive is being edited. Cette plongée est en train d'être éditée. - - - - - + + + + + /min /min - + unknown inconnu - + N N - + S S - + E E - + W O @@ -1986,72 +2004,72 @@ Veuillez d'abord les supprimer. ProfilePrintModel - + unknown inconnu - + Dive #%1 - %2 Plongée #%1 - %2 - + Max depth: %1 %2 Profondeur max: %1 %2 - + Duration: %1 min Durée: %1 min - + Gas Used: Gaz utilisé: - + SAC: Consommation d'air: - + Max. CNS: SNC Max.: - + Weights: Poids: - + Notes: Notes: - + Divemaster: Chef de palanquée: - + Buddy: Binôme: - + Suit: Combinaison: - + Viz: Visi: - + Rating: Évaluation: @@ -2212,17 +2230,17 @@ Veuillez d'abord les supprimer. TankInfoModel - + Description Description - + ml ml - + bar bar @@ -2230,7 +2248,7 @@ Veuillez d'abord les supprimer. ToolTipItem - + Information Information @@ -2238,12 +2256,12 @@ Veuillez d'abord les supprimer. WSInfoModel - + Description Description - + kg kg @@ -2299,97 +2317,117 @@ Veuillez d'abord les supprimer. WeightModel - + Type Type - + Weight Poids - + Clicking here will remove this weigthsystem. Cliquer ici retirera ce système de poids. + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip Année > Mois / Groupe - + # N° - + Duration Total Durée Totale - + Average Moyenne - + Shortest Plus courte - + Longest Plus longue - + Depth (%1) Average Pronfondeur (%&) Moyenne - - - + + + Minimum Minimum - - - + + + Maximum Maximum - + SAC (%1) Average SAC (%1) Moyenne - + Temp. (%1) Average Temp. (%1) @@ -2708,82 +2746,82 @@ Moyenne Impossible d'analyser des échantillons - + Event: waiting for user action Événement : attente d'une action de l'utilisateur - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) modèle = %u (0x%08x), firmware = %u (0x%08x), port série = %u (0x%08x) - + Error registering the event handler. Impossible d'enregistrer le gestionnaire d'événement. - + Error registering the cancellation handler. Impossible d'enregistrer le gestionnaire d'annulation. - + Dive data import error Erreur à l'import des données de plongées - + Unable to create libdivecomputer context Impossible de créer un contexte libdivecomputer - + Unable to open %s %s (%s) Impossible d'ouvrir %s %s (%s) - + Strange percentage reading %s Valeur de pourcentage étrange %s - - Failed to parse '%s'. + + Failed to parse '%s'. Impossible d'analyser « %s ». - + Failed to parse '%s' Impossible d'analyser « %s » - + Database query get_events failed. Échec de la requête. - - Database connection failed '%s'. + + Database connection failed '%s'. Connexion à la base de données impossible '%s'. - - Database query failed '%s'. + + Database query failed '%s'. Échec de la requête '%s'. - + Can't open stylesheet %s Impossible d'ouvrir le feuille de style %s @@ -3534,4 +3572,4 @@ Est-ce que votre Uemis Zurich est branché correctement ? Alarme de batterie faible - + \ No newline at end of file diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index bc9fce4c0..2161bb23c 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -21,12 +19,12 @@ Field Separator - + Field Configuration - + @@ -51,17 +49,17 @@ Cns - + Stopdepth - + Pre-configured imports - + @@ -104,12 +102,12 @@ Switch at - + He% - + @@ -119,17 +117,37 @@ Clicking here will remove this cylinder. - + - + Cylinder cannot be removed - + - + This gas in use. Only cylinders that are not used in the dive can be removed. - + + + + + psi + + + + + bar + + + + + l + + + + + cuft + @@ -154,35 +172,35 @@ DiveComputerModel - + Model דגם - + Device ID מזהה התקן - + Nickname כינוי - + Clicking here will remove this divecomputer. - + DiveItem - + l/min ליטר לדקה - + cuft/min רגל מעוקב לדקה @@ -207,32 +225,32 @@ collapse others - + remove dive(s) from trip - + create new trip above - + add dive(s) to trip immediately above - + merge trip with trip above - + merge trip with trip below - + @@ -257,7 +275,7 @@ shift times - + @@ -373,7 +391,7 @@ Please, remove them first. CC Set Point - + @@ -391,85 +409,85 @@ Please, remove them first. Dive Planner Points - + Available Gases - + add dive data point - + DiveTripModel - + # # - + date תאריך - + m מטר - + ft רגל - + min דקה - + kg קילוגרם - + lbs - lbs + ליברה - + suit חליפה - + cyl - + - + location מיקום - + SAC צריכת אוויר - + OTU OTU - + maxCNS - + @@ -482,7 +500,7 @@ Please, remove them first. Expected XML tag 'DiveDateReader', got instead '%1 - + @@ -609,7 +627,7 @@ Please, remove them first. Choose file for divecomputer download logfile - + @@ -617,24 +635,24 @@ Please, remove them first. קבצי יומן (*.log) - + Warning אזהרה - + Saving the libdivecomputer dump will NOT download dives to the dive list. - + - + Choose file for divecomputer binary dump file - + - + Dump files (*.bin) - + @@ -689,12 +707,12 @@ Please, remove them first. Save libdivecomputer logfile - + Save libdivecomputer dumpfile - + @@ -702,20 +720,20 @@ Please, remove them first. Edit Selected Dive Locations - + MainTab - + Dive Notes הערות צלילה - + Location מיקום @@ -771,7 +789,7 @@ Please, remove them first. - + Notes הערות @@ -902,13 +920,13 @@ Please, remove them first. הוסף מערכת משקולות - + Trip Location מיקום - - + + Trip Notes הערות @@ -923,51 +941,51 @@ Please, remove them first. בטל - + This trip is being edited. - + - + Multiple dives are being edited. צלילות מרובות בעריכה. - + This dive is being edited. צלילה זו בעריכה. - - - - - + + + + + /min לדקה - + unknown לא ידוע - + N צ - + S ד - + E מז - + W מע @@ -992,7 +1010,7 @@ Please, remove them first. &View - + @@ -1111,12 +1129,12 @@ Please, remove them first. Import from &dive computer - + Import &GPS data from Subsurface Service - + @@ -1126,7 +1144,7 @@ Please, remove them first. &Edit Device Names - + @@ -1146,7 +1164,7 @@ Please, remove them first. Toggle &Zoom - + @@ -1458,12 +1476,12 @@ Please, remove them first. Default Cylinder - + Use Default Cylinder - + @@ -1660,12 +1678,12 @@ Please, remove them first. Calculate NDL/TTS - + GFLow at max depth - + @@ -1859,12 +1877,12 @@ Please, remove them first. Add Gas Change - + Add Bookmark - + @@ -1925,12 +1943,12 @@ Please, remove them first. Measure properties of dive segments - + Scale your dive to screen size - + @@ -1967,7 +1985,7 @@ Please, remove them first. Bailing out to OC - + @@ -1985,74 +2003,74 @@ Please, remove them first. ProfilePrintModel - + unknown לא ידוע - + Dive #%1 - %2 צלילות מס %1 - %2 - + Max depth: %1 %2 עומק מקסימלי: %1 %2 - + Duration: %1 min זמן: %1 דקות - + Gas Used: אוויר שנוצל: - + SAC: צריכת אויר: - + Max. CNS: - + - + Weights: משקולות: - + Notes: הערות: - + Divemaster: מדריך צלילה: - + Buddy: בן זוג: - + Suit: חליפה: - + Viz: ראות: - + Rating: - + @@ -2065,7 +2083,7 @@ Please, remove them first. Remove this Point - + @@ -2111,17 +2129,17 @@ Please, remove them first. Shift selected times - + Shift times of selected dives by - + h:mm - + @@ -2144,7 +2162,7 @@ Please, remove them first. <span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</span> - + @@ -2211,17 +2229,17 @@ Please, remove them first. TankInfoModel - + Description תיאור - + ml - + - + bar bar @@ -2229,7 +2247,7 @@ Please, remove them first. ToolTipItem - + Information מידע נוסף @@ -2237,12 +2255,12 @@ Please, remove them first. WSInfoModel - + Description תיאור - + kg קילוגרם @@ -2298,97 +2316,117 @@ Please, remove them first. WeightModel - + Type סוג - + Weight משקל - + Clicking here will remove this weigthsystem. - + + + + + kg + + + + + lbs + + + + + ft + + + + + m + YearlyStatisticsModel - + Year > Month / Trip שנה > חודש / טיול - + # # - + Duration Total משך כולל - + Average ממוצע - + Shortest קצר ביותר - + Longest ארוך ביותר - + Depth (%1) Average עומק (%1) ממוצע - - - + + + Minimum מינימום - - - + + + Maximum מקסימום - + SAC (%1) Average צריכת אויר (%1) ממוצע - + Temp. (%1) Average טמפ' (%1) @@ -2506,13 +2544,13 @@ Maximum Failed to read '%s'. Use import for CSV files. - + Maximum number of supported columns on CSV import is %d - + @@ -2527,7 +2565,7 @@ Maximum rbt - + @@ -2557,7 +2595,7 @@ Maximum bookmark - + @@ -2604,7 +2642,7 @@ Maximum below floor event showing dive is below deco floor and adding deco time - + @@ -2654,17 +2692,17 @@ Maximum Unable to create parser for %s %s - + Error registering the data - + Error parsing the datetime - + @@ -2674,17 +2712,17 @@ Maximum Error parsing the divetime - + Error parsing the maxdepth - + Error parsing the gas mix count - + @@ -2694,93 +2732,93 @@ Maximum Error obtaining surface pressure - + Error parsing the gas mix - + Error parsing the samples - + - + Event: waiting for user action אירוע: מחכה לפעולה של המשתמש - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) דגם=%u (0x%08x), הקושחה=%u (0x%08x), מספר סידורי=%u (0x%08x) - + Error registering the event handler. - + - + Error registering the cancellation handler. - + - + Dive data import error שגיאת יבוא נתוני צלילה - + Unable to create libdivecomputer context - + - + Unable to open %s %s (%s) לא ניתן לפתוח את %s %s (%s) - + Strange percentage reading %s - + - - Failed to parse '%s'. + + Failed to parse '%s'. - + - + Failed to parse '%s' - + - + Database query get_events failed. שאילתת מסד נתונים של Get_events נכשל - - Database connection failed '%s'. + + Database connection failed '%s'. החיבור למסד הנתונים נכשל '%s'. - - Database query failed '%s'. + + Database query failed '%s'. שאילתת מסד נתונים נכשל '%s'. - + Can't open stylesheet %s לא ניתן לפתוח את גיליון העיצוב %s @@ -2798,7 +2836,7 @@ Maximum Too many gas mixes - + @@ -2807,19 +2845,19 @@ Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f - + Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s - + Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s - + @@ -2839,66 +2877,66 @@ based on GFlow = %.0f and GFhigh = %.0f %.0f%s of %s - + ean - + %s P:%d %s - + %s T:%.1f %s - + %s V:%.2f %s - + %s Calculated ceiling %.0f %s - + %s Tissue %.0fmin: %.0f %s - + %s Safetystop:%umin @ %.0f %s - + @:%d:%02d D:%.1f %s - + %s SAC:%2.1fl/min - + %s Safetystop:unkn time @ %.0f %s - + @@ -2925,37 +2963,37 @@ In deco %s NDL:%umin - + %s CNS:%u%% - + %s pO%s:%.2fbar - + %s pN%s:%.2fbar - + %s pHe:%.2fbar - + %s MOD:%d%s - + @@ -2972,43 +3010,43 @@ EADD:%d%s %s Deco:%umin @ %.0f %s (calc) - + %s In deco (calc) - + %s NDL:%umin (calc) - + %s TTS:%umin (calc) - + %sT: %d:%02d min - + %s %sD:%.1f%s - + %s %sD:%.1f%s - + @@ -3024,7 +3062,7 @@ TTS:%umin (calc) %s %sP:%d %s - + @@ -3091,7 +3129,7 @@ TTS:%umin (calc) wreck - + @@ -3161,12 +3199,12 @@ TTS:%umin (calc) %dd %dh %dmin - + %dh %dmin - + @@ -3298,20 +3336,20 @@ TTS:%umin (calc) Uemis Zurich: File System is almost full Disconnect/reconnect the dive computer and click 'Retry' - + Uemis Zurich: File System is full Disconnect/reconnect the dive computer and try again - + Short write to req.txt file Is the Uemis Zurich plugged in correctly? - + @@ -3331,17 +3369,17 @@ Is the Uemis Zurich plugged in correctly? divelog entry id - + divespot data id - + more data dive id - + @@ -3351,7 +3389,7 @@ Is the Uemis Zurich plugged in correctly? semidry - + @@ -3361,7 +3399,7 @@ Is the Uemis Zurich plugged in correctly? shorty - + @@ -3386,7 +3424,7 @@ Is the Uemis Zurich plugged in correctly? 2 pcs full suit - + @@ -3396,12 +3434,12 @@ Is the Uemis Zurich plugged in correctly? Init Communication - + Uemis init failed - + @@ -3411,7 +3449,7 @@ Is the Uemis Zurich plugged in correctly? Safety Stop Violation - + @@ -3426,22 +3464,22 @@ Is the Uemis Zurich plugged in correctly? PO2 Green Warning - + PO2 Ascend Warning - + PO2 Ascend Alarm - + Tank Pressure Info - + @@ -3456,37 +3494,37 @@ Is the Uemis Zurich plugged in correctly? Tank Change Suggested - + Depth Limit Exceeded - + Max Deco Time Warning - + Dive Time Info - + Dive Time Alert - + Marker - + No Tank Data - + @@ -3499,4 +3537,4 @@ Is the Uemis Zurich plugged in correctly? התראת סוללה חלשה - + \ No newline at end of file diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index 15b29152e..5be6c7df8 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -115,20 +115,40 @@ - + Clicking here will remove this cylinder. - + Cylinder cannot be removed - + This gas in use. Only cylinders that are not used in the dive can be removed. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -152,22 +172,22 @@ DiveComputerModel - + Model Model - + Device ID - + Nickname Naziv uređaja - + Clicking here will remove this divecomputer. @@ -175,12 +195,12 @@ DiveItem - + l/min - + cuft/min @@ -404,67 +424,67 @@ Please, remove them first. DiveTripModel - + # Br. - + date - + m m - + ft ft - + min min - + kg kg - + lbs lbs - + suit - + cyl - + location - + SAC SAC - + OTU OTU - + maxCNS maxCNS @@ -613,22 +633,22 @@ Please, remove them first. - + Warning - + Saving the libdivecomputer dump will NOT download dives to the dive list. - + Choose file for divecomputer binary dump file - + Dump files (*.bin) @@ -705,13 +725,13 @@ Please, remove them first. MainTab - + Dive Notes Bilješke - + Location Lokacija @@ -767,7 +787,7 @@ Please, remove them first. - + Notes Bilješke @@ -898,13 +918,13 @@ Please, remove them first. - + Trip Location - - + + Trip Notes @@ -919,51 +939,51 @@ Please, remove them first. - + This trip is being edited. - + Multiple dives are being edited. - + This dive is being edited. - - - - - + + + + + /min - + unknown nepoznato - + N N - + S S - + E E - + W W @@ -1981,72 +2001,72 @@ Please, remove them first. ProfilePrintModel - + unknown nepoznato - + Dive #%1 - %2 - + Max depth: %1 %2 - + Duration: %1 min - + Gas Used: - + SAC: - + Max. CNS: - + Weights: - + Notes: - + Divemaster: - + Buddy: - + Suit: - + Viz: - + Rating: @@ -2207,17 +2227,17 @@ Please, remove them first. TankInfoModel - + Description - + ml - + bar bar @@ -2225,7 +2245,7 @@ Please, remove them first. ToolTipItem - + Information @@ -2233,12 +2253,12 @@ Please, remove them first. WSInfoModel - + Description - + kg kg @@ -2294,88 +2314,108 @@ Please, remove them first. WeightModel - + Type Vrsta - + Weight Težina - + Clicking here will remove this weigthsystem. + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip - + # Br. - + Duration Total - + Average - + Shortest - + Longest - + Depth (%1) Average - - - + + + Minimum - - - + + + Maximum - + SAC (%1) Average - + Temp. (%1) Average @@ -2390,13 +2430,13 @@ Maximum - + bar bar - + psi psi @@ -2408,7 +2448,7 @@ Maximum - + cuft cuft @@ -2693,82 +2733,82 @@ Maximum Greška pri parsiranju uzoraka - + Event: waiting for user action Događaj: čekanje na korisničku akciju - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) - + Error registering the event handler. Greška pri registraciji event handlera. - + Error registering the cancellation handler. Greška pri registraciji cancellation handlera - + Dive data import error Greška pri uvozu podataka - + Unable to create libdivecomputer context Ne mogu kreirati libdivecomputer kontekst - + Unable to open %s %s (%s) Nije uspjelo otvaranje %s %s (%s) - + Strange percentage reading %s Neobično očitanje postotka %s - + Failed to parse '%s'. Nije uspjelo parsiranje '%s'. - + Failed to parse '%s' Nije uspjelo parsiranje '%s' - + Database query get_events failed. Neuspjeo get_events na bazi. - + Database connection failed '%s'. Neuspjelo spajanje na bazu '%s'. - + Database query failed '%s'. Neuspjeo upit na bazu '%s'. - + Can't open stylesheet %s @@ -3043,23 +3083,23 @@ TTS:%umin (calc) - + %1, %2 %3, %4 %5:%6 - + %1 %2, %3 %4:%5 - + %1 %2 (%3 dives) - + %1 %2 (1 dive) diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index 65fdc0097..524b9c505 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -115,20 +115,40 @@ - + Clicking here will remove this cylinder. - + Cylinder cannot be removed - + This gas in use. Only cylinders that are not used in the dive can be removed. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -152,22 +172,22 @@ DiveComputerModel - + Model Model - + Device ID ID Perangkat - + Nickname Nama Panggilan - + Clicking here will remove this divecomputer. @@ -175,12 +195,12 @@ DiveItem - + l/min I/min - + cuft/min cuft/min @@ -404,67 +424,67 @@ Please, remove them first. DiveTripModel - + # # - + date - + m m - + ft ft - + min menit - + kg kg - + lbs lbs - + suit - + cyl - + location - + SAC SAC - + OTU OTU - + maxCNS maxCNS @@ -613,22 +633,22 @@ Please, remove them first. - + Warning - + Saving the libdivecomputer dump will NOT download dives to the dive list. - + Choose file for divecomputer binary dump file - + Dump files (*.bin) @@ -705,13 +725,13 @@ Please, remove them first. MainTab - + Dive Notes Catatan Selam - + Location Lokasi @@ -767,7 +787,7 @@ Please, remove them first. - + Notes Catatan @@ -898,13 +918,13 @@ Please, remove them first. Tambah Sistem Berat - + Trip Location Lokasi Perjalanan - - + + Trip Notes Catatan Perjalanan @@ -919,51 +939,51 @@ Please, remove them first. Batal - + This trip is being edited. - + Multiple dives are being edited. - + This dive is being edited. - - - - - + + + + + /min /menit - + unknown Tak dikenal - + N U - + S S - + E T - + W B @@ -1981,72 +2001,72 @@ Please, remove them first. ProfilePrintModel - + unknown Tak dikenal - + Dive #%1 - %2 Selam #%1 - %2 - + Max depth: %1 %2 Kedalaman Maks: 1% 2% - + Duration: %1 min Durasi: %1 menit - + Gas Used: - + SAC: - + Max. CNS: - + Weights: - + Notes: - + Divemaster: - + Buddy: - + Suit: - + Viz: - + Rating: @@ -2207,17 +2227,17 @@ Please, remove them first. TankInfoModel - + Description Penjelasan - + ml - + bar bar @@ -2225,7 +2245,7 @@ Please, remove them first. ToolTipItem - + Information Informasi @@ -2233,12 +2253,12 @@ Please, remove them first. WSInfoModel - + Description Penjelasan - + kg kgkg @@ -2294,95 +2314,115 @@ Please, remove them first. WeightModel - + Type Tipe - + Weight Berat - + Clicking here will remove this weigthsystem. + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip - + # # - + Duration Total Total Durasi - + Average Rata-rata - + Shortest Terpendek - + Longest Terjauh - + Depth (%1) Average Dalam (%1) Rata-rata - - - + + + Minimum Minimal - - - + + + Maximum Maksimal - + SAC (%1) Average SAC (%1) Rata-rata - + Temp. (%1) Average Temp. (%1) @@ -2398,13 +2438,13 @@ Rata-rata - + bar bar - + psi psi @@ -2416,7 +2456,7 @@ Rata-rata - + cuft cuft @@ -2701,77 +2741,77 @@ Rata-rata - + Event: waiting for user action - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) - + Error registering the event handler. - + Error registering the cancellation handler. - + Dive data import error - + Unable to create libdivecomputer context - + Unable to open %s %s (%s) - + Strange percentage reading %s - + Failed to parse '%s'. - + Failed to parse '%s' - + Database query get_events failed. - + Database connection failed '%s'. - + Database query failed '%s'. - + Can't open stylesheet %s @@ -3020,23 +3060,23 @@ TTS:%umin (calc) - + %1, %2 %3, %4 %5:%6 - + %1 %2, %3 %4:%5 - + %1 %2 (%3 dives) - + %1 %2 (1 dive) diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index a5c1d15ef..36e9877f3 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -56,7 +54,7 @@ Stopdepth - + @@ -71,7 +69,7 @@ CSV Files (*.csv);;All Files(*) - + @@ -89,22 +87,22 @@ WorkPress - + StartPress - + EndPress - + Switch at - + @@ -114,7 +112,7 @@ O - + @@ -122,15 +120,35 @@ Facendo click qui si rimuove la bombola. - + Cylinder cannot be removed La bombola non può essere rimossa - + This gas in use. Only cylinders that are not used in the dive can be removed. Questo gas è in uso. Solo le bombole che non sono usate nell'immersione possono essere rimosse. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -155,22 +173,22 @@ il computer seleizonato? DiveComputerModel - + Model Modello - + Device ID ID della periferica - + Nickname Nickname - + Clicking here will remove this divecomputer. Facendo click qui si rimuove questo computer. @@ -178,12 +196,12 @@ il computer seleizonato? DiveItem - + l/min l/min - + cuft/min piedi cubi/min @@ -208,7 +226,7 @@ il computer seleizonato? collapse others - + @@ -243,7 +261,7 @@ il computer seleizonato? mark dive(s) invalid - + @@ -258,12 +276,12 @@ il computer seleizonato? shift times - + upload dive(s) to divelogs.de - + @@ -321,7 +339,7 @@ il computer seleizonato? ATM Pressure - + @@ -402,73 +420,73 @@ Per favore, rimuovile prima. add dive data point - + DiveTripModel - + # # - + date data - + m m - + ft ft - + min min - + kg kg - + lbs lbs - + suit muta - + cyl - + - + location Luogo - + SAC CAS - + OTU OTU - + maxCNS max CNS @@ -478,114 +496,114 @@ Per favore, rimuovile prima. Invalid response from server - + Expected XML tag 'DiveDateReader', got instead '%1 - + Expected XML tag 'DiveDates' not found - + Malformed XML response. Line %1: %2 - + no dives were selected - + failed to create zip file for upload: %1 - + cannot create temporary file: %1 - + internal error: %1 - + internal error - + Done - + Uploading dive list... - + Downloading dive list... - + Downloading %1 dives... - + Download finished - %1 - + Corrupted download - + The archive could not be opened: %1 - + Upload failed - + Upload successful - + Login failed - + Cannot parse response - + Error: %1 - + Upload finished - + @@ -609,32 +627,32 @@ Per favore, rimuovile prima. Choose file for divecomputer download logfile - + Log files (*.log) - + - + Warning Avviso - + Saving the libdivecomputer dump will NOT download dives to the dive list. - + - + Choose file for divecomputer binary dump file - + - + Dump files (*.bin) - + @@ -657,7 +675,7 @@ Per favore, rimuovile prima. Device or Mount Point - + @@ -689,12 +707,12 @@ Per favore, rimuovile prima. Save libdivecomputer logfile - + Save libdivecomputer dumpfile - + @@ -709,13 +727,13 @@ Per favore, rimuovile prima. MainTab - + Dive Notes Note dell'immersione - + Location Luogo @@ -771,7 +789,7 @@ Per favore, rimuovile prima. - + Notes Note @@ -902,13 +920,13 @@ Per favore, rimuovile prima. Aggiungi un tipo di pesi - + Trip Location Luogo del viaggio - - + + Trip Notes Note di viaggio @@ -923,51 +941,51 @@ Per favore, rimuovile prima. Annulla - + This trip is being edited. Questo viaggio è stato editato. - + Multiple dives are being edited. Si stanno modificando immersioni multiple. - + This dive is being edited. Si sta modificando questa immersione - - - - - + + + + + /min /min - + unknown sconosciuto - + N N - + S S - + E E - + W W @@ -1146,7 +1164,7 @@ Per favore, rimuovile prima. Toggle &Zoom - + @@ -1318,17 +1336,17 @@ Per favore, rimuovile prima. Please save or cancel the current dive edit before closing the file. - + Please save or cancel the current dive edit before trying to plan a dive. - + Please save or cancel the current dive edit before trying to add a dive. - + @@ -1363,7 +1381,7 @@ Per favore, rimuovile prima. First finish the current edition before trying to do another. - + @@ -1385,7 +1403,7 @@ Per favore, rimuovile prima. Please save or cancel the current dive edit before opening a new file. - + @@ -1418,7 +1436,7 @@ Per favore, rimuovile prima. Language - + @@ -1493,12 +1511,12 @@ Per favore, rimuovile prima. meter - + feet - + @@ -1513,22 +1531,22 @@ Per favore, rimuovile prima. liter - + cu ft - + celsius - + fahrenheit - + @@ -1538,17 +1556,17 @@ Per favore, rimuovile prima. pO₂ - + pN₂ - + System Default - + @@ -1625,7 +1643,7 @@ Per favore, rimuovile prima. max ppO₂ - + @@ -1640,7 +1658,7 @@ Per favore, rimuovile prima. draw ceiling red - + @@ -1695,12 +1713,12 @@ Per favore, rimuovile prima. Restart required - + To correctly load a new language you must restart Subsurface. - + @@ -1718,17 +1736,17 @@ Per favore, rimuovile prima. &Preview - + P&rint - + &Close - + @@ -1829,22 +1847,22 @@ Per favore, rimuovile prima. Sizing heights (% of layout) - + Profile height (43% - 85%) - + Other data height (8% - 17%) - + Notes height (0% - 52%) - + @@ -1879,7 +1897,7 @@ Per favore, rimuovile prima. Unhide all events - + @@ -1925,7 +1943,7 @@ Per favore, rimuovile prima. Measure properties of dive segments - + @@ -1940,7 +1958,7 @@ Per favore, rimuovile prima. pN - + @@ -1950,7 +1968,7 @@ Per favore, rimuovile prima. pO - + @@ -1985,72 +2003,72 @@ Per favore, rimuovile prima. ProfilePrintModel - + unknown sconosciuto - + Dive #%1 - %2 Immersione #%1 - %2 - + Max depth: %1 %2 Massima profondità: %1 %2 - + Duration: %1 min Durata: %1 min - + Gas Used: Miscela usata: - + SAC: CAS: - + Max. CNS: Max. CNS: - + Weights: Pesi: - + Notes: Note: - + Divemaster: Divemaster: - + Buddy: Compagno: - + Suit: Muta: - + Viz: - + - + Rating: Valutazione: @@ -2090,7 +2108,7 @@ Per favore, rimuovile prima. Move the map and double-click to set the dive location - + @@ -2111,12 +2129,12 @@ Per favore, rimuovile prima. Shift selected times - + Shift times of selected dives by - + @@ -2172,12 +2190,12 @@ Per favore, rimuovile prima. Download finished - + Download error: %1 - + @@ -2211,17 +2229,17 @@ Per favore, rimuovile prima. TankInfoModel - + Description Descrizione - + ml ml - + bar bar @@ -2229,7 +2247,7 @@ Per favore, rimuovile prima. ToolTipItem - + Information Informazione @@ -2237,12 +2255,12 @@ Per favore, rimuovile prima. WSInfoModel - + Description Descrizione - + kg kg @@ -2252,7 +2270,7 @@ Per favore, rimuovile prima. Webservice Connection - + @@ -2287,108 +2305,128 @@ Per favore, rimuovile prima. Operation timed out - + Transfering data... - + WeightModel - + Type Tipo - + Weight Peso - + Clicking here will remove this weigthsystem. Facendo click qui si rimuove il sistema di pesi. + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip Anno > Mese / Viaggio - + # # - + Duration Total Durata Totale - + Average Media - + Shortest Più corta - + Longest Più lunga - + Depth (%1) Average Profondità (%1) Media - - - + + + Minimum Minimo - - - + + + Maximum Massimo - + SAC (%1) Average SAC (%1) Media - + Temp. (%1) Average Temp. (%1) @@ -2707,42 +2745,42 @@ Media Errore analizzando i campioni - + Event: waiting for user action Evento: in attesa dell' azione dell'utente. - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) modello=%u (0x%08x), firmware=%u (0x%08x), numero di serie=%u (0x%08x) - + Error registering the event handler. Errore registrando il gestore degli eventi. - + Error registering the cancellation handler. Errore registrando il gestore della cancellazione. - + Dive data import error Errore importazione dati immersione - + Unable to create libdivecomputer context Impossibile creare un contesto libdivecomputer - + Unable to open %s %s (%s) Impossibile aprire %s %s (%s) - + Strange percentage reading %s Lettura di strane percentuali %s @@ -2750,42 +2788,42 @@ Media - - Failed to parse '%s'. + + Failed to parse '%s'. Impossibile analizzare '%s'. - + Failed to parse '%s' Impossibile analizzare '%s' - + Database query get_events failed. Interrogazione get_events fallita. - - Database connection failed '%s'. + + Database connection failed '%s'. Connessione al database fallita '%s'. - - Database query failed '%s'. + + Database query failed '%s'. Interrogazione al database fallita '%s'. - + Can't open stylesheet %s - + @@ -2873,7 +2911,7 @@ T:%.1f %s %s V:%.2f %s - + @@ -2886,7 +2924,7 @@ Calcolo ceiling %.0f %s %s Tissue %.0fmin: %.0f %s - + @@ -2898,13 +2936,13 @@ Safetystop:%umin @ %.0f %s @:%d:%02d D:%.1f %s - + %s SAC:%2.1fl/min - + @@ -2981,7 +3019,7 @@ EADD:%d%s %s Deco:%umin @ %.0f %s (calc) - + @@ -3007,36 +3045,36 @@ TTS:%umin (calc) %sT: %d:%02d min - + %s %sD:%.1f%s - + %s %sD:%.1f%s - + %s%sV:%.2f%s - + %s %sV:%.2f%s - + %s %sP:%d %s - + @@ -3051,7 +3089,7 @@ TTS:%umin (calc) %1, %2 %3, %4 %5:%6 - + @@ -3516,4 +3554,4 @@ Lo Uemis Zurich e' collegato correttamente? Allarme: Batteria scarica - + \ No newline at end of file diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 5db831792..ed8f18825 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -71,7 +69,7 @@ CSV Files (*.csv);;All Files(*) - + @@ -122,15 +120,35 @@ Klikk her for å fjerne denne flaska. - + Cylinder cannot be removed Flaska kan ikke fjernes - + This gas in use. Only cylinders that are not used in the dive can be removed. Denne gassen er i bruk. Du kan bare fjerne flasker som ikke er i bruk. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -154,22 +172,22 @@ DiveComputerModel - + Model Modell - + Device ID Enhets-ID - + Nickname Navn - + Clicking here will remove this divecomputer. Klikk her for å fjerne denne computeren. @@ -177,12 +195,12 @@ DiveItem - + l/min l/min - + cuft/min ft³/min @@ -407,67 +425,67 @@ Fjern dem før du gjør dette. DiveTripModel - + # # - + date dato - + m m - + ft ft - + min min - + kg kg - + lbs pund - + suit drakt - + cyl flaske - + location sted - + SAC SAC - + OTU OTU - + maxCNS maks CNS @@ -497,27 +515,27 @@ Fjern dem før du gjør dette. no dives were selected - + failed to create zip file for upload: %1 - + cannot create temporary file: %1 - + internal error: %1 - + internal error - + @@ -609,32 +627,32 @@ Fjern dem før du gjør dette. Choose file for divecomputer download logfile - + Log files (*.log) - + - + Warning Advarsel - + Saving the libdivecomputer dump will NOT download dives to the dive list. - + - + Choose file for divecomputer binary dump file - + - + Dump files (*.bin) - + @@ -689,12 +707,12 @@ Fjern dem før du gjør dette. Save libdivecomputer logfile - + Save libdivecomputer dumpfile - + @@ -709,13 +727,13 @@ Fjern dem før du gjør dette. MainTab - + Dive Notes Dykk - + Location Sted @@ -771,7 +789,7 @@ Fjern dem før du gjør dette. - + Notes Notater @@ -902,13 +920,13 @@ Fjern dem før du gjør dette. Legg til vektsystem - + Trip Location Tursted - - + + Trip Notes Turnotater @@ -923,51 +941,51 @@ Fjern dem før du gjør dette. Avbryt - + This trip is being edited. Denne turen redigeres. - + Multiple dives are being edited. Flere dykk redigeres. - + This dive is being edited. Dette dykket redigeres. - - - - - + + + + + /min /min - + unknown ukjent - + N N - + S S - + E Ø - + W V @@ -1879,7 +1897,7 @@ Fjern dem før du gjør dette. Unhide all events - + @@ -1985,72 +2003,72 @@ Fjern dem før du gjør dette. ProfilePrintModel - + unknown ukjent - + Dive #%1 - %2 Dykk nr. %1- %2 - + Max depth: %1 %2 Max dybde: %1 %2 - + Duration: %1 min Varighet: %1 min - + Gas Used: Gass brukt: - + SAC: SAC: - + Max. CNS: Mac. CNS: - + Weights: Vekter: - + Notes: Notater: - + Divemaster: Dykkeleder: - + Buddy: Buddy: - + Suit: Drakt: - + Viz: Sikt: - + Rating: Vurdering: @@ -2211,17 +2229,17 @@ Fjern dem før du gjør dette. TankInfoModel - + Description Beskrivelse - + ml ml - + bar bar @@ -2229,7 +2247,7 @@ Fjern dem før du gjør dette. ToolTipItem - + Information Informasjon @@ -2237,12 +2255,12 @@ Fjern dem før du gjør dette. WSInfoModel - + Description Beskrivelse - + kg kg @@ -2298,97 +2316,117 @@ Fjern dem før du gjør dette. WeightModel - + Type Type - + Weight Vekt - + Clicking here will remove this weigthsystem. Klikk her for å fjerne dette vektsystemet + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip År > Måned / Tur - + # # - + Duration Total Varighet Total - + Average Snitt - + Shortest Kortest - + Longest Lengst - + Depth (%1) Average Dybde (%1) Snitt - - - + + + Minimum Minimum - - - + + + Maximum Maksimum - + SAC (%1) Average SAC (%1) Snitt - + Temp. (%1) Average Temp. (%1) @@ -2707,84 +2745,84 @@ Snitt Feil ved lesing av detaljer - + Event: waiting for user action Hendelse: Venter på bruker - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x) - + Error registering the event handler. Feil ved registrering av hendelseshåndterer. - + Error registering the cancellation handler. Feil ved registrering av avbruddshåndterer. - + Dive data import error Feil ved import av dykkedata - + Unable to create libdivecomputer context Kunne ikke opprette kontekst for libdivecomputer - + Unable to open %s %s (%s) Fikk ikke åpnet %s %s (%s) - + Strange percentage reading %s Rar lesing av prosent %s - - Failed to parse '%s'. + + Failed to parse '%s'. Kunne ikke lese '%s'. - + Failed to parse '%s' Kunne ikke lese '%s' - + Database query get_events failed. Databasespørring get_events feilet. - - Database connection failed '%s'. + + Database connection failed '%s'. Databaseforbindelse feilet '%s'. - - Database query failed '%s'. + + Database query failed '%s'. Databasespørring feilet '%s'. - + Can't open stylesheet %s - + @@ -3533,4 +3571,4 @@ Er Uemis Zurich plugget i ordentlig? Alarm: dårlig batteri - + \ No newline at end of file diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index d39cff705..04fe05b9a 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -122,15 +120,35 @@ Klik hier om de fles te verwijderen. - + Cylinder cannot be removed Fles kan niet verwijderd worden - + This gas in use. Only cylinders that are not used in the dive can be removed. Dit gas wordt gebruikt. Enkel flessen die niet gebruikt worden kunnen verwijderd worden. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -155,22 +173,22 @@ duikcomputer wilt verwijderen? DiveComputerModel - + Model Model - + Device ID Toestel ID - + Nickname Apparaatnaam - + Clicking here will remove this divecomputer. Klik hier om deze duikcomputer te verwijderen. @@ -178,12 +196,12 @@ duikcomputer wilt verwijderen? DiveItem - + l/min l/min - + cuft/min cuft/min @@ -408,67 +426,67 @@ Verwijder deze eerst. DiveTripModel - + # Nr. - + date datum - + m m - + ft ft - + min min - + kg kg - + lbs US pond - + suit duikpak - + cyl fles - + location locatie - + SAC Gasverbruik - + OTU OTU - + maxCNS max. CNS @@ -618,22 +636,22 @@ Verwijder deze eerst. Log bestanden (*.log) - + Warning Waarschuwing - + Saving the libdivecomputer dump will NOT download dives to the dive list. Duiken worden NIET in de duiklijst geladen als u de libdivecomputer dump opslaat. - + Choose file for divecomputer binary dump file Kies een bestand voor de duikcomputer binaire dump - + Dump files (*.bin) Dump bestanden (*.bin) @@ -710,13 +728,13 @@ Verwijder deze eerst. MainTab - + Dive Notes Duiknotities - + Location Locatie @@ -772,7 +790,7 @@ Verwijder deze eerst. - + Notes Notities @@ -903,13 +921,13 @@ Verwijder deze eerst. Gewichtssysteem toevoegen - + Trip Location Trip locatie - - + + Trip Notes Trip Nota's @@ -924,51 +942,51 @@ Verwijder deze eerst. Annuleren - + This trip is being edited. Deze trip wordt bewerkt. - + Multiple dives are being edited. Meerdere duiken worden bewerkt. - + This dive is being edited. Deze duik wordt bewerkt. - - - - - + + + + + /min /min - + unknown onbekend - + N N - + S Z - + E O - + W W @@ -1986,72 +2004,72 @@ Verwijder deze eerst. ProfilePrintModel - + unknown onbekend - + Dive #%1 - %2 Duik #%1 - %2 - + Max depth: %1 %2 Max diepte: %1 %2 - + Duration: %1 min Duur: %1 min - + Gas Used: Verbruikt gas: - + SAC: Gasverbruik: - + Max. CNS: Max. CNS: - + Weights: Gewichten: - + Notes: Nota's: - + Divemaster: Divemaster: - + Buddy: Buddy: - + Suit: Duikpak: - + Viz: Zichtbaarheid: - + Rating: Beoordeling: @@ -2212,17 +2230,17 @@ Verwijder deze eerst. TankInfoModel - + Description Beschrijving - + ml ml - + bar bar @@ -2230,7 +2248,7 @@ Verwijder deze eerst. ToolTipItem - + Information Informatie @@ -2238,12 +2256,12 @@ Verwijder deze eerst. WSInfoModel - + Description Beschrijving - + kg kg @@ -2299,97 +2317,117 @@ Verwijder deze eerst. WeightModel - + Type Type - + Weight Gewicht - + Clicking here will remove this weigthsystem. Hier klikken om het gewichtssysteem te verwijderen + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip Jaar > Maand / Trip - + # Nr. - + Duration Total Duur Totaal - + Average Gemiddeld - + Shortest Kortste - + Longest Langste - + Depth (%1) Average Diepte (%1) Gemiddeld - - - + + + Minimum Minimum - - - + + + Maximum Maximum - + SAC (%1) Average Gasverbruik (%1) Gemiddeld - + Temp. (%1) Average Temp. (%1) @@ -2708,82 +2746,82 @@ Maximum Fout bij het verwerken van de samples - + Event: waiting for user action Event: wachten op handeling van gebruiker - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x) - + Error registering the event handler. Fout bij het registreren van de event handler. - + Error registering the cancellation handler. Fout bij het registreren van de cancellation handler. - + Dive data import error Fout bij importeren van duikdata - + Unable to create libdivecomputer context Kan geen context creëren voor libdivecomputer - + Unable to open %s %s (%s) Fout bij openen van %s %s (%s) - + Strange percentage reading %s Vreemde percentage %s - - Failed to parse '%s'. + + Failed to parse '%s'. Fout bij analyseren van '%s'. - + Failed to parse '%s' Fout bij analyse van '%s' - + Database query get_events failed. Database-query get_events mislukt. - - Database connection failed '%s'. + + Database connection failed '%s'. Databaseconnectie is mislukt '%s'. - - Database query failed '%s'. + + Database query failed '%s'. Database-query mislukt: '%s' - + Can't open stylesheet %s Kan de stylesheet %s niet openen @@ -3534,4 +3572,4 @@ Is de Uemis Zurich correkt aangesloten? Alarm: Lege batterij - + \ No newline at end of file diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index 28cae8181..4fa770815 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -122,15 +120,35 @@ Kliknięcie tu usunie butlę z listy. - + Cylinder cannot be removed Butla nie może być usunięta. - + This gas in use. Only cylinders that are not used in the dive can be removed. Ten gaz jest używany. Można usuwać tylko butle, których nie używasz. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -155,22 +173,22 @@ wybrany komputer nurkowy? DiveComputerModel - + Model Model - + Device ID ID urządzenia - + Nickname Nazwa - + Clicking here will remove this divecomputer. Kliknięcie tu usunie komputer nurkowy. @@ -178,12 +196,12 @@ wybrany komputer nurkowy? DiveItem - + l/min l/min - + cuft/min cuft/min @@ -408,67 +426,67 @@ poza zakresem. Proszę je najpierw usunąć. DiveTripModel - + # # - + date data - + m m - + ft ft - + min min - + kg kg - + lbs lbs - + suit skafander - + cyl butla - + location miejsce - + SAC SAC - + OTU OTU - + maxCNS maxCNS @@ -618,22 +636,22 @@ poza zakresem. Proszę je najpierw usunąć. Pliki logów (*.log) - + Warning Ostrzeżenie - + Saving the libdivecomputer dump will NOT download dives to the dive list. Użycie libdivecomputer w trybie diagnostycznym spowoduje, że pobrane nurkowania NIE ZOSTANĄ dodane do listy nurkowań. - + Choose file for divecomputer binary dump file Wybierz plik do którego zapisane zostaną dane binarne - + Dump files (*.bin) Pliki binarne (*.bin) @@ -710,13 +728,13 @@ poza zakresem. Proszę je najpierw usunąć. MainTab - + Dive Notes Opis nurkowania - + Location Miejsce @@ -772,7 +790,7 @@ poza zakresem. Proszę je najpierw usunąć. - + Notes Opis @@ -903,13 +921,13 @@ poza zakresem. Proszę je najpierw usunąć. Dodaj balast - + Trip Location Miejsce nurkowań - - + + Trip Notes Opis nurkowań @@ -924,51 +942,51 @@ poza zakresem. Proszę je najpierw usunąć. Anuluj - + This trip is being edited. Ta grupa nurkowań jest obecnie edytowana. - + Multiple dives are being edited. Kilka nurkowań jest obecnie edytowanych. - + This dive is being edited. To nurkowanie jest obecnie edytowane. - - - - - + + + + + /min /min - + unknown nieznana - + N N - + S S - + E E - + W W @@ -1986,72 +2004,72 @@ poza zakresem. Proszę je najpierw usunąć. ProfilePrintModel - + unknown nieznana - + Dive #%1 - %2 Nurkownie #%1 - %2 - + Max depth: %1 %2 Max głębokość: %1 %2 - + Duration: %1 min Czas: %1 min - + Gas Used: Użyty gaz: - + SAC: SAC: - + Max. CNS: Max CNS: - + Weights: Balast: - + Notes: Opis: - + Divemaster: Divemaster: - + Buddy: Partner: - + Suit: Skafander: - + Viz: Widzialność: - + Rating: Ocena: @@ -2212,17 +2230,17 @@ poza zakresem. Proszę je najpierw usunąć. TankInfoModel - + Description Opis - + ml ml - + bar bar @@ -2230,7 +2248,7 @@ poza zakresem. Proszę je najpierw usunąć. ToolTipItem - + Information Informacje @@ -2238,12 +2256,12 @@ poza zakresem. Proszę je najpierw usunąć. WSInfoModel - + Description Opis - + kg kg @@ -2299,92 +2317,112 @@ poza zakresem. Proszę je najpierw usunąć. WeightModel - + Type Rodzaj - + Weight Balast - + Clicking here will remove this weigthsystem. Kliknięcie tu usunie ten balast z listy. + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip Rok > Miesiąc / grupa - + # # - + Duration Total Czas trwania całkowity - + Average średni - + Shortest najkrótszy - + Longest najdłuższy - + Depth (%1) Average Głębokość (%1) średnia - - - + + + Minimum minimalna - - - + + + Maximum maksymalna - + SAC (%1) Average SAC (%1) średni - + Temp. (%1) Average Temperatura (%1) @@ -2703,82 +2741,82 @@ Maximum Błąd podczas przetwarzania próbek - + Event: waiting for user action Oczekiwanie na działanie użytkownika - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) model=%u (0x%08x), firmware=%u (0x%08x), numer seryjny=%u (0x%08x) - + Error registering the event handler. Błąd rejestracji uchwytu (event handler) - + Error registering the cancellation handler. Błąd rejestracji uchwytu (cancellation handler) - + Dive data import error Błąd podczas importowania danych - + Unable to create libdivecomputer context Nie można utworzyć kontekstu libdivecomputer - + Unable to open %s %s (%s) Nie udało się otworzyć %s %s (%s) - + Strange percentage reading %s Podejrzany skład procentowy %s - - Failed to parse '%s'. + + Failed to parse '%s'. Nie udało się przetworzyć '%s'. - + Failed to parse '%s' Nie udało się przetworzyć '%s' - + Database query get_events failed. Zapytanie bazy danych get_events nie powiodło się.⏎ - - Database connection failed '%s'. + + Database connection failed '%s'. Błąd połączenia z bazą danych '%s'.⏎ - - Database query failed '%s'. + + Database query failed '%s'. Błąd komunikacji z bazą danych '%s'. - + Can't open stylesheet %s Nie można otworzyć arkusza stylów %s @@ -3529,4 +3567,4 @@ Czy Uemis Zurich jest podłączony poprawnie? Alarm: niski poziom baterii - + \ No newline at end of file diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index 986b16a80..2e78e1929 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -71,7 +69,7 @@ CSV Files (*.csv);;All Files(*) - + @@ -114,7 +112,7 @@ O - + @@ -122,15 +120,35 @@ Ao clicar aqui irá eliminar esta garrafa. - + Cylinder cannot be removed A garrafa não pode ser eliminada - + This gas in use. Only cylinders that are not used in the dive can be removed. A mistura está a ser usada. Apenas pode remover as garrafas não usadas durante o mergulho. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -155,22 +173,22 @@ remover o computador de mergulho seleccionado? DiveComputerModel - + Model Modelo - + Device ID ID do dispositivo - + Nickname Apelido - + Clicking here will remove this divecomputer. Ao clicar aqui irá remover este computador de mergulho. @@ -178,12 +196,12 @@ remover o computador de mergulho seleccionado? DiveItem - + l/min l/min - + cuft/min pés cúbicos/min @@ -243,7 +261,7 @@ remover o computador de mergulho seleccionado? mark dive(s) invalid - + @@ -263,7 +281,7 @@ remover o computador de mergulho seleccionado? upload dive(s) to divelogs.de - + @@ -408,67 +426,67 @@ Por favor, remova-os primeiro DiveTripModel - + # # - + date data - + m m - + ft ft - + min min - + kg kg - + lbs lbs - + suit fato - + cyl garrafa - + location local - + SAC Consumo - + OTU OTU - + maxCNS CNS máx @@ -478,114 +496,114 @@ Por favor, remova-os primeiro Invalid response from server - + Expected XML tag 'DiveDateReader', got instead '%1 - + Expected XML tag 'DiveDates' not found - + Malformed XML response. Line %1: %2 - + no dives were selected - + failed to create zip file for upload: %1 - + cannot create temporary file: %1 - + internal error: %1 - + internal error - + Done - + Uploading dive list... - + Downloading dive list... - + Downloading %1 dives... - + Download finished - %1 - + Corrupted download - + The archive could not be opened: %1 - + Upload failed - + Upload successful - + Login failed - + Cannot parse response - + Error: %1 - + Upload finished - + @@ -609,32 +627,32 @@ Por favor, remova-os primeiro Choose file for divecomputer download logfile - + Log files (*.log) - + - + Warning Aviso - + Saving the libdivecomputer dump will NOT download dives to the dive list. - + - + Choose file for divecomputer binary dump file - + - + Dump files (*.bin) - + @@ -689,12 +707,12 @@ Por favor, remova-os primeiro Save libdivecomputer logfile - + Save libdivecomputer dumpfile - + @@ -709,13 +727,13 @@ Por favor, remova-os primeiro MainTab - + Dive Notes Notas do mergulho - + Location Local @@ -771,7 +789,7 @@ Por favor, remova-os primeiro - + Notes Notas @@ -902,13 +920,13 @@ Por favor, remova-os primeiro Adicionar sistema de lastro - + Trip Location Local da viagem - - + + Trip Notes Notas sobre a viagem @@ -923,51 +941,51 @@ Por favor, remova-os primeiro Cancelar - + This trip is being edited. Esta viagem está a ser editada. - + Multiple dives are being edited. Estão a ser editados vários mergulhos. - + This dive is being edited. Este mergulho está a ser editado. - - - - - + + + + + /min /min - + unknown desconhecido - + N N - + S S - + E L - + W O @@ -1333,7 +1351,7 @@ Por favor, remova-os primeiro User Manual - + @@ -1418,7 +1436,7 @@ Por favor, remova-os primeiro Language - + @@ -1493,12 +1511,12 @@ Por favor, remova-os primeiro meter - + feet - + @@ -1513,22 +1531,22 @@ Por favor, remova-os primeiro liter - + cu ft - + celsius - + fahrenheit - + @@ -1538,17 +1556,17 @@ Por favor, remova-os primeiro pO₂ - + pN₂ - + System Default - + @@ -1625,7 +1643,7 @@ Por favor, remova-os primeiro max ppO₂ - + @@ -1695,12 +1713,12 @@ Por favor, remova-os primeiro Restart required - + To correctly load a new language you must restart Subsurface. - + @@ -1718,17 +1736,17 @@ Por favor, remova-os primeiro &Preview - + P&rint - + &Close - + @@ -1879,7 +1897,7 @@ Por favor, remova-os primeiro Unhide all events - + @@ -1940,7 +1958,7 @@ Por favor, remova-os primeiro pN - + @@ -1950,7 +1968,7 @@ Por favor, remova-os primeiro pO - + @@ -1985,72 +2003,72 @@ Por favor, remova-os primeiro ProfilePrintModel - + unknown desconhecido - + Dive #%1 - %2 Mergulho #%1 - %2 - + Max depth: %1 %2 Profundidade máxima: %1 %2 - + Duration: %1 min Duração: %1 min - + Gas Used: Gás usado: - + SAC: Consumo: - + Max. CNS: CNS máximo: - + Weights: Lastro: - + Notes: Notas: - + Divemaster: Guia: - + Buddy: Companheiro: - + Suit: Fato: - + Viz: Visibilidade: - + Rating: Classificação: @@ -2090,7 +2108,7 @@ Por favor, remova-os primeiro Move the map and double-click to set the dive location - + @@ -2172,12 +2190,12 @@ Por favor, remova-os primeiro Download finished - + Download error: %1 - + @@ -2211,17 +2229,17 @@ Por favor, remova-os primeiro TankInfoModel - + Description Descrição - + ml ml - + bar bar @@ -2229,7 +2247,7 @@ Por favor, remova-os primeiro ToolTipItem - + Information Informação @@ -2237,12 +2255,12 @@ Por favor, remova-os primeiro WSInfoModel - + Description Descrição - + kg kg @@ -2252,7 +2270,7 @@ Por favor, remova-os primeiro Webservice Connection - + @@ -2287,108 +2305,128 @@ Por favor, remova-os primeiro Operation timed out - + Transfering data... - + WeightModel - + Type Tipo - + Weight Peso - + Clicking here will remove this weigthsystem. Ao clicar aqui irá remover este sistema de lastro + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip Ano >Mês / Viagem - + # # - + Duration Total Duração Total - + Average Média - + Shortest Mais curto - + Longest Mais longo - + Depth (%1) Average Profundidade (%1) Média - - - + + + Minimum Mínimo - - - + + + Maximum Máximo - + SAC (%1) Average Consumo (%1) Médio - + Temp. (%1) Average Temp. (%1) @@ -2707,42 +2745,42 @@ Médio Erro na análise das amostras - + Event: waiting for user action Evento: à espera de acção do utilizador - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x) - + Error registering the event handler. Erro no registo do "event handler". - + Error registering the cancellation handler. Erro no registo do "cancellation handler". - + Dive data import error Erro a importar os dados do mergulho - + Unable to create libdivecomputer context Não é possivel criar contexto do libdivecomputer - + Unable to open %s %s (%s) Não se consegue abrir %s %s (%s) - + Strange percentage reading %s Leitura estranha das percentagens %s @@ -2750,42 +2788,42 @@ Médio - - Failed to parse '%s'. + + Failed to parse '%s'. Falha na análise de '%s'. - + Failed to parse '%s' Falha na análise de '%s' - + Database query get_events failed. A consulta "obter eventos" falhou. - - Database connection failed '%s'. + + Database connection failed '%s'. Falha na ligação à base de dados '%s' - - Database query failed '%s'. + + Database query failed '%s'. A consulta da base de dados falhou '%s'. - + Can't open stylesheet %s - + @@ -3534,4 +3572,4 @@ O Uemis Zurich está bem ligado? Alerta de nível de bateria - + \ No newline at end of file diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index b8cbf7816..28c7610e2 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -122,15 +120,35 @@ Ao clicar aqui irá eliminar esta garrafa. - + Cylinder cannot be removed A garrafa não pode ser eliminada - + This gas in use. Only cylinders that are not used in the dive can be removed. A mistura está a ser usada. Apenas pode remover as garrafas não usadas durante o mergulho. + + + psi + psi + + + + bar + bar + + + + l + l + + + + cuft + pés^3 + DiveComputerManagementDialog @@ -155,22 +173,22 @@ remover o computador de mergulho seleccionado? DiveComputerModel - + Model Modelo - + Device ID ID do dispositivo - + Nickname Alcunha - + Clicking here will remove this divecomputer. Ao clicar aqui irá remover este computador de mergulho. @@ -178,12 +196,12 @@ remover o computador de mergulho seleccionado? DiveItem - + l/min l/min - + cuft/min pés cúbicos/min @@ -408,67 +426,67 @@ Por favor, remova-os primeiro DiveTripModel - + # # - + date data - + m m - + ft pés - + min min - + kg kg - + lbs libras - + suit fato - + cyl garrafa - + location local - + SAC Consumo - + OTU OTU - + maxCNS CNS máx @@ -618,22 +636,22 @@ Por favor, remova-os primeiro Ficheiros log (*.log) - + Warning Aviso - + Saving the libdivecomputer dump will NOT download dives to the dive list. Gravar a descarga do libdivecomputer não vai descarregar os mergulhos para a lista - + Choose file for divecomputer binary dump file Seleccione o ficheiro para gravar a descarga binária do libdivecomputer - + Dump files (*.bin) Ficheiros dump (*.bin) @@ -710,13 +728,13 @@ Por favor, remova-os primeiro MainTab - + Dive Notes Notas - + Location Local @@ -772,7 +790,7 @@ Por favor, remova-os primeiro - + Notes Notas @@ -903,13 +921,13 @@ Por favor, remova-os primeiro Adicionar sistema de lastro - + Trip Location Local da viagem - - + + Trip Notes Notas sobre a viagem @@ -924,51 +942,51 @@ Por favor, remova-os primeiro Cancelar - + This trip is being edited. Esta viagem está a ser editada. - + Multiple dives are being edited. Estão a ser editados vários mergulhos. - + This dive is being edited. Este mergulho está a ser editado. - - - - - + + + + + /min /min - + unknown desconhecido - + N N - + S S - + E E - + W O @@ -1986,72 +2004,72 @@ Por favor, remova-os primeiro ProfilePrintModel - + unknown desconhecido - + Dive #%1 - %2 Mergulho #%1 - %2 - + Max depth: %1 %2 Prof. Máxima: %1 %2 - + Duration: %1 min Duração: %1 min - + Gas Used: Gás usado: - + SAC: Consumo: - + Max. CNS: CNS máximo: - + Weights: Lastro: - + Notes: Notas: - + Divemaster: Guia: - + Buddy: Companheiros: - + Suit: Fato: - + Viz: Visibilidade: - + Rating: Classificação: @@ -2212,17 +2230,17 @@ Por favor, remova-os primeiro TankInfoModel - + Description Descrição - + ml ml - + bar bar @@ -2230,7 +2248,7 @@ Por favor, remova-os primeiro ToolTipItem - + Information Informação @@ -2238,12 +2256,12 @@ Por favor, remova-os primeiro WSInfoModel - + Description Descrição - + kg kg @@ -2299,97 +2317,117 @@ Por favor, remova-os primeiro WeightModel - + Type Tipo - + Weight Peso - + Clicking here will remove this weigthsystem. Ao clicar aqui irá remover este sistema de lastro + + + kg + kg + + + + lbs + libra + + + + ft + pés + + + + m + m + YearlyStatisticsModel - + Year > Month / Trip Ano >Mês / Viagem - + # # - + Duration Total Duração Total - + Average Média - + Shortest Mais curto - + Longest Mais longo - + Depth (%1) Average Profundidade (%1) Média - - - + + + Minimum Mínimo - - - + + + Maximum Máximo - + SAC (%1) Average Consumo (%1) Médio - + Temp. (%1) Average Temperatura (%1) @@ -2708,42 +2746,42 @@ Média Erro na análise das amostras - + Event: waiting for user action Evento: à espera de acção do utilizador - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x) - + Error registering the event handler. Erro no registo do "event handler". - + Error registering the cancellation handler. Erro no registo do "cancellation handler". - + Dive data import error Erro a importar os dados do mergulho - + Unable to create libdivecomputer context Não é possivel criar contexto do libdivecomputer - + Unable to open %s %s (%s) Não se consegue abrir %s %s (%s) - + Strange percentage reading %s Leitura estranha das percentagens %s @@ -2751,40 +2789,40 @@ Média - - Failed to parse '%s'. + + Failed to parse '%s'. Falha na análise de '%s'. - + Failed to parse '%s' Falha na análise de '%s' - + Database query get_events failed. A consulta "obter eventos" falhou. - - Database connection failed '%s'. + + Database connection failed '%s'. Falha na ligação à base de dados '%s' - - Database query failed '%s'. + + Database query failed '%s'. A consulta da base de dados falhou '%s'. - + Can't open stylesheet %s Não é possível abrir a folha de estilos %s @@ -3535,4 +3573,4 @@ O Uemis Zurich está bem ligado? Alerta de Bateria Baixa - + \ No newline at end of file diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 4a8db693a..c7b7e9a59 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -122,15 +120,35 @@ Удалить этот баллон. - + Cylinder cannot be removed Баллон не может быть удален - + This gas in use. Only cylinders that are not used in the dive can be removed. Нельзя удалять баллоны, которые используются в погружении. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -155,22 +173,22 @@ DiveComputerModel - + Model Модель - + Device ID Идентификатор - + Nickname Имя устройства - + Clicking here will remove this divecomputer. Удалить этот дайв-компьютер. @@ -178,12 +196,12 @@ DiveItem - + l/min л/мин - + cuft/min куб.фут/мин @@ -408,67 +426,67 @@ Please, remove them first. DiveTripModel - + # № - + date дата - + m м - + ft фут - + min мин - + kg кг - + lbs фунт - + suit костюм - + cyl баллон - + location местоположение - + SAC SAC - + OTU OTU - + maxCNS макс.CNS @@ -618,22 +636,22 @@ Please, remove them first. Файлы журналов (*.log) - + Warning Предупреждение - + Saving the libdivecomputer dump will NOT download dives to the dive list. При сохранении дампа, погружения в журнал НЕ загружаются. - + Choose file for divecomputer binary dump file Выберите файл для двоичного дампа из дайв-компьютера - + Dump files (*.bin) Дамп-файлы (*.bin) @@ -710,13 +728,13 @@ Please, remove them first. MainTab - + Dive Notes Погружение - + Location Местонахождение @@ -772,7 +790,7 @@ Please, remove them first. - + Notes Примечания @@ -903,13 +921,13 @@ Please, remove them first. Добавить груз - + Trip Location Местонахождение поездки - - + + Trip Notes Заметки к поездке @@ -924,51 +942,51 @@ Please, remove them first. Отмена - + This trip is being edited. Редактирование поездки. - + Multiple dives are being edited. Множественное редактирование. - + This dive is being edited. Редактирование погружения. - - - - - + + + + + /min /мин - + unknown неизвестно - + N С - + S Ю - + E В - + W З @@ -1986,72 +2004,72 @@ Please, remove them first. ProfilePrintModel - + unknown неизвестно - + Dive #%1 - %2 Погружение №%1 - %2 - + Max depth: %1 %2 Макс. глубина: %1 %2 - + Duration: %1 min Длительность: %1 мин - + Gas Used: Газы: - + SAC: SAC: - + Max. CNS: Макс. CNS: - + Weights: Грузы: - + Notes: Заметки: - + Divemaster: Инструктор: - + Buddy: Напарник: - + Suit: Костюм: - + Viz: Видимость: - + Rating: Рейтинг: @@ -2212,17 +2230,17 @@ Please, remove them first. TankInfoModel - + Description Описание - + ml мл - + bar Бар @@ -2230,7 +2248,7 @@ Please, remove them first. ToolTipItem - + Information Информация @@ -2238,12 +2256,12 @@ Please, remove them first. WSInfoModel - + Description Описание - + kg кг @@ -2299,97 +2317,117 @@ Please, remove them first. WeightModel - + Type Тип - + Weight Вес - + Clicking here will remove this weigthsystem. Удалить эту грузовую систему. + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip Год > Месяц / Поездка - + # № - + Duration Total Длительность Общее - + Average Среднее - + Shortest Кратчайшее - + Longest Самое долгое - + Depth (%1) Average Глубина (%1) Среднее - - - + + + Minimum Минимум - - - + + + Maximum Максимум - + SAC (%1) Average SAC (%1) Среднее - + Temp. (%1) Average Темп. (%1) @@ -2708,82 +2746,82 @@ Maximum Ошибка разбора выборки - + Event: waiting for user action Событие: ожидание действия пользователя - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x) - + Error registering the event handler. Ошибка регистрации обработчика событий. - + Error registering the cancellation handler. Ошибка регистрации обработчика завершения. - + Dive data import error Ошибка импорта данных погружения - + Unable to create libdivecomputer context Невозможно создать контекст libdivecomputer - + Unable to open %s %s (%s) Невозможно открыть %s %s (%s) - + Strange percentage reading %s Странное значение процентов %s - - Failed to parse '%s'. + + Failed to parse '%s'. Ошибка разбора '%s'. - + Failed to parse '%s' Ошибка разбора '%s' - + Database query get_events failed. Ошибка запроса get_events в БД. - - Database connection failed '%s'. + + Database connection failed '%s'. Ошибка соединения с БД '%s'. - - Database query failed '%s'. + + Database query failed '%s'. Ошибка запроса к БД '%s'. - + Can't open stylesheet %s Невозможно открыть файл преобразования %s @@ -3534,4 +3572,4 @@ Is the Uemis Zurich plugged in correctly? Тревога: заряд батареи - + \ No newline at end of file diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index c28b3b35f..94108cb37 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -122,15 +120,35 @@ Kliknutím sem vymažeš fľašu - + Cylinder cannot be removed Flaša nemôže byť vymazaná - + This gas in use. Only cylinders that are not used in the dive can be removed. Táto fľaša sa používa. Len fšaše nepoužité na ponor môžu byť vymazané. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -155,22 +173,22 @@ vybraný počítač? DiveComputerModel - + Model Model - + Device ID ID zariadenia - + Nickname Voliteľný názov - + Clicking here will remove this divecomputer. Kliknutín sem vymažeš počítač. @@ -178,12 +196,12 @@ vybraný počítač? DiveItem - + l/min l/min - + cuft/min cuft/min @@ -339,7 +357,7 @@ vybraný počítač? Handler Position Error - + @@ -374,7 +392,7 @@ Vymaž ich prosím. CC Set Point - + @@ -392,7 +410,7 @@ Vymaž ich prosím. Dive Planner Points - + @@ -402,73 +420,73 @@ Vymaž ich prosím. add dive data point - + DiveTripModel - + # # - + date dátum - + m m - + ft ft - + min min - + kg kg - + lbs US libra - + suit oblek - + cyl fl. - + location lokalita - + SAC Spotreba plynu - + OTU OTU - + maxCNS max. CNS @@ -610,7 +628,7 @@ Vymaž ich prosím. Choose file for divecomputer download logfile - + @@ -618,22 +636,22 @@ Vymaž ich prosím. Log súbory - + Warning Upozornenie - + Saving the libdivecomputer dump will NOT download dives to the dive list. - + - + Choose file for divecomputer binary dump file - + - + Dump files (*.bin) Dump súbory @@ -710,13 +728,13 @@ Vymaž ich prosím. MainTab - + Dive Notes Poznámky - + Location Miesto @@ -772,7 +790,7 @@ Vymaž ich prosím. - + Notes Poznámky @@ -903,13 +921,13 @@ Vymaž ich prosím. Pridaj závažia - + Trip Location Lokalita - - + + Trip Notes Poznámky @@ -924,51 +942,51 @@ Vymaž ich prosím. Zrušiť - + This trip is being edited. Táto akcia je editovaná. - + Multiple dives are being edited. Viaceré ponory sú editované. - + This dive is being edited. Tento ponor sa edituje. - - - - - + + + + + /min /min - + unknown neznámy - + N N - + S S - + E E - + W W @@ -1589,7 +1607,7 @@ Vymaž ich prosím. Ascent/Descent speed denominator - + @@ -1830,7 +1848,7 @@ Vymaž ich prosím. Sizing heights (% of layout) - + @@ -1911,7 +1929,7 @@ Vymaž ich prosím. Set Duration: 10 minutes - + @@ -1926,7 +1944,7 @@ Vymaž ich prosím. Measure properties of dive segments - + @@ -1986,72 +2004,72 @@ Vymaž ich prosím. ProfilePrintModel - + unknown neznámy - + Dive #%1 - %2 Ponor #%1 - %2 - + Max depth: %1 %2 Max hĺbka: %1 %2 - + Duration: %1 min Trvanie: %1 min - + Gas Used: Použitá zmes: - + SAC: SAC: - + Max. CNS: Max. CNS: - + Weights: Závažia: - + Notes: Poznámky: - + Divemaster: Divemaster: - + Buddy: Buddy: - + Suit: Oblek: - + Viz: Viď: - + Rating: Hodnotenie: @@ -2212,17 +2230,17 @@ Vymaž ich prosím. TankInfoModel - + Description Popis - + ml ml - + bar bar @@ -2230,7 +2248,7 @@ Vymaž ich prosím. ToolTipItem - + Information Informácie @@ -2238,12 +2256,12 @@ Vymaž ich prosím. WSInfoModel - + Description Popis - + kg kg @@ -2299,94 +2317,114 @@ Vymaž ich prosím. WeightModel - + Type Typ - + Weight Hmotnosť - + Clicking here will remove this weigthsystem. Kliknutim sem vymažeš záťažový systém. + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip Rok > Mesiac / Akcia - + # # - + Duration Total Trvanie Celkové - + Average Priemer - + Shortest Najkratší - + Longest Najdlhší - + Depth (%1) Average Hĺbka (%1) Priemer - - - + + + Minimum Minimum - - - + + + Maximum Maximum - + SAC (%1) Average SAC (%1) Priemer - + Temp. (%1) Average Temp. (%1) @@ -2705,82 +2743,82 @@ Maximum Chyba spracovania vzoriek - + Event: waiting for user action Udalosť: Čakanie na vstup uživateľa - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) - + Error registering the event handler. Chyba registrácia správcu udalosti. - + Error registering the cancellation handler. Chyba registrácie správcu ukončenia - + Dive data import error Chyba importu dát - + Unable to create libdivecomputer context Problém inicializácie libdivecomputer - + Unable to open %s %s (%s) Nie je možné otvoriť %s %s (%s) - + Strange percentage reading %s Zvláštne percenta v %s - - Failed to parse '%s'. + + Failed to parse '%s'. Chyba pri spracovaní '%s'. - + Failed to parse '%s' Chyba pri spracovaní '%s' - + Database query get_events failed. Neúspešná požiadavka: get_events.⏎ - - Database connection failed '%s'. + + Database connection failed '%s'. Spojenie s databázou zlýhalo '%s'. - - Database query failed '%s'. + + Database query failed '%s'. Požiadavka na databázu zlyhala '%s'. - + Can't open stylesheet %s Neviem otvoriť šablónu @@ -3531,4 +3569,4 @@ Je Uemis Zurich korektne pripojený? Alarm: Slabá batéria - + \ No newline at end of file diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index e8c084810..532107603 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -122,15 +122,35 @@ - + Cylinder cannot be removed - + This gas in use. Only cylinders that are not used in the dive can be removed. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -154,22 +174,22 @@ DiveComputerModel - + Model - + Device ID - + Nickname - + Clicking here will remove this divecomputer. @@ -177,12 +197,12 @@ DiveItem - + l/min - + cuft/min @@ -406,67 +426,67 @@ Please, remove them first. DiveTripModel - + # - + date - + m - + ft - + min - + kg - + lbs - + suit - + cyl - + location - + SAC - + OTU - + maxCNS @@ -615,22 +635,22 @@ Please, remove them first. - + Warning - + Saving the libdivecomputer dump will NOT download dives to the dive list. - + Choose file for divecomputer binary dump file - + Dump files (*.bin) @@ -707,13 +727,13 @@ Please, remove them first. MainTab - + Dive Notes - + Location @@ -769,7 +789,7 @@ Please, remove them first. - + Notes @@ -900,13 +920,13 @@ Please, remove them first. - + Trip Location - - + + Trip Notes @@ -921,51 +941,51 @@ Please, remove them first. - + This trip is being edited. - + Multiple dives are being edited. - + This dive is being edited. - - - - - + + + + + /min - + unknown - + N - + S - + E - + W @@ -1983,72 +2003,72 @@ Please, remove them first. ProfilePrintModel - + unknown - + Dive #%1 - %2 - + Max depth: %1 %2 - + Duration: %1 min - + Gas Used: - + SAC: - + Max. CNS: - + Weights: - + Notes: - + Divemaster: - + Buddy: - + Suit: - + Viz: - + Rating: @@ -2209,17 +2229,17 @@ Please, remove them first. TankInfoModel - + Description - + ml - + bar @@ -2227,7 +2247,7 @@ Please, remove them first. ToolTipItem - + Information @@ -2235,12 +2255,12 @@ Please, remove them first. WSInfoModel - + Description - + kg @@ -2296,88 +2316,108 @@ Please, remove them first. WeightModel - + Type - + Weight - + Clicking here will remove this weigthsystem. + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip - + # - + Duration Total - + Average - + Shortest - + Longest - + Depth (%1) Average - - - + + + Minimum - - - + + + Maximum - + SAC (%1) Average - + Temp. (%1) Average @@ -2695,77 +2735,77 @@ Maximum - + Event: waiting for user action - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) - + Error registering the event handler. - + Error registering the cancellation handler. - + Dive data import error - + Unable to create libdivecomputer context - + Unable to open %s %s (%s) - + Strange percentage reading %s - + Failed to parse '%s'. - + Failed to parse '%s' - + Database query get_events failed. - + Database connection failed '%s'. - + Database query failed '%s'. - + Can't open stylesheet %s diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index 6d027d622..5580970f1 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -71,7 +69,7 @@ CSV Files (*.csv);;All Files(*) - + CSV filer (*.csv);;Alla Filer(*) @@ -122,15 +120,35 @@ Klicka här för att ta bort denna flaska - + Cylinder cannot be removed Flaska kan inte tas bort - + This gas in use. Only cylinders that are not used in the dive can be removed. Denna gas används. Bara flaskor som inte används kan tas bort + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -155,22 +173,22 @@ radera den valda dykdatorn? DiveComputerModel - + Model Modell - + Device ID Enhetsid - + Nickname Enhetsnamn - + Clicking here will remove this divecomputer. Klicka här för att ta bort denna dykdator @@ -178,12 +196,12 @@ radera den valda dykdatorn? DiveItem - + l/min l/min - + cuft/min cuft/min @@ -408,67 +426,67 @@ vänligen ta bort dessa först. DiveTripModel - + # # - + date datum - + m m - + ft ft - + min Min - + kg kg - + lbs pund - + suit dräkt - + cyl flaska - + location plats - + SAC SAC - + OTU OTU - + maxCNS maxCNS @@ -498,27 +516,27 @@ vänligen ta bort dessa först. no dives were selected - + inga dyk var markerade failed to create zip file for upload: %1 - + misslyckades med att skapa en zip-fil för uppladdning: %1 cannot create temporary file: %1 - + kunde inte skapa temporär fil: %1 internal error: %1 - + internt fel: %1 internal error - + internt fel @@ -610,32 +628,32 @@ vänligen ta bort dessa först. Choose file for divecomputer download logfile - + Välj fil som loggfil för nerladdningen ifrån dykdatorn Log files (*.log) - + Loggfiler (*.log) - + Warning Varning - + Saving the libdivecomputer dump will NOT download dives to the dive list. - + Att spara en libdivecomputer-dump kommer inte att ladda ner dyken till dyklistan. - + Choose file for divecomputer binary dump file - + Välj fil för binär dumpning av nerladdningen ifrån dykdatorn - + Dump files (*.bin) - + Dumpfiler (*.bin) @@ -690,12 +708,12 @@ vänligen ta bort dessa först. Save libdivecomputer logfile - + Spara loggfil av nerladdningen ifrån dykdatorn Save libdivecomputer dumpfile - + Spara dumpfil ifrån dykdatorn @@ -710,13 +728,13 @@ vänligen ta bort dessa först. MainTab - + Dive Notes Dykanteckningar - + Location Plats @@ -772,7 +790,7 @@ vänligen ta bort dessa först. - + Notes Anteckningar @@ -903,13 +921,13 @@ vänligen ta bort dessa först. Lägg till Viktsystem - + Trip Location Resmål - - + + Trip Notes Resmålsanteckningar @@ -924,51 +942,51 @@ vänligen ta bort dessa först. Avbryt - + This trip is being edited. Detta resmål håller på och ändras. - + Multiple dives are being edited. Flera dyk håller på och ändras. - + This dive is being edited. Detta dyk håller på och ändras. - - - - - + + + + + /min /min - + unknown okänd - + N N - + S S - + E E - + W W @@ -1880,7 +1898,7 @@ vänligen ta bort dessa först. Unhide all events - + Visa alla händelser @@ -1986,72 +2004,72 @@ vänligen ta bort dessa först. ProfilePrintModel - + unknown okänd - + Dive #%1 - %2 Dyk #%1 - %2 - + Max depth: %1 %2 Maxdjup: %1 %2 - + Duration: %1 min Varaktighet: %1 min - + Gas Used: Gas använd: - + SAC: SAC: - + Max. CNS: Max. CNS: - + Weights: Vikter: - + Notes: Anteckningar: - + Divemaster: Divemaster: - + Buddy: Parkamrat: - + Suit: Dräkt: - + Viz: Sikt: - + Rating: Ranking: @@ -2212,17 +2230,17 @@ vänligen ta bort dessa först. TankInfoModel - + Description Beskrivning - + ml ml - + bar bar @@ -2230,7 +2248,7 @@ vänligen ta bort dessa först. ToolTipItem - + Information Information @@ -2238,12 +2256,12 @@ vänligen ta bort dessa först. WSInfoModel - + Description Beskrivning - + kg kg @@ -2299,94 +2317,114 @@ vänligen ta bort dessa först. WeightModel - + Type Typ - + Weight Vikt - + Clicking here will remove this weigthsystem. Klicka här för att ta bort detta viktsystem + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip År > Månad / Resmål - + # # - + Duration Total Varaktighet Total - + Average Genomsnitt - + Shortest Kortaste - + Longest Längsta - + Depth (%1) Average Djup (%1) Medel - - - + + + Minimum Minimum - - - + + + Maximum Maximum - + SAC (%1) Average SAC (%1) Medel - + Temp. (%1) Average Temp. (%1) @@ -2705,84 +2743,84 @@ Medel Kunde inte tolka sampel - + Event: waiting for user action Händelse: väntar på användaren - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) - + Error registering the event handler. Kunde inte registrera event-funktion - + Error registering the cancellation handler. Kunde inte registrera avbrytningsrutin - + Dive data import error Lyckades inte importera dykdata - + Unable to create libdivecomputer context Kan inte skapa libdivecomputer context - + Unable to open %s %s (%s) Kunde inte öppna fil %s %s (%s) - + Strange percentage reading %s Konstig procent läsning %s - - Failed to parse '%s'. + + Failed to parse '%s'. Kunde inte läsa '%s'. - + Failed to parse '%s' Kunde inte läsa '%s' - + Database query get_events failed. Databasfråga get_events misslyckades. - - Database connection failed '%s'. + + Database connection failed '%s'. Databasanslutning misslyckades '%s'. - - Database query failed '%s'. + + Database query failed '%s'. Databasfråga misslyckades '%s'. - + Can't open stylesheet %s - + Kunde inte öppna formatmall %s @@ -3531,4 +3569,4 @@ Is the Uemis Zurich plugged in correctly? Batterivarning - + \ No newline at end of file diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index c87bd337c..abc414b3e 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -115,20 +115,40 @@ - + Clicking here will remove this cylinder. - + Cylinder cannot be removed - + This gas in use. Only cylinders that are not used in the dive can be removed. + + + psi + + + + + bar + + + + + l + + + + + cuft + + DiveComputerManagementDialog @@ -152,22 +172,22 @@ DiveComputerModel - + Model Mô hình - + Device ID - + Nickname Tên - + Clicking here will remove this divecomputer. @@ -175,12 +195,12 @@ DiveItem - + l/min - + cuft/min @@ -404,67 +424,67 @@ Please, remove them first. DiveTripModel - + # # - + date - + m m - + ft ft - + min nhỏ nhất - + kg ký - + lbs lbs - + suit - + cyl - + location - + SAC SAC - + OTU OTU - + maxCNS CNS tối đa @@ -613,22 +633,22 @@ Please, remove them first. - + Warning - + Saving the libdivecomputer dump will NOT download dives to the dive list. - + Choose file for divecomputer binary dump file - + Dump files (*.bin) @@ -705,13 +725,13 @@ Please, remove them first. MainTab - + Dive Notes Ghi chú về lần lặn - + Location Địa điểm @@ -767,7 +787,7 @@ Please, remove them first. - + Notes Ghi chú @@ -898,13 +918,13 @@ Please, remove them first. - + Trip Location - - + + Trip Notes @@ -919,51 +939,51 @@ Please, remove them first. - + This trip is being edited. - + Multiple dives are being edited. - + This dive is being edited. - - - - - + + + + + /min - + unknown chưa rõ - + N N - + S S - + E E - + W W @@ -1981,72 +2001,72 @@ Please, remove them first. ProfilePrintModel - + unknown chưa rõ - + Dive #%1 - %2 - + Max depth: %1 %2 - + Duration: %1 min - + Gas Used: - + SAC: - + Max. CNS: - + Weights: - + Notes: - + Divemaster: - + Buddy: - + Suit: - + Viz: - + Rating: @@ -2207,17 +2227,17 @@ Please, remove them first. TankInfoModel - + Description - + ml - + bar bar @@ -2225,7 +2245,7 @@ Please, remove them first. ToolTipItem - + Information @@ -2233,12 +2253,12 @@ Please, remove them first. WSInfoModel - + Description - + kg ký @@ -2294,88 +2314,108 @@ Please, remove them first. WeightModel - + Type Loại - + Weight Cân nặng - + Clicking here will remove this weigthsystem. + + + kg + + + + + lbs + + + + + ft + + + + + m + + YearlyStatisticsModel - + Year > Month / Trip - + # # - + Duration Total - + Average - + Shortest - + Longest - + Depth (%1) Average - - - + + + Minimum - - - + + + Maximum - + SAC (%1) Average - + Temp. (%1) Average @@ -2390,13 +2430,13 @@ Maximum - + bar bar - + psi psi @@ -2408,7 +2448,7 @@ Maximum - + cuft cuft @@ -2693,82 +2733,82 @@ Maximum Lỗi khi chuyển thông số các mẫu - + Event: waiting for user action Sự kiện: đang đợi thao tác từ người dùng - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) mô hình=%u (0x%08x), firmware=%u (0x%08x), số hiệu=%u (0x%08x) - + Error registering the event handler. Lỗi khi đăng ký quản lý sự kiện. - + Error registering the cancellation handler. Lỗi khi đăng ký việc hủy bỏ quản lý. - + Dive data import error Lỗi khi nhập dữ liệu lặn - + Unable to create libdivecomputer context Không thể tạo nội dung cho thiết bị đo lặn - + Unable to open %s %s (%s) Không thể mở %s %s (%s) - + Strange percentage reading %s Đang đọc tỉ lệ lạ %s - + Failed to parse '%s'. Thất bại khi chuyển thông số '%s'. - + Failed to parse '%s' Thất bại khi chuyển thông số '%s' - + Database query get_events failed. Thất bại khi truy vấn việc nhận_sự kiện từ cơ sở dữ liệu. - + Database connection failed '%s'. Thất bại khi kết nối cơ sở dữ liệu '%s'. - + Database query failed '%s'. Thất bại khi truy vấn dữ liệu '%s'. - + Can't open stylesheet %s @@ -3043,23 +3083,23 @@ TTS:%umin (calc) - + %1, %2 %3, %4 %5:%6 - + %1 %2, %3 %4:%5 - + %1 %2 (%3 dives) - + %1 %2 (1 dive) diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index e34c8310a..89eb644c3 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -1,6 +1,4 @@ - - - + CSVImportDialog @@ -71,7 +69,7 @@ CSV Files (*.csv);;All Files(*) - + @@ -122,15 +120,35 @@ 於此處按下將移除此氣瓶. - + Cylinder cannot be removed 氣瓶無法移除 - + This gas in use. Only cylinders that are not used in the dive can be removed. 此為使用氣體. 只有在潛水時, 未使用的氣體才可以被移除. + + + psi + psi + + + + bar + bar + + + + l + l + + + + cuft + cuft + DiveComputerManagementDialog @@ -155,22 +173,22 @@ DiveComputerModel - + Model 型號 - + Device ID 裝置 ID - + Nickname 別名 - + Clicking here will remove this divecomputer. 於此處按下將會移除此潛水電腦. @@ -178,12 +196,12 @@ DiveItem - + l/min l/min - + cuft/min cuft/min @@ -408,67 +426,67 @@ Please, remove them first. DiveTripModel - + # # - + date 日期 - + m m - + ft ft - + min min - + kg kg - + lbs lbs - + suit 防寒衣 - + cyl 氣瓶 - + location 位置 - + SAC 耗氣率 - + OTU 氧容許量 OTU - + maxCNS 最大 CNS @@ -498,27 +516,27 @@ Please, remove them first. no dives were selected - + failed to create zip file for upload: %1 - + cannot create temporary file: %1 - + internal error: %1 - + internal error - + @@ -610,32 +628,32 @@ Please, remove them first. Choose file for divecomputer download logfile - + Log files (*.log) - + - + Warning 提醒 - + Saving the libdivecomputer dump will NOT download dives to the dive list. - + - + Choose file for divecomputer binary dump file - + - + Dump files (*.bin) - + @@ -690,12 +708,12 @@ Please, remove them first. Save libdivecomputer logfile - + Save libdivecomputer dumpfile - + @@ -710,13 +728,13 @@ Please, remove them first. MainTab - + Dive Notes 潛水記錄 - + Location 位置 @@ -772,7 +790,7 @@ Please, remove them first. - + Notes 記錄 @@ -903,13 +921,13 @@ Please, remove them first. 增加配重系統 - + Trip Location 旅程位置 - - + + Trip Notes 旅程記錄 @@ -924,51 +942,51 @@ Please, remove them first. 取消 - + This trip is being edited. 此旅程已被編輯. - + Multiple dives are being edited. 此些旅程已被編輯. - + This dive is being edited. 此潛水已被編輯. - - - - - + + + + + /min /min - + unknown 未知 - + N N - + S S - + E E - + W W @@ -1880,7 +1898,7 @@ Please, remove them first. Unhide all events - + @@ -1986,72 +2004,72 @@ Please, remove them first. ProfilePrintModel - + unknown 未知 - + Dive #%1 - %2 潛水 #%1 - %2 - + Max depth: %1 %2 最大深度: %1 %2 - + Duration: %1 min 區間: %1 min - + Gas Used: 消耗氣體: - + SAC: 耗氣率: - + Max. CNS: 最大 CNS: - + Weights: 配重: - + Notes: 記錄: - + Divemaster: 導潛: - + Buddy: 潛伴: - + Suit: 防寒衣： - + Viz: Viz: - + Rating: 評分: @@ -2212,17 +2230,17 @@ Please, remove them first. TankInfoModel - + Description 描述 - + ml ml - + bar bar @@ -2230,7 +2248,7 @@ Please, remove them first. ToolTipItem - + Information 資訊 @@ -2238,12 +2256,12 @@ Please, remove them first. WSInfoModel - + Description 描述 - + kg kg @@ -2299,97 +2317,117 @@ Please, remove them first. WeightModel - + Type 類型 - + Weight 重量 - + Clicking here will remove this weigthsystem. 按此處移除配重系統 + + + kg + kg + + + + lbs + lbs + + + + ft + ft + + + + m + m + YearlyStatisticsModel - + Year > Month / Trip 年 > 月 / 旅程 - + # # - + Duration Total 區間 全部 - + Average 平均 - + Shortest 最短 - + Longest 最長 - + Depth (%1) Average 深度 (%1) 平均 - - - + + + Minimum 最小 - - - + + + Maximum 最大 - + SAC (%1) Average 耗氣率 (%1) 平均 - + Temp. (%1) Average 溫度 (%1) @@ -2708,84 +2746,84 @@ Maximum 樣本解析錯誤 - + Event: waiting for user action 事件: 等待使用者動作 - + model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x) 型號=%u (0x%08x), 韌體=%u (0x%08x), 序號=%u (0x%08x) - + Error registering the event handler. 錯誤的註冊程序. - + Error registering the cancellation handler. 錯誤的註冊取消程序. - + Dive data import error 匯入潛水資料錯誤 - + Unable to create libdivecomputer context 無法建立 libdivecomputer 上下文 - + Unable to open %s %s (%s) 無法開啟 %s %s (%s) - + Strange percentage reading %s 有問題的讀取比例 %s - - Failed to parse '%s'. + + Failed to parse '%s'. 無法解析訊息 '%s' . - + Failed to parse '%s' 無法解析訊息 '%s' - + Database query get_events failed. 資料庫讀取 get_events 失敗. - - Database connection failed '%s'. + + Database connection failed '%s'. 資料庫連結錯誤 '%s' . - - Database query failed '%s'. + + Database query failed '%s'. 資料庫要求錯誤 '%s' . - + Can't open stylesheet %s - + @@ -3534,4 +3572,4 @@ Is the Uemis Zurich plugged in correctly? 電池低電量警示 - + \ No newline at end of file -- cgit v1.2.3-70-g09d2