Merge branch 'v4.4-branch' into newmaster

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-05-21 13:45:25 -07:00
commit 00b1469658
11 changed files with 1190 additions and 1096 deletions

10
INSTALL
View file

@ -92,7 +92,7 @@ like this:
mkdir -p ~/src
cd ~/src
git clone -b v4.4.1 git://subsurface-divelog.org/subsurface
git clone -b v4.4.2 git://subsurface-divelog.org/subsurface
./subsurface/scripts/build.sh # <- this step will take quite a while as it
# compiles a handful of libraries before
# building Subsurface
@ -271,10 +271,10 @@ To compile Subsurface, use:
$ cd ~/src
$ git clone git://subsurface-divelog.org/subsurface.git
$ cd subsurface
$ git checkout v4.4-branch # this get's you the last release
# skip this step to build the latest development
# version
$ packaging/windows/mingw-make.sh Qt5-64
$ cd git checkout v4.4.2 # this get's you the last release
# skip this step to build the latest development
# version
$ packagin/windows/mingw-make.sh Qt5 SPECIAL_MARBLE_PREFIX=1
$ packaging/windows/mingw-make.sh install
$ packaging/windows/mingw-make.sh installer

8
README
View file

@ -1,7 +1,7 @@
This is the README file for Subsurface 4.4.1
This is the README file for Subsurface 4.4.2
Please check the ReleaseNotes.txt for details about new features and
changes since Subsurface 4.4 (and earlier versions).
changes since Subsurface 4.4.1 (and earlier versions).
Subsurface can be found at http://subsurface-divelog.org
@ -24,11 +24,11 @@ If you want the latest release (instead of the bleeding edge
development version) you can either get this via git or the release tar
ball. After cloning run the following command:
git checkout v4.4.1 (or whatever the last release is)
git checkout v4.4.2 (or whatever the last release is)
or download a tar ball from:
http://subsurface-divelog.org/downloads/Subsurface-4.4.1.tgz
http://subsurface-divelog.org/downloads/Subsurface-4.4.2.tgz
Detailed build instructions can be found in the INSTALL file.

View file

@ -3,7 +3,7 @@
_Subsurface_ 4.5 pre-beta - April 2015
--------------------------------
Some of the changes since _Subsurface_ 4.4.1
Some of the changes since _Subsurface_ 4.4.2
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Dive site handling - dive sites are now a first class citizen in
@ -24,21 +24,31 @@ Ability to load dives exported with OSTCTools
Support for more GPS coordinate formats
Some of the changes since _Subsurface_ 4.4.1
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
_Subsurface_ 4.4.1 - February 2015
--------------------------------
Improved editing of tags when multiple dives are selected
The _Subsurface_ development team proudly announces
the release of version 4.4.1 of _Subsurface_, an open
source divelog and dive planning program for Windows, Mac and Linux.
Improved handling of the sample interval when uploading data to
divelogs.de
License: GPLv2
Fixed several issues with downloads from the UEMIS SDA
_Subsurface_ can be found at: http://_Subsurface_-divelog.org
added support for the new models of the Heinrichs & Weikamp OSTC 2 and OSTC 3
This is just a small update to _Subsurface_ 4.4, mainly intended to update
the user manual translations to be consistent with 4.4, to fix a small
number of bugs and to update to the latest libdivecomputer.
added support for the Tusa IQ-700
added support for the Mares Smart
added more DiveSystems iDive models
added support for Scubapro Meridian and Chromis
added / improved support for Oceanic Veo 2, Veo 3 and VTX
Known issues (and this was the case in 4.4 and 4.4.1 as well):
Suunto Eon Steel support on MacOS is currently not working as MacOS grabs
the device before Subsurface gets to see it.
Some of the changes since _Subsurface_ 4.4
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

View file

@ -305,10 +305,20 @@ void DownloadFromDCWidget::on_downloadCancelRetryButton_clicked()
thread->deleteLater();
}
data.devname = strdup(ui.device->currentText().toUtf8().data());
data.vendor = strdup(ui.vendor->currentText().toUtf8().data());
data.product = strdup(ui.product->currentText().toUtf8().data());
if (same_string(data.vendor, "Uemis")) {
char *colon;
char *devname = strdup(ui.device->currentText().toUtf8().data());
if ((colon = strstr(devname, ":\\ (UEMISSDA)")) != NULL) {
*(colon + 2) = '\0';
fprintf(stderr, "shortened devname to \"%s\"", data.devname);
}
data.devname = devname;
} else {
data.devname = strdup(ui.device->currentText().toUtf8().data());
}
data.descriptor = descriptorLookup[ui.vendor->currentText() + ui.product->currentText()];
data.force_download = ui.forceDownload->isChecked();
data.create_new_trip = ui.createNewTrip->isChecked();

View file

@ -19,7 +19,7 @@ else: TARGET = subsurface
QMAKE_CLEAN += $$TARGET
VERSION = 4.4.1
VERSION = 4.4.2
VERSION_FILE = $$OUT_PWD/ssrf-version.h
# create a blank VERSION_FILE if missing
system(cat $$VERSION_FILE > /dev/null 2>&1 || touch $$VERSION_FILE)

View file

@ -141,22 +141,22 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample pO</source>
<translation type="unfinished"/>
<translation>Eksempel pO</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample CNS</source>
<translation type="unfinished"/>
<translation>Eksempel CNS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample NDL</source>
<translation type="unfinished"/>
<translation>Eksempel NDL</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
<source>Sample TTS</source>
<translation type="unfinished"/>
<translation>Eksempel TTS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
@ -1904,7 +1904,7 @@ fjerne den valgte dykkercomputer?</translation>
<location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
<location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
<source>Sample pO</source>
<translation type="unfinished"/>
<translation>Eksempel pO</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
@ -1912,7 +1912,7 @@ fjerne den valgte dykkercomputer?</translation>
<location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
<location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample CNS</source>
<translation type="unfinished"/>
<translation>Eksempel CNS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
@ -1920,7 +1920,7 @@ fjerne den valgte dykkercomputer?</translation>
<location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
<location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample NDL</source>
<translation type="unfinished"/>
<translation>Eksempel NDL</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
@ -1928,7 +1928,7 @@ fjerne den valgte dykkercomputer?</translation>
<location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
<location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample TTS</source>
<translation type="unfinished"/>
<translation>Eksempel TTS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
@ -2148,27 +2148,27 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
<source>Sensor 1</source>
<translation type="unfinished"/>
<translation>Sensor 1</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
<source>Sensor 2</source>
<translation type="unfinished"/>
<translation>Sensor 2</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
<source>Sensor 3</source>
<translation type="unfinished"/>
<translation>Sensor 3</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
<source>Heart rate</source>
<translation type="unfinished"/>
<translation>Hjerte frekvens</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
<source>Mean depth @ s</source>
<translation type="unfinished"/>
<translation>Middel dybde @ s</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
@ -2629,7 +2629,7 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="245"/>
<source>Photo upload sucessfull</source>
<translation type="unfinished"/>
<translation>Foto uploaded med succes</translation>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="246"/>
@ -2639,7 +2639,7 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Photo upload failed</source>
<translation type="unfinished"/>
<translation>Foto upload fejlede</translation>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="251"/>
@ -3971,7 +3971,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
<source>1:</source>
<translation type="unfinished"/>
<translation>1:</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="875"/>
@ -4861,7 +4861,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<location filename="../qt-ui/socialnetworks.cpp" line="300"/>
<source>
%1</source>
<translation type="unfinished"/>
<translation>
%1</translation>
</message>
</context>
<context>
@ -5148,7 +5149,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/updatemanager.cpp" line="140"/>
<source>Automatic check for updates</source>
<translation type="unfinished"/>
<translation>Kontroller automatisk efter opdateringer</translation>
</message>
</context>
<context>
@ -5156,7 +5157,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
<source>User manual</source>
<translation type="unfinished"/>
<translation>Bruger manual</translation>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@ -5652,7 +5653,7 @@ Gennemsnit</translation>
<message>
<location filename="../file.c" line="641"/>
<source>Mouth piece position not connected</source>
<translation type="unfinished"/>
<translation>Mundstykke position ikke forbundet</translation>
</message>
<message>
<location filename="../file.c" line="647"/>
@ -6104,7 +6105,7 @@ Gennemsnit</translation>
<message>
<location filename="../planner.c" line="601"/>
<source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
<translation type="unfinished"/>
<translation>Overgang til %.*f %s i %d:%02d min - runtime %d:%02u %s (SP = %.1fbar)</translation>
</message>
<message>
<location filename="../planner.c" line="609"/>
@ -6114,7 +6115,7 @@ Gennemsnit</translation>
<message>
<location filename="../planner.c" line="622"/>
<source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
<translation type="unfinished"/>
<translation>Stop %.*f %s i %d:%02d min - runtime %d:%02u %s (SP = %.1fbar)</translation>
</message>
<message>
<location filename="../planner.c" line="629"/>
@ -6209,7 +6210,7 @@ Gennemsnit</translation>
<message>
<location filename="../planner.c" line="769"/>
<source>low pO value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
<translation type="unfinished"/>
<translation>lav pO værdi %.2f %d:%02u med gas %s dybde %.*f %s</translation>
</message>
<message>
<location filename="../planner.c" line="1085"/>
@ -6845,47 +6846,47 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../uemis.c" line="196"/>
<source>Safety stop violation</source>
<translation type="unfinished"/>
<translation>Sikkerhedsstop overtrædelse</translation>
</message>
<message>
<location filename="../uemis.c" line="198"/>
<source>Speed alarm</source>
<translation type="unfinished"/>
<translation>Hastighedsalam</translation>
</message>
<message>
<location filename="../uemis.c" line="201"/>
<source>Speed warning</source>
<translation type="unfinished"/>
<translation>Hastighedsalarm</translation>
</message>
<message>
<location filename="../uemis.c" line="203"/>
<source>pO green warning</source>
<translation type="unfinished"/>
<translation>pO grøn advarsel</translation>
</message>
<message>
<location filename="../uemis.c" line="206"/>
<source>pO ascend warning</source>
<translation type="unfinished"/>
<translation>pO opstignings advarsel</translation>
</message>
<message>
<location filename="../uemis.c" line="208"/>
<source>pO ascend alarm</source>
<translation type="unfinished"/>
<translation>pO opstignings alarm</translation>
</message>
<message>
<location filename="../uemis.c" line="212"/>
<source>Tank pressure info</source>
<translation type="unfinished"/>
<translation>Flaske tryk info</translation>
</message>
<message>
<location filename="../uemis.c" line="214"/>
<source>RGT warning</source>
<translation type="unfinished"/>
<translation>RGT advarsel</translation>
</message>
<message>
<location filename="../uemis.c" line="216"/>
<source>RGT alert</source>
<translation type="unfinished"/>
<translation>RGT alarm</translation>
</message>
<message>
<location filename="../uemis.c" line="218"/>

View file

@ -5,12 +5,12 @@
<message>
<location filename="../qt-ui/simplewidgets.cpp" line="522"/>
<source>Person: </source>
<translation type="unfinished"/>
<translation>Personil:</translation>
</message>
<message>
<location filename="../qt-ui/simplewidgets.cpp" line="523"/>
<source>Searches for buddies and divemasters</source>
<translation type="unfinished"/>
<translation>Cari teman dan divemaster</translation>
</message>
</context>
<context>
@ -18,7 +18,7 @@
<message>
<location filename="../qt-ui/filtermodels.cpp" line="230"/>
<source>No buddies</source>
<translation type="unfinished"/>
<translation>Tidak ada teman</translation>
</message>
</context>
<context>
@ -26,7 +26,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
<translation type="unfinished"/>
<translation>Selam#</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@ -36,7 +36,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
<translation type="unfinished"/>
<translation>Waktu</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@ -51,7 +51,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
<translation type="unfinished"/>
<translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@ -61,17 +61,17 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
<translation>Ukuran sIlinder</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
<translation type="unfinished"/>
<translation>Tekanan awal</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
<translation type="unfinished"/>
<translation>Tekanan akhir</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@ -91,47 +91,47 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
<translation type="unfinished"/>
<translation>Tag</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
<translation type="unfinished"/>
<translation>Temperatur Udara</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
<translation type="unfinished"/>
<translation>Temperatur air</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max. depth</source>
<translation type="unfinished"/>
<translation>Kedalaman Maks.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Avg. depth</source>
<translation type="unfinished"/>
<translation>Kedalaman rata-rata</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O</source>
<translation type="unfinished"/>
<translation>O</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
<translation type="unfinished"/>
<translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample time</source>
<translation type="unfinished"/>
<translation>Waktu sampel</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample depth</source>
<translation type="unfinished"/>
<translation>Sampel Kedalaman</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@ -1181,7 +1181,7 @@
<message>
<location filename="../qt-ui/divecomponentselection.ui" line="102"/>
<source>Tags</source>
<translation type="unfinished"/>
<translation>Tag</translation>
</message>
<message>
<location filename="../qt-ui/divecomponentselection.ui" line="109"/>
@ -1758,7 +1758,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation type="unfinished"/>
<translation>Waktu</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
@ -1793,7 +1793,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation type="unfinished"/>
<translation>Selam#</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
@ -1808,22 +1808,22 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
<translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation type="unfinished"/>
<translation>Tag</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O</source>
<translation type="unfinished"/>
<translation>O</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
<translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
@ -1869,7 +1869,7 @@
<location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
<location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
<translation>Waktu sampel</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
@ -1877,7 +1877,7 @@
<location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
<location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
<translation>Sampel Kedalaman</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
@ -1963,27 +1963,27 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
<translation>Ukuran sIlinder</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
<translation>Tekanan awal</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
<translation>Tekanan akhir</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
<translation type="unfinished"/>
<translation>Temperatur Udara</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
<translation type="unfinished"/>
<translation>Temperatur air</translation>
</message>
</context>
<context>
@ -2100,7 +2100,7 @@
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
<source>Time</source>
<translation type="unfinished"/>
<translation>Waktu</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
@ -2749,7 +2749,7 @@
<message>
<location filename="../qt-ui/maintab.ui" line="275"/>
<source>Tags</source>
<translation type="unfinished"/>
<translation>Tag</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="206"/>
@ -2782,14 +2782,14 @@
<location filename="../qt-ui/maintab.ui" line="675"/>
<location filename="../qt-ui/maintab.cpp" line="280"/>
<source>Air temp.</source>
<translation type="unfinished"/>
<translation>Temperatur Udara</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="107"/>
<location filename="../qt-ui/maintab.ui" line="694"/>
<location filename="../qt-ui/maintab.cpp" line="281"/>
<source>Water temp.</source>
<translation type="unfinished"/>
<translation>Temperatur air</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="282"/>
@ -2820,7 +2820,7 @@
<message>
<location filename="../qt-ui/maintab.ui" line="618"/>
<source>Max. depth</source>
<translation type="unfinished"/>
<translation>Kedalaman Maks.</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="656"/>
@ -2861,7 +2861,7 @@
<message>
<location filename="../qt-ui/maintab.ui" line="88"/>
<source>Time</source>
<translation type="unfinished"/>
<translation>Waktu</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="452"/>
@ -2882,7 +2882,7 @@
<message>
<location filename="../qt-ui/maintab.ui" line="637"/>
<source>Avg. depth</source>
<translation type="unfinished"/>
<translation>Kedalaman rata-rata</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="599"/>
@ -6904,7 +6904,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../save-html.c" line="454"/>
<source>Time</source>
<translation type="unfinished"/>
<translation>Waktu</translation>
</message>
<message>
<location filename="../save-html.c" line="455"/>
@ -6914,12 +6914,12 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../save-html.c" line="456"/>
<source>Air temp.</source>
<translation type="unfinished"/>
<translation>Temperatur Udara</translation>
</message>
<message>
<location filename="../save-html.c" line="457"/>
<source>Water temp.</source>
<translation type="unfinished"/>
<translation>Temperatur air</translation>
</message>
<message>
<location filename="../save-html.c" line="462"/>
@ -6984,7 +6984,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../save-html.c" line="472"/>
<source>Tags</source>
<translation type="unfinished"/>
<translation>Tag</translation>
</message>
<message>
<location filename="../save-html.c" line="473"/>
@ -7039,7 +7039,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../save-html.c" line="485"/>
<source>Max. depth</source>
<translation type="unfinished"/>
<translation>Kedalaman Maks.</translation>
</message>
<message>
<location filename="../save-html.c" line="487"/>
@ -7084,12 +7084,12 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../save-html.c" line="502"/>
<source>Start pressure</source>
<translation type="unfinished"/>
<translation>Tekanan awal</translation>
</message>
<message>
<location filename="../save-html.c" line="503"/>
<source>End pressure</source>
<translation type="unfinished"/>
<translation>Tekanan akhir</translation>
</message>
<message>
<location filename="../save-html.c" line="511"/>

View file

@ -51,7 +51,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
<translation type="unfinished"/>
<translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@ -66,12 +66,12 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
<translation type="unfinished"/>
<translation>Pressão inicial</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
<translation type="unfinished"/>
<translation>Pressão final</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@ -116,12 +116,12 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O</source>
<translation type="unfinished"/>
<translation>O</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
<translation type="unfinished"/>
<translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@ -189,7 +189,7 @@
<message>
<location filename="../configuredivecomputer.cpp" line="561"/>
<source>Setting successfully written to device</source>
<translation type="unfinished"/>
<translation>Configurações armazenadas com sucesso</translation>
</message>
<message>
<location filename="../configuredivecomputer.cpp" line="570"/>
@ -227,22 +227,22 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="67"/>
<source>Save changes to device</source>
<translation type="unfinished"/>
<translation>Salvar alterações no dispositivo</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="93"/>
<source>Backup</source>
<translation type="unfinished"/>
<translation>Backup</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="100"/>
<source>Restore backup</source>
<translation type="unfinished"/>
<translation>Restaurar backup</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="110"/>
<source>Update firmware</source>
<translation type="unfinished"/>
<translation>Atualizar firmware</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="134"/>
@ -266,14 +266,14 @@
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1337"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1634"/>
<source>Serial No.</source>
<translation type="unfinished"/>
<translation>No. Serial</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="239"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1360"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1657"/>
<source>Firmware version</source>
<translation type="unfinished"/>
<translation>Versão da firmware</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="256"/>
@ -290,22 +290,22 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="290"/>
<source>English</source>
<translation type="unfinished"/>
<translation>Inglês</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="295"/>
<source>German</source>
<translation type="unfinished"/>
<translation>Alemão</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="300"/>
<source>French</source>
<translation type="unfinished"/>
<translation>Francês</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="305"/>
<source>Italian</source>
<translation type="unfinished"/>
<translation>Italiano</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
@ -337,28 +337,28 @@
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="347"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1802"/>
<source>Date format</source>
<translation type="unfinished"/>
<translation>Formato da data</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
<source>MMDDYY</source>
<translation type="unfinished"/>
<translation>MMDDAA</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="363"/>
<source>DDMMYY</source>
<translation type="unfinished"/>
<translation>DDMMAA</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="368"/>
<source>YYMMDD</source>
<translation type="unfinished"/>
<translation>AAMMDD</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="841"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2022"/>
<source>Saturation</source>
<translation type="unfinished"/>
<translation>Saturação</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="439"/>
@ -409,7 +409,7 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="392"/>
<source>Medium</source>
<translation type="unfinished"/>
<translation>Médio</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="397"/>
@ -425,13 +425,13 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="533"/>
<source>2s</source>
<translation type="unfinished"/>
<translation>2s</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="538"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1450"/>
<source>10s</source>
<translation type="unfinished"/>
<translation>10s</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/>
@ -442,7 +442,7 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="416"/>
<source>m/°C</source>
<translation type="unfinished"/>
<translation>m/°C</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="421"/>
@ -462,22 +462,22 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
<source>Red</source>
<translation type="unfinished"/>
<translation>Vermelho</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
<source>Green</source>
<translation type="unfinished"/>
<translation>Verde</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
<source>Blue</source>
<translation type="unfinished"/>
<translation>Azul</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="429"/>
<source>Salinity (0-5%)</source>
<translation type="unfinished"/>
<translation>Salinidade (0-5%)</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="580"/>
@ -554,7 +554,7 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="597"/>
<source>Reset device to default settings</source>
<translation type="unfinished"/>
<translation>Restaurar para configurações padrão</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="611"/>
@ -571,7 +571,7 @@
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/>
<source>Advanced settings</source>
<translation type="unfinished"/>
<translation>Configurações avançadas</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/>
@ -653,7 +653,7 @@
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2127"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2212"/>
<source>%He</source>
<translation type="unfinished"/>
<translation>%He</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="926"/>
@ -675,31 +675,31 @@
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="936"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2142"/>
<source>Gas 1</source>
<translation type="unfinished"/>
<translation>Gás 1</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="941"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2147"/>
<source>Gas 2</source>
<translation type="unfinished"/>
<translation>Gás 2</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="946"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2152"/>
<source>Gas 3</source>
<translation type="unfinished"/>
<translation>Gás 3</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="951"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2157"/>
<source>Gas 4</source>
<translation type="unfinished"/>
<translation>Gás 4</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="956"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2162"/>
<source>Gas 5</source>
<translation type="unfinished"/>
<translation>Gás 5</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1021"/>
@ -779,7 +779,7 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1153"/>
<source>Sensor</source>
<translation type="unfinished"/>
<translation>Sensor</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1161"/>
@ -814,7 +814,7 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/>
<source>kg/</source>
<translation type="unfinished"/>
<translation>kg/</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/>
@ -832,7 +832,7 @@
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2122"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2207"/>
<source>%O</source>
<translation type="unfinished"/>
<translation>%O</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1124"/>
@ -843,13 +843,13 @@
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/>
<source>pO max</source>
<translation type="unfinished"/>
<translation>pO max</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/>
<source>pO min</source>
<translation type="unfinished"/>
<translation>pO min</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1290"/>
@ -886,17 +886,17 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1455"/>
<source>20s</source>
<translation type="unfinished"/>
<translation>20s</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1460"/>
<source>30s</source>
<translation type="unfinished"/>
<translation>30s</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1465"/>
<source>60s</source>
<translation type="unfinished"/>
<translation>60s</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/>
@ -912,17 +912,17 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1511"/>
<source>24h</source>
<translation type="unfinished"/>
<translation>24h</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1516"/>
<source>12h</source>
<translation type="unfinished"/>
<translation>12h</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1524"/>
<source>Time format</source>
<translation type="unfinished"/>
<translation>Formato da hora</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1539"/>
@ -937,7 +937,7 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1555"/>
<source>s</source>
<translation type="unfinished"/>
<translation>s</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1562"/>
@ -962,17 +962,17 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/>
<source>MM/DD/YY</source>
<translation type="unfinished"/>
<translation>MM/DD/AA</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1746"/>
<source>DD/MM/YY</source>
<translation type="unfinished"/>
<translation>DD/MM/AA</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1751"/>
<source>YY/MM/DD</source>
<translation type="unfinished"/>
<translation>AA/MM/DD</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1935"/>
@ -998,7 +998,7 @@
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1050"/>
<source>Backup files (*.xml)</source>
<translation type="unfinished"/>
<translation>Arquivos de backup (*.xml)</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1034"/>
@ -1024,7 +1024,7 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1033"/>
<source>XML backup error</source>
<translation type="unfinished"/>
<translation>Erro no XML de backup</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1049"/>
@ -1060,7 +1060,7 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1072"/>
<source>All files (*.*)</source>
<translation type="unfinished"/>
<translation>Todos arquivos (*.*)</translation>
</message>
</context>
<context>
@ -1098,7 +1098,7 @@
<message>
<location filename="../qt-ui/models.cpp" line="78"/>
<source>O%</source>
<translation type="unfinished"/>
<translation>O%</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="79"/>
@ -1151,7 +1151,7 @@
<message>
<location filename="../qt-ui/divecomponentselection.ui" line="60"/>
<source>GPS coordinates</source>
<translation type="unfinished"/>
<translation>Coordenadas do GPS</translation>
</message>
<message>
<location filename="../qt-ui/divecomponentselection.ui" line="67"/>
@ -1262,7 +1262,7 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="562"/>
<source>Date/time</source>
<translation type="unfinished"/>
<translation>Data/hora</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="564"/>
@ -1277,7 +1277,7 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="588"/>
<source>h:</source>
<translation type="unfinished"/>
<translation>h:</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="588"/>
@ -1355,7 +1355,7 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/models.cpp" line="1275"/>
<source>Gas</source>
<translation type="unfinished"/>
<translation>Gás</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="1280"/>
@ -1774,17 +1774,17 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
<source>dd.mm.yyyy</source>
<translation type="unfinished"/>
<translation>dd.mm.aaaa</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
<source>mm/dd/yyyy</source>
<translation type="unfinished"/>
<translation>mm/dd/aaaa</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
<source>yyyy-mm-dd</source>
<translation type="unfinished"/>
<translation>aaaa-mm-dd</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
@ -1809,7 +1809,7 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
<translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
@ -1819,12 +1819,12 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O</source>
<translation type="unfinished"/>
<translation>O</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
<translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
@ -1839,7 +1839,7 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
<source>Minutes:seconds</source>
<translation type="unfinished"/>
<translation>Minutos:segundos</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
@ -1856,7 +1856,7 @@ o computador de mergulho selecionado?</translation>
<location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
<location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
<translation>Tab</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
@ -1969,12 +1969,12 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
<translation>Pressão inicial</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
<translation>Pressão final</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
@ -2022,7 +2022,7 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/diveplanner.ui" line="220"/>
<source> kg/</source>
<translation type="unfinished"/>
<translation> kg/</translation>
</message>
</context>
<context>
@ -2146,17 +2146,17 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
<source>Sensor 1</source>
<translation type="unfinished"/>
<translation>Sensor 1</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
<source>Sensor 2</source>
<translation type="unfinished"/>
<translation>Sensor 2</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
<source>Sensor 3</source>
<translation type="unfinished"/>
<translation>Sensor 3</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
@ -2318,7 +2318,7 @@ o computador de mergulho selecionado?</translation>
<location filename="../qt-ui/models.cpp" line="1470"/>
<location filename="../qt-ui/models.cpp" line="1516"/>
<source>Gas</source>
<translation type="unfinished"/>
<translation>Gás</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="1521"/>
@ -2586,12 +2586,12 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
<translation type="unfinished"/>
<translation>Selecionar tudo</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
<translation type="unfinished"/>
<translation>Desfazer seleções</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@ -3359,7 +3359,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/mainwindow.ui" line="566"/>
<source>&amp;Check for updates</source>
<translation>&amp;Checar por updates</translation>
<translation>&amp;Buscar atualizações</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.ui" line="571"/>
@ -3700,7 +3700,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
<source>Update firmware</source>
<translation type="unfinished"/>
<translation>Atualizar firmware</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
@ -3838,7 +3838,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="208"/>
<source>Use default</source>
<translation type="unfinished"/>
<translation>Usar padrão</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="218"/>
@ -3974,7 +3974,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="875"/>
<source>System default</source>
<translation type="unfinished"/>
<translation>Padrão do sistema</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="914"/>
@ -4034,7 +4034,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="196"/>
<source>Default dive log file</source>
<translation type="unfinished"/>
<translation>Arquivo de log padrão</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="227"/>
@ -4044,12 +4044,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="244"/>
<source>Default cylinder</source>
<translation type="unfinished"/>
<translation>Cilindro padrão</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="250"/>
<source>Use default cylinder</source>
<translation type="unfinished"/>
<translation>Usar o cilindro padrão</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="300"/>
@ -4059,7 +4059,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="306"/>
<source>Default user ID</source>
<translation type="unfinished"/>
<translation>ID de usuário padrão</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="316"/>
@ -4214,7 +4214,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.cpp" line="503"/>
<source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
<translation type="unfinished"/>
<translation>Se você clicar em OK, todas as configurações do Subsurface vão ser restauradas para os valores padrão. Isso será aplicado imediatamente. </translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="489"/>
@ -4224,7 +4224,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.cpp" line="489"/>
<source>Open default log file</source>
<translation type="unfinished"/>
<translation>Abrir arquivo de log padrão</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="502"/>
@ -4827,7 +4827,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<location filename="../qt-ui/socialnetworks.cpp" line="287"/>
<source>h:</source>
<comment>abbreviation for hours plus separator</comment>
<translation type="unfinished"/>
<translation>h:</translation>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="288"/>
@ -5084,7 +5084,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/updatemanager.cpp" line="82"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface não conseguiu localizar updates</translation>
<translation>Subsurface não conseguiu localizar atualizações</translation>
</message>
<message>
<location filename="../qt-ui/updatemanager.cpp" line="87"/>
@ -5139,12 +5139,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/updatemanager.cpp" line="138"/>
<source>Accept</source>
<translation type="unfinished"/>
<translation>Aceitar</translation>
</message>
<message>
<location filename="../qt-ui/updatemanager.cpp" line="140"/>
<source>Automatic check for updates</source>
<translation type="unfinished"/>
<translation>Buscar atualizações automaticamente</translation>
</message>
</context>
<context>
@ -7128,12 +7128,12 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../save-html.c" line="502"/>
<source>Start pressure</source>
<translation type="unfinished"/>
<translation>Pressão inicial</translation>
</message>
<message>
<location filename="../save-html.c" line="503"/>
<source>End pressure</source>
<translation type="unfinished"/>
<translation>Pressão final</translation>
</message>
<message>
<location filename="../save-html.c" line="511"/>
@ -7174,7 +7174,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../save-html.c" line="504"/>
<source>Gas</source>
<translation type="unfinished"/>
<translation>Gás</translation>
</message>
<message>
<location filename="../save-html.c" line="505"/>

File diff suppressed because it is too large Load diff

View file

@ -96,12 +96,12 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
<translation>Lufttemp</translation>
<translation>Lufttemp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
<translation>Vattentemperatur</translation>
<translation>Vattentemp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@ -266,7 +266,7 @@
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1337"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1634"/>
<source>Serial No.</source>
<translation>Serienummer.</translation>
<translation>Serienummer</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="239"/>
@ -741,7 +741,7 @@
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1091"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2287"/>
<source>Change depth [m]</source>
<translation>Bytesljup [m]</translation>
<translation>Bytesdjup [m]</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1096"/>
@ -1020,7 +1020,7 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
<source>Backup dive computer settings</source>
<translation>Backuppa dykdatorns inställningar</translation>
<translation>Säkerhetskopiera dykdatorns inställningar</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1033"/>
@ -3283,7 +3283,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/mainwindow.ui" line="345"/>
<source>P&amp;references</source>
<translation>Inställning&amp;r</translation>
<translation>Inställninga&amp;r</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.ui" line="375"/>
@ -3293,7 +3293,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/mainwindow.ui" line="396"/>
<source>&amp;Copy dive components</source>
<translation>Kopiera dyk-komponeneter</translation>
<translation>Kopiera dykkomponenter</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.ui" line="399"/>
@ -3328,7 +3328,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/mainwindow.ui" line="476"/>
<source>&amp;Next DC</source>
<translation>&amp;Nästa DC</translation>
<translation>&amp;Nästa dykdator</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.ui" line="484"/>
@ -4200,12 +4200,12 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
<message>
<location filename="../qt-ui/preferences.cpp" line="80"/>
<source>To disconnect Subsurface from your Facebook account, use the button below</source>
<translation type="unfinished"/>
<translation>Använd knappen nedan för att koppla Subsurface till ditt Facebook-konto.</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="94"/>
<source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
<translation type="unfinished"/>
<translation>Logga in för att koppla Subsurface till Facebook. Det tillgängliggör möjligheten att publicera dyk till din Facebook-timeline.</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="333"/>
@ -5218,12 +5218,12 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
<message>
<location filename="../qt-ui/usersurvey.ui" line="102"/>
<source>Supported dive computer</source>
<translation>Stödd dykdator</translation>
<translation>Kompatibel dykdator</translation>
</message>
<message>
<location filename="../qt-ui/usersurvey.ui" line="141"/>
<source>Android/iPhone companion app</source>
<translation type="unfinished"/>
<translation>Android/iPhone följeslagar-app</translation>
</message>
<message>
<location filename="../qt-ui/usersurvey.ui" line="154"/>

View file

@ -15,6 +15,7 @@
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include "gettext.h"
#include "libdivecomputer.h"
@ -440,6 +441,11 @@ static bool uemis_get_answer(const char *path, char *request, int n_param_in,
int timeout = UEMIS_LONG_TIMEOUT;
reqtxt_file = subsurface_open(reqtxt_path, O_RDWR | O_CREAT, 0666);
if (reqtxt_file == -1) {
*error_text = "can't open req.txt";
fprintf(stderr, "open %s failed with errno %d\n", reqtxt_path, errno);
return false;
}
snprintf(sb, BUFLEN, "n%04d12345678", filenr);
str_append_with_delim(sb, request);
for (i = 0; i < n_param_in; i++)