summaryrefslogtreecommitdiffstats
path: root/translations/subsurface_nb_NO.ts
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2016-12-12 09:25:32 +0900
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-12-12 09:25:32 +0900
commitc7cadab27cd09392d60763178276647c923d752c (patch)
tree733e82067ae4162a942837a7615991dcfb4acd10 /translations/subsurface_nb_NO.ts
parentb01722e8154626d44dc8425d35e7b8245c9ac11c (diff)
downloadsubsurface-c7cadab27cd09392d60763178276647c923d752c.tar.gz
Latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_nb_NO.ts')
-rw-r--r--translations/subsurface_nb_NO.ts6713
1 files changed, 3391 insertions, 3322 deletions
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index ac0549e81..8f1f110da 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -105,6 +105,11 @@
<translation>Navn:</translation>
</message>
<message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+ <source>Could not initialize Winsock version 2.2</source>
+ <translation>Kunne ikke starte Winsock version 2.2</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
<source>Trying to turn on the local Bluetooth device...</source>
<translation>Prøver å skru på lokal bluetooth-enhet...</translation>
@@ -115,6 +120,11 @@
<translation>Prøver å skru av lokal bluetooth-enhet...</translation>
</message>
<message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+ <source>Remote devices list was cleared.</source>
+ <translation>Enhetsliste ble slettet.</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
<source>Scanning for remote devices...</source>
<translation>Leter etter enheter...</translation>
@@ -125,6 +135,22 @@
<translation>Scanning ferdig.</translation>
</message>
<message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+ <source>The local Bluetooth device was %1.</source>
+ <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+ <translation>Den lokale Bluetooth-enheten ble %1.</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+ <source>turned on</source>
+ <translation>skrudd på</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+ <source>turned off</source>
+ <translation>skrudd av</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
<translation>Par</translation>
</message>
<message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
- <source>Device %1 was paired and is authorized.</source>
- <translation>%1 ble paret og er autorisert.</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
- <source>Could not initialize Winsock version 2.2</source>
- <translation>Kunne ikke starte Winsock version 2.2</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
- <source>Remote devices list was cleared.</source>
- <translation>Enhetsliste ble slettet.</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
- <source>The local Bluetooth device was %1.</source>
- <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
- <translation>Den lokale Bluetooth-enheten ble %1.</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
- <source>turned on</source>
- <translation>skrudd på</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
- <source>turned off</source>
- <translation>skrudd av</translation>
- </message>
- <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
<source>Remove pairing</source>
<translation>Fjern paring</translation>
@@ -228,6 +223,11 @@
<translation>%1 er paret.</translation>
</message>
<message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+ <source>Device %1 was paired and is authorized.</source>
+ <translation>%1 ble paret og er autorisert.</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
<source>The device %1 can now be used for connection. You can press the Save button.</source>
<translation>%1 kan nå bli bruk til forbindelse. Trykk &quot;Lagre&quot;-knappen.</translation>
@@ -286,12 +286,12 @@
<context>
<name>BuddyFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
<source>Person: </source>
<translation>Person: </translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
<source>Searches for buddies and divemasters</source>
<translation>Søk etter buddyer og dykkeledere</translation>
</message>
@@ -299,7 +299,7 @@
<context>
<name>BuddyFilterModel</name>
<message>
- <location filename="../qt-models/filtermodels.cpp" line="243"/>
+ <location filename="../qt-models/filtermodels.cpp" line="248"/>
<source>No buddies</source>
<translation>Ingen buddyer</translation>
</message>
@@ -307,25 +307,30 @@
<context>
<name>CloudCredentials</name>
<message>
- <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
<source>Cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
<source>Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
<source>Password</source>
<translation>Passord</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
<source>Show password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+ <source>PIN</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
</message>
<message>
<location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+ <source>Max. depth</source>
+ <translation>Maksdybde</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+ <source>Avg. depth</source>
+ <translation>Snittdybde</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
<source>Divemaster</source>
<translation>Dykkeleder</translation>
</message>
@@ -391,6 +406,11 @@
</message>
<message>
<location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+ <source>Suit</source>
+ <translation>Drakt</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
<source>Notes</source>
<translation>Notater</translation>
</message>
@@ -410,21 +430,6 @@
<translation>Vanntemp.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
- <source>Max. depth</source>
- <translation>Maksdybde</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
- <source>Avg. depth</source>
- <translation>Snittdybde</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
- <source>Suit</source>
- <translation>Drakt</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
<source>O₂</source>
<translation>O₂</translation>
@@ -538,7 +543,7 @@
<translation>Kunne ikke opprette kontekst for libdivecomputer</translation>
</message>
<message>
- <location filename="../core/configuredivecomputer.cpp" line="660"/>
+ <location filename="../core/configuredivecomputer.cpp" line="656"/>
<source>Could not a establish connection to the dive computer.</source>
<translation>Klarte ikke å koble til computeren.</translation>
</message>
@@ -558,11 +563,19 @@
<translation>Enhet eller disk</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
- <source>...</source>
- <translation>...</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+ <source>Connect via Bluetooth</source>
+ <translation>Koble til med Bluetooth</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+ <source>Connect</source>
+ <translation>Koble til</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+ <source>Disconnect</source>
+ <translation>Koble fra</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
<translation>Hent tilgjengelige data</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+ <source>Read settings from backup file or from device before writing to the device</source>
+ <translation>Les innstillinger fra sikkerhetskopi eller fra dykkecomputeren før det skrives til den</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
<source>Save changes to device</source>
<translation>Lagre endringer til computer</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+ <source>Read settings from backup file or from device before writing to a backup file</source>
+ <translation>Les innstillinger fra sikkerhetskopi eller fra dykkecomputeren før lagring til sikkerhetskopi</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
<source>Backup</source>
@@ -595,15 +620,40 @@
<translation>Oppdater firmware</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+ <source>Save libdivecomputer logfile</source>
+ <translation>Lagre loggfil fra libdivecomputer</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<message>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
- <source>OSTC 3</source>
- <translation>OSTC 3</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+ <source>OSTC 3,Sport,Cr,2</source>
+ <translation>OSTC 3,Sport,Cr,2</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+ <source>Suunto Vyper family</source>
+ <translation>Suunty Vyper-familien</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+ <source>OSTC, Mk.2/2N/2C</source>
+ <translation>OSTC, Mk.2/2N/2C</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +666,56 @@
<translation>Innstillinger</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
- <source>Serial No.</source>
- <translation>Serienr.</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+ <source>Eco</source>
+ <translation>Øko</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
- <source>Firmware version</source>
- <translation>Firmware-versjon</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+ <source>Medium</source>
+ <translation>Medium</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
- <source>Custom text</source>
- <translation>Tekst</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+ <source>High</source>
+ <translation>Høy</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
- <source>Language</source>
- <translation>Språk</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+ <source>%</source>
+ <translation>%</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +742,36 @@
<translation>Italiensk</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
- <source>Dive mode</source>
- <translation>Dykkemodus</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
- <source>OC</source>
- <translation>OC</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
- <source>CC</source>
- <translation>CC</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+ <source>m/°C</source>
+ <translation>m/°C</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
- <source>Gauge</source>
- <translation>Gauge</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+ <source>ft/°F</source>
+ <translation>ft/°F</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
- <source>Apnea</source>
- <translation>Fridykking</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+ <source>Serial No.</source>
+ <translation>Serienr.</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
- <source>Date format</source>
- <translation>Datoformat</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+ <source>Firmware version</source>
+ <translation>Firmware-versjon</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +792,147 @@
<translation>ÅÅMMDD</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
- <source>Saturation</source>
- <translation>Metning</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+ <source>Language</source>
+ <translation>Språk</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
- <source>%</source>
- <translation>%</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+ <source>Date format</source>
+ <translation>Datoformat</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
- <source>Desaturation</source>
- <translation>Avmetning</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+ <source>Brightness</source>
+ <translation>Lysstyrke</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
- <source>Last deco</source>
- <translation>Siste deko</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+ <source>Units</source>
+ <translation>Enheter</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
- <source> m</source>
- <translation>m</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+ <source>Salinity (0-5%)</source>
+ <translation>Saltnivå (0-5%)</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
- <source>Brightness</source>
- <translation>Lysstyrke</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+ <source>Reset device to default settings</source>
+ <translation>Resett dykkecomputer til standardinnstillinger</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
- <source>Eco</source>
- <translation>Øko</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+ <source>230LSB/Gauss</source>
+ <translation>230LSB/Gauss</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
- <source>Medium</source>
- <translation>Medium</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+ <source>330LSB/Gauss</source>
+ <translation>330LSB/Gauss</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
- <source>High</source>
- <translation>Høy</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+ <source>390LSB/Gauss</source>
+ <translation>390LSB/Gauss</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
- <source>Sampling rate</source>
- <translation>Samplingsfrekvens</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+ <source>440LSB/Gauss</source>
+ <translation>440LSB/Gauss</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+ <source>660LSB/Gauss</source>
+ <translation>660LSB/Gauss</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+ <source>820LSB/Gauss</source>
+ <translation>820LSB/Gauss</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+ <source>1090LSB/Gauss</source>
+ <translation>1090LSB/Gauss</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+ <source>1370LSB/Gauss</source>
+ <translation>1370LSB/Gauss</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+ <source>Compass gain</source>
+ <translation>Kompassdeviasjon</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+ <source>Computer model</source>
+ <translation>Computermodell</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+ <source>Custom text</source>
+ <translation>Tekst</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+ <source>OC</source>
+ <translation>OC</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+ <source>CC</source>
+ <translation>CC</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+ <source>Gauge</source>
+ <translation>Gauge</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+ <source>Apnea</source>
+ <translation>Fridykking</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+ <source>Dive mode</source>
+ <translation>Dykkemodus</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +949,12 @@
<translation>10s</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
- <source>Units</source>
- <translation>Enheter</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
- <source>m/°C</source>
- <translation>m/°C</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
- <source>ft/°F</source>
- <translation>ft/°F</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
- <source>Dive mode color</source>
- <translation>Dykkemodusfarge</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+ <source>Sampling rate</source>
+ <translation>Samplingsfrekvens</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +981,6 @@
<translation>Blå</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
- <source>Salinity (0-5%)</source>
- <translation>Saltnivå (0-5%)</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +989,80 @@
<translation>Synkroniser tid på dykkecomputer med PC</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
- <source>Compass gain</source>
- <translation>Kompassdeviasjon</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
- <source>Read settings from backup file or from device before writing to the device</source>
- <translation>Les innstillinger fra sikkerhetskopi eller fra dykkecomputeren før det skrives til den</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
- <source>Read settings from backup file or from device before writing to a backup file</source>
- <translation>Les innstillinger fra sikkerhetskopi eller fra dykkecomputeren før lagring til sikkerhetskopi</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
- <source>OSTC, Mk.2/2N/2C</source>
- <translation>OSTC, Mk.2/2N/2C</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+ <source>Dive mode color</source>
+ <translation>Dykkemodusfarge</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
- <source>230LSB/Gauss</source>
- <translation>230LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+ <source>Show safety stop</source>
+ <translation>Vis sikkerhetsstop</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
- <source>330LSB/Gauss</source>
- <translation>330LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+ <source>End Depth</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
- <source>390LSB/Gauss</source>
- <translation>390LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+ <source> s</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
- <source>440LSB/Gauss</source>
- <translation>440LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+ <source>Length</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
- <source>660LSB/Gauss</source>
- <translation>660LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+ <source>Start Depth</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
- <source>820LSB/Gauss</source>
- <translation>820LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+ <source>Reset Depth</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
- <source>1090LSB/Gauss</source>
- <translation>1090LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+ <source> m</source>
+ <translation>m</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
- <source>1370LSB/Gauss</source>
- <translation>1370LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+ <source>Advanced settings</source>
+ <translation>Avanserte innstillinger</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
- <source>Show safety stop</source>
- <translation>Vis sikkerhetsstop</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+ <source>Left button sensitivity</source>
+ <translation>Sensitivitet på venstre knapp</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
- <source>Reset device to default settings</source>
- <translation>Resett dykkecomputer til standardinnstillinger</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+ <source>Always show ppO2</source>
+ <translation>Vis alltid ppO₂</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1073,6 @@
<translation>Alternativ GF kan velges under dykk</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
- <source>Suunto Vyper family</source>
- <translation>Suunty Vyper-familien</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
- <source>Advanced settings</source>
- <translation>Avanserte innstillinger</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
<translation>GF høy</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+ <source>Desaturation</source>
+ <translation>Avmetning</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
<translation>mbar</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
- <source> min</source>
- <translation>min</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1133,28 @@
<translation>ZH-L16</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
- <source>Connect via Bluetooth</source>
- <translation>Koble til med Bluetooth</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
- <source>Save libdivecomputer logfile</source>
- <translation>Lagre loggfil fra libdivecomputer</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
- <source>End Depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
- <source> s</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
- <source>Length</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
- <source>Start Depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
- <source>Reset Depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
- <source>Left button sensitivity</source>
- <translation>Sensitivitet på venstre knapp</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
- <source>Always show ppO2</source>
- <translation>Vis alltid ppO₂</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
<source>ZH-L16+GF</source>
<translation>ZH-L16+GF</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+ <source> min</source>
+ <translation>min</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+ <source>Last deco</source>
+ <translation>Siste deko</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1171,14 @@
<translation>Alt GF-Høy</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+ <source>Saturation</source>
+ <translation>Metning</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
<source>Flip screen</source>
@@ -1168,12 +1190,22 @@
<translation>Sensitivitet på høyre knap</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+ <source>MOD warning</source>
+ <translation>MOD-advarsel</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
<source>Graphical speed indicator</source>
<translation>Grafisk fartsindikator</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+ <source>Dynamic ascent rate</source>
+ <translation>Dynamisk oppstigningshastighet</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
<source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
<translation>Gassforbruk på dekogass</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+ <source> ℓ/min</source>
+ <translation> ℓ/min</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
<source>Temperature sensor offset</source>
<translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
<translation>Gassvalg</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+ <source>%O₂</source>
+ <translation>%O₂</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,16 +1374,10 @@
<translation>Dil 5</translation>
</message>
<message>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
- <source>Set point [cbar]</source>
- <translation>Settpunkt [cbar]</translation>
- </message>
- <message>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
- <source>Change depth [m]</source>
- <translation>Endre dybde [m]</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+ <source>Setpoint</source>
+ <translation>Settpunkt</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1370,6 +1416,12 @@
<translation>SP 5</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+ <source>O₂ in calibration gas</source>
+ <translation>O₂ i kalibreringsgass</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
<source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
<translation>cbar</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
- <source>P1 (medium)</source>
- <extracomment>Suunto safety level</extracomment>
- <translation>P1 (medium)</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
- <source>P2 (high)</source>
- <extracomment>Suunto safety level</extracomment>
- <translation>P2 (høy)</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
- <source>Total dive time</source>
- <translation>Total dykketid</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
- <source>kg/ℓ</source>
- <translation>kg/ℓ</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
- <source>Apnoea</source>
- <translation>Apnea</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
- <source>Safety level</source>
- <translation>Sikkerhetsnivå</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
- <source>Connect</source>
- <translation>Koble til</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
- <source>Disconnect</source>
- <translation>Koble fra</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
- <source>OSTC 3,Sport,Cr,2</source>
- <translation>OSTC 3,Sport,Cr,2</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
- <source>MOD warning</source>
- <translation>MOD-advarsel</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
- <source>Dynamic ascent rate</source>
- <translation>Dynamisk oppstigningshastighet</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
- <source> ℓ/min</source>
- <translation> ℓ/min</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
- <source>%O₂</source>
- <translation>%O₂</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
- <source>Setpoint</source>
- <translation>Settpunkt</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
- <source>O₂ in calibration gas</source>
- <translation>O₂ i kalibreringsgass</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
<translation>pO₂ min</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+ <source>Safety level</source>
+ <translation>Sikkerhetsnivå</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
<source>Altitude range</source>
@@ -1544,6 +1507,20 @@
<translation>P0 (ingen)</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+ <source>P1 (medium)</source>
+ <extracomment>Suunto safety level</extracomment>
+ <translation>P1 (medium)</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+ <source>P2 (high)</source>
+ <extracomment>Suunto safety level</extracomment>
+ <translation>P2 (høy)</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
<source>Sample rate</source>
@@ -1568,11 +1545,10 @@
<translation>60s</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
- <source>Computer model</source>
- <translation>Computermodell</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+ <source>Total dive time</source>
+ <translation>Total dykketid</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1613,6 @@
<translation>Tidsalarm</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
- <source>Salinity</source>
- <translation>Saltholdighet</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
<source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
<translation>ÅÅ/MM/DD</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+ <source>Salinity</source>
+ <translation>Saltholdighet</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+ <source>kg/ℓ</source>
+ <translation>kg/ℓ</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
<source>ZH-L16 CC</source>
<translation>ZH-L16 CC</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+ <source>Apnoea</source>
+ <translation>Apnea</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
<source>L16-GF OC</source>
@@ -1685,87 +1673,112 @@
<translation>PSCR-GF</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+ <source>OSTC 3</source>
+ <translation>OSTC 3</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+ <source>Set point [cbar]</source>
+ <translation>Settpunkt [cbar]</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+ <source>Change depth [m]</source>
+ <translation>Endre dybde [m]</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+ <source>Backup dive computer settings</source>
+ <translation>Backupinnstillinger for computer</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
<source>Backup files (*.xml)</source>
<translation>Backupfil (*.xml)</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+ <source>XML backup error</source>
+ <translation>Feil ved XML-backup</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
<source>An error occurred while saving the backup file.
%1</source>
<translation>En feil inntraff under lagring av backupfila.
%1</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
<source>Backup succeeded</source>
<translation>Backup OK</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
<source>Your settings have been saved to: %1</source>
<translation>Instillingene ble lagret til: %1</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
- <source>Backup dive computer settings</source>
- <translation>Backupinnstillinger for computer</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
- <source>XML backup error</source>
- <translation>Feil ved XML-backup</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
<source>Restore dive computer settings</source>
<translation>Gjenopprett computerinnstillinger</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
<source>XML restore error</source>
<translation>Feil ved gjenoppretting fra XML</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
<source>An error occurred while restoring the backup file.
%1</source>
<translation>En feil inntraff ved gjenoppretting av backupfila.
%1</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
<source>Restore succeeded</source>
<translation>Gjenoppretting OK</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
<source>Your settings have been restored successfully.</source>
<translation>Innstillingene dine har blitt gjenopprettet.</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
<source>Select firmware file</source>
<translation>Velg firmware-fil</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
<source>All files (*.*)</source>
<translation>Alle filer (*.*)</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
<source>Choose file for divecomputer download logfile</source>
<translation>Velg fil som loggfil for dykkecomputer</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
<source>Log files (*.log)</source>
<translation>Loggfiler (*.log)</translation>
</message>
</context>
<context>
+ <name>ContextDrawer</name>
+ <message>
+ <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+ <source>Actions</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>CylindersModel</name>
<message>
<location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1792,6 @@
</message>
<message>
<location filename="../qt-models/cylindermodel.cpp" line="16"/>
- <source>He%</source>
- <translation>He%</translation>
- </message>
- <message>
- <location filename="../qt-models/cylindermodel.cpp" line="16"/>
<source>Work press.</source>
<translation>Trykkrating</translation>
</message>
@@ -1803,9 +1811,24 @@
<translation>O₂%</translation>
</message>
<message>
+ <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+ <source>He%</source>
+ <translation>He%</translation>
+ </message>
+ <message>
<location filename="../qt-models/cylindermodel.cpp" line="17"/>
- <source>Switch at</source>
- <translation>Gassbytte ved</translation>
+ <source>Deco switch at</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+ <source>Bot. MOD</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+ <source>MND</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1846,32 @@
<translation>ℓ</translation>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="177"/>
<source>Clicking here will remove this cylinder.</source>
<translation>Klikk her for å fjerne denne flaska.</translation>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+ <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+ <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+ <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="444"/>
<source>Cylinder cannot be removed</source>
<translation>Flaska kan ikke fjernes</translation>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="445"/>
<source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
<translation>Gassen er i bruk. Bare flasker som ikke er i bruk kan fjernes.</translation>
</message>
@@ -1853,42 +1891,24 @@
<translation>Hvilke komponenter vil du kopiere</translation>
</message>
<message>
+ <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+ <location filename="../build/ui_divecomponentselection.h" line="141"/>
+ <source>Dive site</source>
+ <translation>Dykkested</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
<location filename="../build/ui_divecomponentselection.h" line="142"/>
<source>Suit</source>
<translation>Drakt</translation>
</message>
<message>
- <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
- <location filename="../build/ui_divecomponentselection.h" line="148"/>
- <source>Divemaster</source>
- <translation>Dykkeleder</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
- <location filename="../build/ui_divecomponentselection.h" line="149"/>
- <source>Buddy</source>
- <translation>Buddy</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
- <location filename="../build/ui_divecomponentselection.h" line="150"/>
- <source>Rating</source>
- <translation>Vurdering</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
<location filename="../build/ui_divecomponentselection.h" line="143"/>
<source>Visibility</source>
<translation>Sikt</translation>
</message>
<message>
- <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
- <location filename="../build/ui_divecomponentselection.h" line="141"/>
- <source>Dive site</source>
- <translation>Dykkested</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
<location filename="../build/ui_divecomponentselection.h" line="144"/>
<source>Notes</source>
@@ -1912,10 +1932,34 @@
<source>Cylinders</source>
<translation>Flasker</translation>
</message>
+ <message>
+ <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+ <location filename="../build/ui_divecomponentselection.h" line="148"/>
+ <source>Divemaster</source>
+ <translation>Dykkeleder</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+ <location filename="../build/ui_divecomponentselection.h" line="149"/>
+ <source>Buddy</source>
+ <translation>Buddy</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+ <location filename="../build/ui_divecomponentselection.h" line="150"/>
+ <source>Rating</source>
+ <translation>Vurdering</translation>
+ </message>
</context>
<context>
<name>DiveComputerManagementDialog</name>
<message>
+ <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+ <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+ <source>Edit dive computer nicknames</source>
+ <translation>Rediger computerens navn</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
<source>Remove the selected dive computer?</source>
<translation>Fjern valgte dykkecomputer?</translation>
@@ -1926,12 +1970,6 @@
remove the selected dive computer?</source>
<translation>Vil du fjerne den valgte computeren?</translation>
</message>
- <message>
- <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
- <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
- <source>Edit dive computer nicknames</source>
- <translation>Rediger computerens navn</translation>
- </message>
</context>
<context>
<name>DiveComputerModel</name>
@@ -1959,17 +1997,17 @@
<context>
<name>DiveDetails</name>
<message>
- <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+ <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
<source>Dive details</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+ <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
<source>Delete dive</source>
<translation>Slett dykk</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+ <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
<source>Show on map</source>
<translation type="unfinished"/>
</message>
@@ -1977,88 +2015,93 @@
<context>
<name>DiveDetailsEdit</name>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
<source>Dive %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
<source>Date:</source>
<translation>Dato:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
<source>Location:</source>
<translation>Sted:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
<source>Coordinates:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
<source>Use current
GPS location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
<source>Depth:</source>
<translation>Dybde:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
<source>Duration:</source>
<translation>Lengde:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
<source>Air Temp:</source>
<translation>Lufttemp:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
<source>Water Temp:</source>
<translation>Vanntemp:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
<source>Suit:</source>
<translation>Drakt:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
<source>Buddy:</source>
<translation>Buddy:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
<source>Dive Master:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
<source>Weight:</source>
<translation>Vekt:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+ <source>Cylinder:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
<source>Gas mix:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
<source>Start Pressure:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
<source>End Pressure:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
<source>Notes:</source>
<translation>Notater:</translation>
</message>
@@ -2096,42 +2139,42 @@ GPS location:</source>
<translation>Drakt:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
<source>Air Temp:</source>
<translation>Lufttemp:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
<source>Cylinder:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
<source>Water Temp:</source>
<translation>Vanntemp:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
<source>Dive Master:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
<source>Weight:</source>
<translation>Vekt:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
<source>Buddy:</source>
<translation>Buddy:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
<source>SAC:</source>
<translation>SAC:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
<source>Notes</source>
<translation>Notater</translation>
</message>
@@ -2139,18 +2182,18 @@ GPS location:</source>
<context>
<name>DiveEventItem</name>
<message>
- <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+ <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
<source>Manual switch to OC</source>
<translation>Manuelt bytte til OC</translation>
</message>
<message>
- <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+ <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
<source> begin</source>
<comment>Starts with space!</comment>
<translation> start</translation>
</message>
<message>
- <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+ <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
<source> end</source>
<comment>Starts with space!</comment>
<translation> slutt</translation>
@@ -2159,27 +2202,27 @@ GPS location:</source>
<context>
<name>DiveImportedModel</name>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
<source>Date/time</source>
<translation>Dato/tid</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
<source>Duration</source>
<translation>Varighet</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
<source>Depth</source>
<translation>Dybde</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
<source>h:</source>
<translation>t:</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
<source>min</source>
<translation>min</translation>
</message>
@@ -2188,8 +2231,8 @@ GPS location:</source>
<name>DiveList</name>
<message>
<location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
<source>Dive list</source>
<translation type="unfinished"/>
</message>
@@ -2204,110 +2247,115 @@ GPS location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
<source>Cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
<source>Please tap the &apos;+&apos; button to add a dive</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+ <source>No dives in dive list</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>DiveListView</name>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
<source>Expand all</source>
<translation>Fold ut turer</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
<source>Collapse all</source>
<translation>Fold sammen turer</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
<source>Collapse others</source>
<translation>Slå sammen andre</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
<source>Remove dive(s) from trip</source>
<translation>Fjern dykk fra tur</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
<source>Create new trip above</source>
<translation>Lag ny tur</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
<source>Add dive(s) to trip immediately above</source>
<translation>Legg til dykk til turen over</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
<source>Add dive(s) to trip immediately below</source>
<translation>Legg til dykk til turen under</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
<source>Merge trip with trip above</source>
<translation>Slå samme tur med turen over</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
<source>Merge trip with trip below</source>
<translation>Slå sammen tur med turen under</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
<source>Delete dive(s)</source>
<translation>Slett dykk</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
<source>Mark dive(s) invalid</source>
<translation>Marker dykk som ugyldige</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
<source>Merge selected dives</source>
<translation>Slå sammen valgte dyk</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
<source>Renumber dive(s)</source>
<translation>Renummerer dykk</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
<source>Shift dive times</source>
<translation>Flytt på dykketider</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
<source>Split selected dives</source>
<translation>Del opp valgte dykk</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
<source>Load image(s) from file(s)</source>
<translation>Hent bilde(r) fra fil(er)</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
<source>Load image(s) from web</source>
<translation>Hent bilde(r) fra web</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
<source>Open image files</source>
<translation>Åpne bilder</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
<source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
<translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
</message>
@@ -2328,56 +2376,6 @@ GPS location:</source>
<context>
<name>DiveLogExportDialog</name>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
- <location filename="../build/ui_divelogexportdialog.h" line="351"/>
- <source>Export format</source>
- <translation>Eksportformat</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
- <location filename="../build/ui_divelogexportdialog.h" line="353"/>
- <source>UDDF</source>
- <translation>UDDF</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
- <location filename="../build/ui_divelogexportdialog.h" line="358"/>
- <source>Worldmap</source>
- <translation>Verdenskart</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
- <location filename="../build/ui_divelogexportdialog.h" line="359"/>
- <source>I&amp;mage depths</source>
- <translation>Bi&amp;ldedypder</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
- <location filename="../build/ui_divelogexportdialog.h" line="360"/>
- <source>Selection</source>
- <translation>Valg</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
- <location filename="../build/ui_divelogexportdialog.h" line="361"/>
- <location filename="../build/ui_divelogexportdialog.h" line="372"/>
- <source>Selected dives</source>
- <translation>Valgte dykk</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
- <location filename="../build/ui_divelogexportdialog.h" line="362"/>
- <source>All dives</source>
- <translation>Alle dyk</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
- <location filename="../build/ui_divelogexportdialog.h" line="396"/>
- <source>HTML</source>
- <translation>HTML</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
<location filename="../build/ui_divelogexportdialog.h" line="349"/>
<source>Export dive log files</source>
@@ -2390,12 +2388,24 @@ GPS location:</source>
<translation>Generell eksport</translation>
</message>
<message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+ <source>Export format</source>
+ <translation>Eksportformat</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
<location filename="../build/ui_divelogexportdialog.h" line="352"/>
<source>Subsurface &amp;XML</source>
<translation>Subsurface &amp;XML</translation>
</message>
<message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+ <source>UDDF</source>
+ <translation>UDDF</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
<location filename="../build/ui_divelogexportdialog.h" line="354"/>
<source>di&amp;velogs.de</source>
@@ -2420,238 +2430,297 @@ GPS location:</source>
<translation>Dykkedetaljer som CSV</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+ <source>Worldmap</source>
+ <translation>Verdenskart</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+ <source>TeX</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+ <source>I&amp;mage depths</source>
+ <translation>Bi&amp;ldedypder</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+ <source>Selection</source>
+ <translation>Valg</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+ <source>Selected dives</source>
+ <translation>Valgte dykk</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+ <source>All dives</source>
+ <translation>Alle dyk</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
<location filename="../build/ui_divelogexportdialog.h" line="363"/>
<source>CSV units</source>
<translation>CSV-enheter</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
<location filename="../build/ui_divelogexportdialog.h" line="366"/>
<source>Metric</source>
<translation>Metrisk</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
<location filename="../build/ui_divelogexportdialog.h" line="367"/>
<source>Imperial</source>
<translation>Britiske mål</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+ <source>HTML</source>
+ <translation>HTML</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
<location filename="../build/ui_divelogexportdialog.h" line="370"/>
<source>General settings</source>
<translation>Generelle innstillinger</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
<location filename="../build/ui_divelogexportdialog.h" line="371"/>
<source>Subsurface numbers</source>
<translation>Subsurface-tall</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
<location filename="../build/ui_divelogexportdialog.h" line="373"/>
<source>Export yearly statistics</source>
<translation>Eksporter årsstatistikk</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
<location filename="../build/ui_divelogexportdialog.h" line="374"/>
<source>All di&amp;ves</source>
<translation>Alle dykk</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
<location filename="../build/ui_divelogexportdialog.h" line="375"/>
<source>Export list only</source>
<translation>Bare eksporter liste</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
<location filename="../build/ui_divelogexportdialog.h" line="376"/>
<source>Export photos</source>
<translation>Eksporter bilder</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
<location filename="../build/ui_divelogexportdialog.h" line="377"/>
<source>Style options</source>
<translation>Stilvalg</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
<location filename="../build/ui_divelogexportdialog.h" line="378"/>
<source>Font</source>
<translation>Skrifttype</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
<location filename="../build/ui_divelogexportdialog.h" line="379"/>
<source>Font size</source>
<translation>Skriftstørrelse</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
<location filename="../build/ui_divelogexportdialog.h" line="382"/>
<source>8</source>
<translation>8</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
<location filename="../build/ui_divelogexportdialog.h" line="383"/>
<source>10</source>
<translation>10</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
<location filename="../build/ui_divelogexportdialog.h" line="384"/>
<source>12</source>
<translation>12</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
<location filename="../build/ui_divelogexportdialog.h" line="385"/>
<source>14</source>
<translation>14</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
<location filename="../build/ui_divelogexportdialog.h" line="386"/>
<source>16</source>
<translation>16</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
<location filename="../build/ui_divelogexportdialog.h" line="387"/>
<source>18</source>
<translation>18</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
<location filename="../build/ui_divelogexportdialog.h" line="388"/>
<source>20</source>
<translation>20</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
<location filename="../build/ui_divelogexportdialog.h" line="390"/>
<source>Theme</source>
<translation>Tema</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
<location filename="../build/ui_divelogexportdialog.h" line="393"/>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
<source>Light</source>
<translation>Lys</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
<location filename="../build/ui_divelogexportdialog.h" line="394"/>
<source>Sand</source>
<translation>Sand</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
- <source>UDDF files (*.uddf *.UDDF)</source>
- <translation>UDDF-filer (*.uddf *.UDDF)</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
- <source>CSV files (*.csv *.CSV)</source>
- <translation>CSV-filer (*.csv *.CSV)</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
<source>Generic format that is used for data exchange between a variety of diving related programs.</source>
<translation>Generelt format som brukes til datautveksling mellom en mengde dykkerelaterte programmer.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
<source>Comma separated values describing the dive profile.</source>
<translation>Dykkeprofil med kommaseparerte verdier.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
<source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
<translation>Dykkeinformasjon som kommaseparerte verdier. Dette inkluderer de fleste dykkedetaljene men ikke profilinformasjonen.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
<source>Send the dive data to divelogs.de website.</source>
<translation>Send dataene til divelogs.de.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
<source>Send the dive data to dive-share.appspot.com website</source>
<translation>Send dykkedata til dive-share.appspot.com</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
<source>HTML export of the dive locations, visualized on a world map.</source>
<translation>HTML-eksport av dykkestedene, visualisert på et verdenskart.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
<source>Subsurface native XML format.</source>
<translation>Subsurface sitt eget XML-format.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
<source>Write depths of images to file.</source>
<translation>Skriv dybdedata fra bilder til fil.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+ <source>Write dive as TeX macros to file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
<source>Export UDDF file as</source>
<translation>Eksporter UDDF-filer som</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+ <source>UDDF files (*.uddf *.UDDF)</source>
+ <translation>UDDF-filer (*.uddf *.UDDF)</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
<source>Export CSV file as</source>
<translation>Eksporter CSV-file som</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+ <source>CSV files (*.csv *.CSV)</source>
+ <translation>CSV-filer (*.csv *.CSV)</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
<source>Export world map</source>
<translation>Eksporter verdenskart</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
<source>HTML files (*.html)</source>
<translation>HTML-filer (*.html)</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
<source>Export Subsurface XML</source>
<translation>Eksporter Subsurface XML</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
<source>XML files (*.xml *.ssrf)</source>
<translation>XML-filer (*.xml *.ssrf)</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
<source>Save image depths</source>
<translation>Lagre dybdedata fra bilder </translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+ <source>Export to TeX file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+ <source>TeX files (*.tex)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
<source>Export HTML files as</source>
<translation>Eksporter HTML-filer som</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
<source>Please wait, exporting...</source>
<translation>Vent, eksporterer...</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
<source>Can&apos;t open file %s</source>
<translation>Klarer ikke åpne fila %s</translation>
</message>
@@ -2665,25 +2734,6 @@ GPS location:</source>
<translation>Importer dykkelogg</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
- <source>Time</source>
- <translation>Tid</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
- <location filename="../build/ui_divelogimportdialog.h" line="164"/>
- <source>Metric</source>
- <translation>Metrisk</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
- <location filename="../build/ui_divelogimportdialog.h" line="165"/>
- <source>Imperial</source>
- <translation>Britiske mål</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
<location filename="../build/ui_divelogimportdialog.h" line="152"/>
<source>dd.mm.yyyy</source>
@@ -2702,74 +2752,6 @@ GPS location:</source>
<translation>åååå-mm-dd</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
- <location filename="../build/ui_divelogimportdialog.h" line="167"/>
- <source>Drag the tags above to each corresponding column below</source>
- <translation>Dra emneknaggene til de korresponderende kolonnene under</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
- <source>Dive #</source>
- <translation>Dykk #</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
- <source>Date</source>
- <translation>Dato</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
- <source>Duration</source>
- <translation>Varighet</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
- <source>GPS</source>
- <translation>GPS</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
- <source>Max. depth</source>
- <translation>Maksdybde</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
- <source>Avg. depth</source>
- <translation>Snittdybde</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
- <source>Suit</source>
- <translation>Drakt</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
- <source>Tags</source>
- <translation>Emner</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
- <source>O₂</source>
- <translation>O₂</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
- <source>He</source>
- <translation>He</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
<location filename="../build/ui_divelogimportdialog.h" line="158"/>
<source>Seconds</source>
@@ -2788,183 +2770,269 @@ GPS location:</source>
<translation>Minutter:sekunder</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
- <source>Location</source>
- <translation>Sted</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+ <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+ <source>Metric</source>
+ <translation>Metrisk</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+ <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+ <source>Imperial</source>
+ <translation>Britiske mål</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+ <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+ <source>Drag the tags above to each corresponding column below</source>
+ <translation>Dra emneknaggene til de korresponderende kolonnene under</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
<source>Tab</source>
<translation>Tab</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation>Noen kolonnetitler ble automatisk fylt ut. Dra og slipp disse titlene så de matcher kolonnene de er i.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
<source>Sample time</source>
<translation>Datapunkt: tid</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
<source>Sample depth</source>
<translation>Datapunkt: dybde</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
<source>Sample temperature</source>
<translation>Datapunkt: temperatur</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+ <source>Sample pO₂</source>
+ <translation>Datapunkt: pO₂</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
<source>Sample sensor1 pO₂</source>
<translation>Sample sensor1 pO₂</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
<source>Sample sensor2 pO₂</source>
<translation>Sample sensor2 pO₂</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
<source>Sample sensor3 pO₂</source>
<translation>Sample sensor3 pO₂</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
- <source>Sample stopdepth</source>
- <translation>Datapunkt: stoppdybde</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
- <source>Sample setpoint</source>
- <translation>Sample settpunkt</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
- <source>Sample pO₂</source>
- <translation>Datapunkt: pO₂</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
<source>Sample CNS</source>
<translation>Datapunkt: CNS</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
<source>Sample NDL</source>
<translation>Datapunkt: NDL</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
<source>Sample TTS</source>
<translation>Datapunkt: TTS</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+ <source>Sample stopdepth</source>
+ <translation>Datapunkt: stoppdybde</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
<source>Sample pressure</source>
<translation>Datapunkt: trykk</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
- <source>Divemaster</source>
- <translation>Dykkeleder</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+ <source>Sample setpoint</source>
+ <translation>Sample settpunkt</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
- <source>Buddy</source>
- <translation>Buddy</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+ <source>Dive #</source>
+ <translation>Dykk #</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
- <source>Rating</source>
- <translation>Vurdering</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+ <source>Date</source>
+ <translation>Dato</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
- <source>Visibility</source>
- <translation>Sikt</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+ <source>Time</source>
+ <translation>Tid</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
- <source>Notes</source>
- <translation>Notater</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+ <source>Duration</source>
+ <translation>Varighet</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
- <source>Weight</source>
- <translation>Vekt</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+ <source>Max. depth</source>
+ <translation>Maksdybde</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+ <source>Avg. depth</source>
+ <translation>Snittdybde</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+ <source>Air temp.</source>
+ <translation>Lufttemp.</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+ <source>Water temp.</source>
+ <translation>Vanntemp.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
<source>Cyl. size</source>
<translation>Tankstr.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
<source>Start pressure</source>
<translation>Starttrykk</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
<source>End pressure</source>
<translation>Sluttrykk</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
- <source>Air temp.</source>
- <translation>Lufttemp.</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+ <source>O₂</source>
+ <translation>O₂</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
- <source>Water temp.</source>
- <translation>Vanntemp.</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+ <source>He</source>
+ <translation>He</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+ <source>Location</source>
+ <translation>Sted</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+ <source>GPS</source>
+ <translation>GPS</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+ <source>Divemaster</source>
+ <translation>Dykkeleder</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+ <source>Buddy</source>
+ <translation>Buddy</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+ <source>Suit</source>
+ <translation>Drakt</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+ <source>Rating</source>
+ <translation>Vurdering</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+ <source>Visibility</source>
+ <translation>Sikt</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+ <source>Notes</source>
+ <translation>Notater</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+ <source>Weight</source>
+ <translation>Vekt</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+ <source>Tags</source>
+ <translation>Emner</translation>
</message>
</context>
<context>
<name>DiveObjectHelper</name>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
<source>%1 dive(s)</source>
<translation type="unfinished"/>
</message>
@@ -2972,18 +3040,18 @@ GPS location:</source>
<context>
<name>DivePlanner</name>
<message>
- <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
- <location filename="../build/ui_diveplanner.h" line="190"/>
- <source>Altitude</source>
- <translation>Høyde over havet</translation>
- </message>
- <message>
<location filename="../desktop-widgets/diveplanner.ui" line="109"/>
<location filename="../build/ui_diveplanner.h" line="189"/>
<source>Planned dive time</source>
<translation>Planlagt dykketid</translation>
</message>
<message>
+ <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+ <location filename="../build/ui_diveplanner.h" line="190"/>
+ <source>Altitude</source>
+ <translation>Høyde over havet</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/diveplanner.ui" line="159"/>
<location filename="../build/ui_diveplanner.h" line="191"/>
<source>ATM pressure</source>
@@ -3017,32 +3085,32 @@ GPS location:</source>
<context>
<name>DivePlannerPointsModel</name>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
<source>unknown</source>
<translation>ukjent</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
<source>Final depth</source>
<translation>Siste dybde</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
<source>Run time</source>
<translation>Løpetid</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
<source>Duration</source>
<translation>Varighet</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
<source>Used gas</source>
<translation>Gassforbruk</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
<source>CC setpoint</source>
<translation>CC settpunkt</translation>
</message>
@@ -3050,22 +3118,22 @@ GPS location:</source>
<context>
<name>DivePlannerWidget</name>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
<source>Dive planner points</source>
<translation>Punkter i dykkplan</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
<source>Available gases</source>
<translation>Tilgjengelige gasser</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
<source>Add dive data point</source>
<translation>Legg til punkt</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
<source>Save new</source>
<translation>Lagre ny</translation>
</message>
@@ -3098,11 +3166,36 @@ GPS location:</source>
<translation>Farge</translation>
</message>
<message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+ <source>User entered</source>
+ <translation>Brukeren la inn</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+ <source>Cylinder index</source>
+ <translation>Flaskeindeks</translation>
+ </message>
+ <message>
<location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
<source>Pressure S</source>
<translation>Trykk S</translation>
</message>
<message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+ <source>Pressure I</source>
+ <translation>Trykk I</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+ <source>Ceiling</source>
+ <translation>Tak</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+ <source>SAC</source>
+ <translation>SAC</translation>
+ </message>
+ <message>
<location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
<source>pN₂</source>
<translation>pN₂</translation>
@@ -3138,49 +3231,24 @@ GPS location:</source>
<translation>Sensor 3</translation>
</message>
<message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
- <source>Heart rate</source>
- <translation>Hjertefrekvens</translation>
- </message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
- <source>Mean depth @ s</source>
- <translation>Snittdypde @ s</translation>
- </message>
- <message>
<location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
<source>Ambient pressure</source>
<translation>Omgivelsestrykk</translation>
</message>
<message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+ <source>Heart rate</source>
+ <translation>Hjertefrekvens</translation>
+ </message>
+ <message>
<location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
<source>Gradient factor</source>
<translation>Gradientfaktor</translation>
</message>
<message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
- <source>Pressure I</source>
- <translation>Trykk I</translation>
- </message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
- <source>User entered</source>
- <translation>Brukeren la inn</translation>
- </message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
- <source>Cylinder index</source>
- <translation>Flaskeindeks</translation>
- </message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
- <source>Ceiling</source>
- <translation>Tak</translation>
- </message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
- <source>SAC</source>
- <translation>SAC</translation>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+ <source>Mean depth @ s</source>
+ <translation>Snittdypde @ s</translation>
</message>
</context>
<context>
@@ -3251,311 +3319,315 @@ p, li { white-space: pre-wrap; }
<context>
<name>DiveTripModel</name>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="395"/>
- <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="483"/>
<source>#</source>
<translation>#</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="398"/>
- <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="486"/>
<source>Date</source>
<translation>Dato</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="401"/>
- <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="489"/>
<source>Rating</source>
<translation>Vurdering</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="443"/>
<source>Depth</source>
<translation>Dybde</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+ <source>Duration</source>
+ <translation>Varighet</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="449"/>
<source>Temp</source>
<translation>Temp</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="452"/>
<source>Weight</source>
<translation>Vekt</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="425"/>
- <source>SAC</source>
- <translation>SAC</translation>
- </message>
- <message>
- <location filename="../qt-models/divetripmodel.cpp" line="450"/>
- <source>m</source>
- <translation>m</translation>
- </message>
- <message>
- <location filename="../qt-models/divetripmodel.cpp" line="450"/>
- <source>ft</source>
- <translation>ft</translation>
- </message>
- <message>
- <location filename="../qt-models/divetripmodel.cpp" line="459"/>
- <source>Weight(%1)</source>
- <translation>Vekt(%1)</translation>
- </message>
- <message>
- <location filename="../qt-models/divetripmodel.cpp" line="416"/>
- <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="504"/>
<source>Suit</source>
<translation>Drakt</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="419"/>
- <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="507"/>
<source>Cyl</source>
<translation>Flaske</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="422"/>
- <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="510"/>
<source>Gas</source>
<translation>Gass</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="473"/>
- <source>SAC(%1)</source>
- <translation>SAC(%1)</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+ <source>SAC</source>
+ <translation>SAC</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="473"/>
- <source>/min</source>
- <translation>/min</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+ <source>OTU</source>
+ <translation>OTU</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="431"/>
- <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="521"/>
<source>Max CNS</source>
<translation>Maks CNS</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="434"/>
- <location filename="../qt-models/divetripmodel.cpp" line="482"/>
- <source>Location</source>
- <translation>Sted</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+ <source>Photos</source>
+ <translation>Bilder</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="459"/>
- <source>kg</source>
- <translation>kg</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+ <source>Location</source>
+ <translation>Sted</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="492"/>
<source>Depth(%1)</source>
<translation>Dybde(%1)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="407"/>
- <location filename="../qt-models/divetripmodel.cpp" line="453"/>
- <source>Duration</source>
- <translation>Varighet</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+ <source>m</source>
+ <translation>m</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+ <source>ft</source>
+ <translation>ft</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="498"/>
<source>Temp(%1%2)</source>
<translation>Temp(%1%2)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+ <source>Weight(%1)</source>
+ <translation>Vekt(%1)</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+ <source>kg</source>
+ <translation>kg</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="501"/>
<source>lbs</source>
<translation>pund</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="428"/>
- <location filename="../qt-models/divetripmodel.cpp" line="476"/>
- <source>OTU</source>
- <translation>OTU</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+ <source>SAC(%1)</source>
+ <translation>SAC(%1)</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+ <source>/min</source>
+ <translation>/min</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+ <source>Photos before/during/after dive</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>DivelogsDeWebServices</name>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
<source>no dives were selected</source>
<translation>ingen dykk valgt</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
<source>stylesheet to export to divelogs.de is not found</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
<source>failed to create zip file for upload: %s</source>
<translation>klarte ikke å lage zipfil for opplasting: %s</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
<source>internal error</source>
<translation>intern feil</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
<source>Conversion of dive %1 to divelogs.de format failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
<source>error writing zip file: %s zip error %d system error %d - %s</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
<source>Done</source>
<translation>Ferdig</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
<source>Uploading dive list...</source>
<translation>Laster opp liste over dykk...</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
<source>Downloading dive list...</source>
<translation>Laster ned liste over dykk...</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
<source>Downloading %1 dives...</source>
<translation>Laster ned %1 dykk...</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
<source>Download finished - %1</source>
<translation>Nedlasting er ferdig - %1</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
<source>Problem with download</source>
<translation>Kunne ikke laste ned</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
<source>The archive could not be opened:
</source>
<translation>Arkivet kunne ikke åpnes:
</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
<source>Corrupted download</source>
<translation>Nedlastingen er skadet</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
<source>The archive could not be opened:
%1</source>
<translation>Arkivet kunne ikke åpnes:
%1</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+ <source>Upload finished</source>
+ <translation>Opplasting er ferdig</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
<source>Upload failed</source>
<translation>Opplasting feilet</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
<source>Upload successful</source>
<translation>Ferdig å laste opp</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
<source>Login failed</source>
<translation>Innlogging feilet</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
<source>Cannot parse response</source>
<translation>Kan ikke lese svar</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
<source>Error: %1</source>
<translation>Feil: %1</translation>
</message>
- <message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
- <source>Upload finished</source>
- <translation>Opplasting er ferdig</translation>
- </message>
</context>
<context>
<name>DownloadFromDCWidget</name>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
- <source>Error</source>
- <translation>Feil</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
- <source>Retry</source>
- <translation>Prøv igjen</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
- <source>Find Uemis dive computer</source>
- <translation>Finn Uemis dykkecomputer</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
<source>Download</source>
<translation>Last ned</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
<source>Choose Bluetooth download mode</source>
<translation>Velg nedlastingsmåte for Bluetooth</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+ <source>Error</source>
+ <translation>Feil</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+ <source>Find Uemis dive computer</source>
+ <translation>Finn Uemis dykkecomputer</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
<source>Choose file for divecomputer download logfile</source>
<translation>Velg fil som loggfil for dykkecomputer</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
<source>Log files (*.log)</source>
<translation>Loggfiler (*.log)</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
<source>Warning</source>
<translation>Advarsel</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
<source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
<translation>Lagring av dump fra libdivecomputer vil IKKE laste ned dykk til dykkeloggen.</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
<source>Choose file for divecomputer binary dump file</source>
<translation>Velg fil som binærdump fra dykkecomputer</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
<source>Dump files (*.bin)</source>
<translation>Dumpfiler (*.bin)</translation>
</message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+ <source>Retry</source>
+ <translation>Prøv igjen</translation>
+ </message>
</context>
<context>
<name>DownloadFromDiveComputer</name>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
- <source>Vendor</source>
- <translation>Leverandør</translation>
- </message>
- <message>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
<location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
<source>Download from dive computer</source>
@@ -3568,17 +3640,6 @@ p, li { white-space: pre-wrap; }
<translation>Enhet eller disk</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
- <source>Choose Bluetooth download mode</source>
- <translation>Velg nedlastingsmåte for Bluetooth</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
- <source>Dive computer</source>
- <translation>Dykkecomputer</translation>
- </message>
- <message>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3602,11 +3663,46 @@ p, li { white-space: pre-wrap; }
<translation>Foretrekk alltid nedlastede dykk</translation>
</message>
<message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+ <source>Download into new trip</source>
+ <translation>Last ned til ny tur</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+ <source>Save libdivecomputer logfile</source>
+ <translation>Lagre loggfil fra libdivecomputer</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+ <source>Save libdivecomputer dumpfile</source>
+ <translation>Lagre dumpfil fra libdivecomputer</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+ <source>Choose Bluetooth download mode</source>
+ <translation>Velg nedlastingsmåte for Bluetooth</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
<source>Select a remote Bluetooth device.</source>
<translation>Velg en Bluetooth-enhet.</translation>
</message>
<message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+ <source>Vendor</source>
+ <translation>Leverandør</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+ <source>Dive computer</source>
+ <translation>Dykkecomputer</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
<location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
<location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3614,18 +3710,6 @@ p, li { white-space: pre-wrap; }
<translation>Last ned</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
- <source>OK</source>
- <translation>OK</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
- <source>Cancel</source>
- <translation>Avbryt</translation>
- </message>
- <message>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
<location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
<source>Downloaded dives</source>
@@ -3644,22 +3728,16 @@ p, li { white-space: pre-wrap; }
<translation>Velg vekk alle</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
- <source>Save libdivecomputer logfile</source>
- <translation>Lagre loggfil fra libdivecomputer</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
- <source>Save libdivecomputer dumpfile</source>
- <translation>Lagre dumpfil fra libdivecomputer</translation>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+ <source>OK</source>
+ <translation>OK</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
- <source>Download into new trip</source>
- <translation>Last ned til ny tur</translation>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+ <source>Cancel</source>
+ <translation>Avbryt</translation>
</message>
<message>
<location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3749,12 +3827,12 @@ p, li { white-space: pre-wrap; }
<translation>Koble til facebook teksteksempel</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
<source>To disconnect Subsurface from your Facebook account, use the button below</source>
<translation>Bruk knappen under for å koble Subsurface fra Facebook</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
<source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
<translation>Logg inn for å koble til Facebook. Dette gjør at Subsurface kan poste dykk på veggen din</translation>
</message>
@@ -3762,22 +3840,22 @@ p, li { white-space: pre-wrap; }
<context>
<name>FacebookManager</name>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
<source>Photo upload sucessfull</source>
<translation>Lastet opp bilde</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
<source>Your dive profile was updated to Facebook.</source>
<translation>Dykkeprofilen din ble oppdatert på Facebook.</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
<source>Photo upload failed</source>
<translation>Fotoopplasting feilet</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
@@ -3839,17 +3917,25 @@ send gjerne følgende til utvikleren.
<context>
<name>FirmwareUpdateThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
<source>This feature is not yet available for the selected dive computer.</source>
<translation>Denne funksjonen er ikke tilgjengelig for den valgte computeren.</translation>
</message>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
<source>Firmware update failed!</source>
<translation>Kunne ikke oppdatere firmware!</translation>
</message>
</context>
<context>
+ <name>GlobalDrawer</name>
+ <message>
+ <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+ <source>Back</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>GlobeGPS</name>
<message>
<location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3865,27 +3951,27 @@ send gjerne følgende til utvikleren.
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
<source>Date: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
<source>Name: </source>
<translation>Navn:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
<source>Latitude: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
<source>Longitude: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
<source>List of stored GPS fixes</source>
<translation type="unfinished"/>
</message>
@@ -3914,7 +4000,7 @@ send gjerne følgende til utvikleren.
<context>
<name>LocationFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
<source>Location: </source>
<translation>Sted:</translation>
</message>
@@ -3955,7 +4041,7 @@ send gjerne følgende til utvikleren.
<context>
<name>LocationFilterModel</name>
<message>
- <location filename="../qt-models/filtermodels.cpp" line="299"/>
+ <location filename="../qt-models/filtermodels.cpp" line="304"/>
<source>No location set</source>
<translation>Ingen sted er satt</translation>
</message>
@@ -4077,20 +4163,55 @@ Er du sikker på at du vil fortsette?</translation>
</message>
</context>
<context>
- <name>MainForm.ui</name>
+ <name>MainTab</name>
<message>
- <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
- <source>Press Me 1</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/maintab.ui" line="18"/>
+ <location filename="../desktop-widgets/maintab.ui" line="439"/>
+ <location filename="../build/ui_maintab.h" line="961"/>
+ <location filename="../build/ui_maintab.h" line="963"/>
+ <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+ <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+ <source>Notes</source>
+ <translation>Notater</translation>
</message>
<message>
- <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
- <source>Press Me 2</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/maintab.ui" line="21"/>
+ <location filename="../build/ui_maintab.h" line="964"/>
+ <source>General notes about the current selection</source>
+ <translation>Notater om det som er valgt</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="92"/>
+ <location filename="../desktop-widgets/maintab.ui" line="646"/>
+ <location filename="../build/ui_maintab.h" line="947"/>
+ <location filename="../build/ui_maintab.h" line="967"/>
+ <source>Date</source>
+ <translation>Dato</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="102"/>
+ <location filename="../build/ui_maintab.h" line="948"/>
+ <source>Time</source>
+ <translation>Tid</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="112"/>
+ <location filename="../desktop-widgets/maintab.ui" line="836"/>
+ <location filename="../build/ui_maintab.h" line="949"/>
+ <location filename="../build/ui_maintab.h" line="987"/>
+ <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+ <source>Air temp.</source>
+ <translation>Lufttemp.</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="122"/>
+ <location filename="../desktop-widgets/maintab.ui" line="855"/>
+ <location filename="../build/ui_maintab.h" line="950"/>
+ <location filename="../build/ui_maintab.h" line="989"/>
+ <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+ <source>Water temp.</source>
+ <translation>Vanntemp.</translation>
</message>
-</context>
-<context>
- <name>MainTab</name>
<message>
<location filename="../desktop-widgets/maintab.ui" line="184"/>
<location filename="../build/ui_maintab.h" line="951"/>
@@ -4099,6 +4220,17 @@ Er du sikker på at du vil fortsette?</translation>
<translation>Sted</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="214"/>
+ <source>Edit dive site</source>
+ <translation>Rediger dykkested</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="217"/>
+ <location filename="../build/ui_maintab.h" line="953"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="252"/>
<location filename="../build/ui_maintab.h" line="954"/>
<source>Divemaster</source>
@@ -4111,12 +4243,6 @@ Er du sikker på at du vil fortsette?</translation>
<translation>Buddy</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="387"/>
- <location filename="../build/ui_maintab.h" line="959"/>
- <source>Tags</source>
- <translation>Emner</translation>
- </message>
- <message>
<location filename="../desktop-widgets/maintab.ui" line="308"/>
<location filename="../build/ui_maintab.h" line="956"/>
<source>Rating</source>
@@ -4135,57 +4261,18 @@ Er du sikker på at du vil fortsette?</translation>
<translation>Drakt</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="387"/>
+ <location filename="../build/ui_maintab.h" line="959"/>
+ <source>Tags</source>
+ <translation>Emner</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="397"/>
<location filename="../build/ui_maintab.h" line="960"/>
<source>Dive mode</source>
<translation>Dykkemodus</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="112"/>
- <location filename="../desktop-widgets/maintab.ui" line="836"/>
- <location filename="../build/ui_maintab.h" line="949"/>
- <location filename="../build/ui_maintab.h" line="987"/>
- <location filename="../desktop-widgets/maintab.cpp" line="306"/>
- <source>Air temp.</source>
- <translation>Lufttemp.</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="122"/>
- <location filename="../desktop-widgets/maintab.ui" line="855"/>
- <location filename="../build/ui_maintab.h" line="950"/>
- <location filename="../build/ui_maintab.h" line="989"/>
- <location filename="../desktop-widgets/maintab.cpp" line="307"/>
- <source>Water temp.</source>
- <translation>Vanntemp.</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="18"/>
- <location filename="../desktop-widgets/maintab.ui" line="439"/>
- <location filename="../build/ui_maintab.h" line="961"/>
- <location filename="../build/ui_maintab.h" line="963"/>
- <location filename="../desktop-widgets/maintab.cpp" line="539"/>
- <location filename="../desktop-widgets/maintab.cpp" line="571"/>
- <source>Notes</source>
- <translation>Notater</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="21"/>
- <location filename="../build/ui_maintab.h" line="964"/>
- <source>General notes about the current selection</source>
- <translation>Notater om det som er valgt</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="214"/>
- <source>Edit dive site</source>
- <translation>Rediger dykkested</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="217"/>
- <location filename="../build/ui_maintab.h" line="953"/>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
<location filename="../desktop-widgets/maintab.ui" line="491"/>
<location filename="../build/ui_maintab.h" line="965"/>
<source>Equipment</source>
@@ -4210,6 +4297,12 @@ Er du sikker på at du vil fortsette?</translation>
<translation>Dykkeinformasjon</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="665"/>
+ <location filename="../build/ui_maintab.h" line="969"/>
+ <source>Interval</source>
+ <translation>Overflateintervall</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="684"/>
<location filename="../build/ui_maintab.h" line="971"/>
<source>Gases used</source>
@@ -4222,18 +4315,38 @@ Er du sikker på at du vil fortsette?</translation>
<translation>Gassforbruk</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="722"/>
+ <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+ <location filename="../build/ui_maintab.h" line="975"/>
+ <location filename="../build/ui_maintab.h" line="1003"/>
+ <source>SAC</source>
+ <translation>SAC</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="741"/>
<location filename="../build/ui_maintab.h" line="977"/>
<source>CNS</source>
<translation>CNS</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="760"/>
+ <location filename="../build/ui_maintab.h" line="979"/>
+ <source>OTU</source>
+ <translation>OTU</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="779"/>
<location filename="../build/ui_maintab.h" line="981"/>
<source>Max. depth</source>
<translation>Maksdybde</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="798"/>
+ <location filename="../build/ui_maintab.h" line="983"/>
+ <source>Avg. depth</source>
+ <translation>Snittdybde</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="817"/>
<location filename="../build/ui_maintab.h" line="985"/>
<source>Air pressure</source>
@@ -4246,82 +4359,6 @@ Er du sikker på at du vil fortsette?</translation>
<translation>Varighet</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="933"/>
- <location filename="../build/ui_maintab.h" line="1007"/>
- <source>Simple statistics about the selection</source>
- <translation>Statistikk om det som er valgt</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1039"/>
- <location filename="../build/ui_maintab.h" line="999"/>
- <source>Total time</source>
- <translation>Totaltid</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1106"/>
- <location filename="../build/ui_maintab.h" line="1004"/>
- <source>Gas consumption</source>
- <translation>Gassforbruk</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1151"/>
- <location filename="../build/ui_maintab.h" line="1009"/>
- <source>All photos from the current selection</source>
- <translation>Alle bilder i det som er valgt</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1177"/>
- <location filename="../build/ui_maintab.h" line="1010"/>
- <source>Extra data</source>
- <translation>Ekstra data</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1180"/>
- <location filename="../build/ui_maintab.h" line="1011"/>
- <source>Adittional data from the dive computer</source>
- <translation>Ekstra data fra dykkecomputeren</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="92"/>
- <location filename="../desktop-widgets/maintab.ui" line="646"/>
- <location filename="../build/ui_maintab.h" line="947"/>
- <location filename="../build/ui_maintab.h" line="967"/>
- <source>Date</source>
- <translation>Dato</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="102"/>
- <location filename="../build/ui_maintab.h" line="948"/>
- <source>Time</source>
- <translation>Tid</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="665"/>
- <location filename="../build/ui_maintab.h" line="969"/>
- <source>Interval</source>
- <translation>Overflateintervall</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="722"/>
- <location filename="../desktop-widgets/maintab.ui" line="1094"/>
- <location filename="../build/ui_maintab.h" line="975"/>
- <location filename="../build/ui_maintab.h" line="1003"/>
- <source>SAC</source>
- <translation>SAC</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="798"/>
- <location filename="../build/ui_maintab.h" line="983"/>
- <source>Avg. depth</source>
- <translation>Snittdybde</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="760"/>
- <location filename="../build/ui_maintab.h" line="979"/>
- <source>OTU</source>
- <translation>OTU</translation>
- </message>
- <message>
<location filename="../desktop-widgets/maintab.ui" line="893"/>
<location filename="../build/ui_maintab.h" line="993"/>
<source>Salinity</source>
@@ -4334,22 +4371,34 @@ Er du sikker på at du vil fortsette?</translation>
<translation>Statistikk</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="933"/>
+ <location filename="../build/ui_maintab.h" line="1007"/>
+ <source>Simple statistics about the selection</source>
+ <translation>Statistikk om det som er valgt</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="986"/>
<location filename="../build/ui_maintab.h" line="996"/>
<source>Depth</source>
<translation>Dybde</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="998"/>
+ <location filename="../build/ui_maintab.h" line="997"/>
+ <source>Duration</source>
+ <translation>Varighet</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="1027"/>
<location filename="../build/ui_maintab.h" line="998"/>
<source>Temperature</source>
<translation>Temperatur</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="998"/>
- <location filename="../build/ui_maintab.h" line="997"/>
- <source>Duration</source>
- <translation>Varighet</translation>
+ <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+ <location filename="../build/ui_maintab.h" line="999"/>
+ <source>Total time</source>
+ <translation>Totaltid</translation>
</message>
<message>
<location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4358,20 +4407,34 @@ Er du sikker på at du vil fortsette?</translation>
<translation>Dykk</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+ <location filename="../build/ui_maintab.h" line="1004"/>
+ <source>Gas consumption</source>
+ <translation>Gassforbruk</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="1148"/>
<location filename="../build/ui_maintab.h" line="1008"/>
<source>Photos</source>
<translation>Bilder</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="88"/>
- <source>Cylinders</source>
- <translation>Flasker</translation>
+ <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+ <location filename="../build/ui_maintab.h" line="1009"/>
+ <source>All photos from the current selection</source>
+ <translation>Alle bilder i det som er valgt</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="92"/>
- <source>Weights</source>
- <translation>Vekter</translation>
+ <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+ <location filename="../build/ui_maintab.h" line="1010"/>
+ <source>Extra data</source>
+ <translation>Ekstra data</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+ <location filename="../build/ui_maintab.h" line="1011"/>
+ <source>Adittional data from the dive computer</source>
+ <translation>Ekstra data fra dykkecomputeren</translation>
</message>
<message>
<location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4384,11 +4447,21 @@ Er du sikker på at du vil fortsette?</translation>
<translation>Forkast endringene</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+ <source>Cylinders</source>
+ <translation>Flasker</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.cpp" line="89"/>
<source>Add cylinder</source>
<translation>Legg til flaske</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+ <source>Weights</source>
+ <translation>Vekter</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.cpp" line="93"/>
<source>Add weight system</source>
<translation>Legg til vektsystem</translation>
@@ -4581,659 +4654,685 @@ fra luft og bruker:
<translation>&amp;Fil</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
- <location filename="../build/ui_mainwindow.h" line="534"/>
- <source>Export dive logs</source>
- <translation>Eksporter dykkelogger</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
- <location filename="../build/ui_mainwindow.h" line="542"/>
- <source>Toggle pHe graph</source>
- <translation>Skru pHe-graf av/på</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
- <location filename="../build/ui_mainwindow.h" line="545"/>
- <source>Toggle calculating all tissues</source>
- <translation>Skru av/på utregning av vev</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
- <location filename="../build/ui_mainwindow.h" line="543"/>
- <source>Toggle DC reported ceiling</source>
- <translation>Skru av/på dekograf fra computer</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
- <location filename="../build/ui_mainwindow.h" line="544"/>
- <source>Toggle calculated ceiling</source>
- <translation>Skru av/på dekograf</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
- <location filename="../build/ui_mainwindow.h" line="550"/>
- <source>Toggle NDL, TTS</source>
- <translation>Skru av/på NDL, TTS</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
- <location filename="../build/ui_mainwindow.h" line="546"/>
- <source>Toggle calculated ceiling with 3m increments</source>
- <translation>Skru av/på 3m-inkrementer for dekotak</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
- <location filename="../build/ui_mainwindow.h" line="537"/>
- <source>Configure &amp;dive computer</source>
- <translation>Konfigurer &amp;dykkecomputer</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
- <location filename="../build/ui_mainwindow.h" line="547"/>
- <source>Toggle heart rate</source>
- <translation>Skru av/på hjertefrekvens</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
- <location filename="../build/ui_mainwindow.h" line="548"/>
- <source>Toggle MOD</source>
- <translation>Skru av/på MOD</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
- <location filename="../build/ui_mainwindow.h" line="549"/>
- <source>Toggle EAD, END, EADD</source>
- <translation>Skru av/på EAD, END, EADD</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
- <location filename="../build/ui_mainwindow.h" line="551"/>
- <source>Toggle SAC rate</source>
- <translation>Skru av/på SAC</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
- <location filename="../build/ui_mainwindow.h" line="552"/>
- <source>Toggle ruler</source>
- <translation>Skru av/på linjal</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
<location filename="../build/ui_mainwindow.h" line="569"/>
<source>&amp;Log</source>
<translation>&amp;Logg</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
<location filename="../build/ui_mainwindow.h" line="570"/>
<source>&amp;View</source>
<translation>&amp;Vis</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
<location filename="../build/ui_mainwindow.h" line="571"/>
<source>&amp;Help</source>
<translation>&amp;Hjelp</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
<location filename="../build/ui_mainwindow.h" line="572"/>
<source>&amp;Import</source>
<translation>&amp;Importer</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
<location filename="../build/ui_mainwindow.h" line="573"/>
<source>&amp;Edit</source>
<translation>R&amp;ediger</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
<source>Share on</source>
<translation>Del på</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
<location filename="../build/ui_mainwindow.h" line="453"/>
<source>&amp;New logbook</source>
<translation>&amp;Ny loggbok</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
<location filename="../build/ui_mainwindow.h" line="455"/>
<source>New</source>
<translation>Ny</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
<location filename="../build/ui_mainwindow.h" line="457"/>
<source>Ctrl+N</source>
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
<location filename="../build/ui_mainwindow.h" line="458"/>
<source>&amp;Open logbook</source>
<translation>Åpne l&amp;oggbok</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
<location filename="../build/ui_mainwindow.h" line="460"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
<source>Open</source>
<translation>Åpne</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
<location filename="../build/ui_mainwindow.h" line="462"/>
<source>Ctrl+O</source>
<translation>Ctrl+O</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
<location filename="../build/ui_mainwindow.h" line="463"/>
<source>&amp;Save</source>
<translation>Lagre</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
<location filename="../build/ui_mainwindow.h" line="465"/>
<source>Save</source>
<translation>Lagre</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
<location filename="../build/ui_mainwindow.h" line="467"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
<location filename="../build/ui_mainwindow.h" line="468"/>
<source>Sa&amp;ve as</source>
<translation>Lagre som</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
<location filename="../build/ui_mainwindow.h" line="470"/>
<source>Save as</source>
<translation>Lagre som</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
<location filename="../build/ui_mainwindow.h" line="472"/>
<source>Ctrl+Shift+S</source>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
<location filename="../build/ui_mainwindow.h" line="473"/>
<source>&amp;Close</source>
<translation>Lukk</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
<location filename="../build/ui_mainwindow.h" line="475"/>
<source>Close</source>
<translation>Lukk</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
<location filename="../build/ui_mainwindow.h" line="477"/>
<source>Ctrl+W</source>
<translation>Ctrl+W</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+ <location filename="../build/ui_mainwindow.h" line="478"/>
+ <source>&amp;Print</source>
+ <translation>Skriv ut</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+ <location filename="../build/ui_mainwindow.h" line="479"/>
+ <source>Ctrl+P</source>
+ <translation>Ctrl+P</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
<location filename="../build/ui_mainwindow.h" line="480"/>
<source>P&amp;references</source>
<translation>Valg</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+ <location filename="../build/ui_mainwindow.h" line="481"/>
+ <source>Ctrl+,</source>
+ <translation>Ctrl+,</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+ <location filename="../build/ui_mainwindow.h" line="482"/>
+ <source>&amp;Quit</source>
+ <translation>Avslutt</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+ <location filename="../build/ui_mainwindow.h" line="483"/>
+ <source>Ctrl+Q</source>
+ <translation>Ctrl+Q</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+ <location filename="../build/ui_mainwindow.h" line="484"/>
+ <source>Import from &amp;dive computer</source>
+ <translation>Importer fra &amp;dykkecomputer</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+ <location filename="../build/ui_mainwindow.h" line="485"/>
+ <source>Ctrl+D</source>
+ <translation>Ctrl+D</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
<location filename="../build/ui_mainwindow.h" line="486"/>
<source>Import &amp;GPS data from Subsurface web service</source>
<translation>Importer &amp;GPS-data fra Subsurface webtjeneste</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+ <location filename="../build/ui_mainwindow.h" line="487"/>
+ <source>Ctrl+G</source>
+ <translation>Ctrl+G</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
<location filename="../build/ui_mainwindow.h" line="488"/>
<source>Edit device &amp;names</source>
<translation>Rediger device&amp;navn</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+ <location filename="../build/ui_mainwindow.h" line="489"/>
+ <source>&amp;Add dive</source>
+ <translation>Legg til dykk</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+ <location filename="../build/ui_mainwindow.h" line="490"/>
+ <source>Ctrl++</source>
+ <translation>Ctrl++</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
<location filename="../build/ui_mainwindow.h" line="491"/>
<source>&amp;Edit dive</source>
<translation>R&amp;ediger dykk</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
<location filename="../build/ui_mainwindow.h" line="492"/>
<source>&amp;Copy dive components</source>
<translation>Kopier dykkekomponenter</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
<location filename="../build/ui_mainwindow.h" line="493"/>
<source>Ctrl+C</source>
<translation>Ctrl+C</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
<location filename="../build/ui_mainwindow.h" line="494"/>
<source>&amp;Paste dive components</source>
<translation>Lim inn dykkekomponenter</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
<location filename="../build/ui_mainwindow.h" line="495"/>
<source>Ctrl+V</source>
<translation>Ctrl+V</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+ <location filename="../build/ui_mainwindow.h" line="496"/>
+ <source>&amp;Renumber</source>
+ <translation>Nummere&amp;r på nytt</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+ <location filename="../build/ui_mainwindow.h" line="497"/>
+ <source>Ctrl+R</source>
+ <translation>Ctrl+R</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+ <location filename="../build/ui_mainwindow.h" line="498"/>
+ <source>Auto &amp;group</source>
+ <translation>Auto&amp;grupper</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+ <location filename="../build/ui_mainwindow.h" line="499"/>
+ <source>&amp;Yearly statistics</source>
+ <translation>Årsstatistikk</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+ <location filename="../build/ui_mainwindow.h" line="500"/>
+ <source>Ctrl+Y</source>
+ <translation>Ctrl+Y</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+ <location filename="../build/ui_mainwindow.h" line="501"/>
+ <source>&amp;Dive list</source>
+ <translation>&amp;Dykkeliste</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+ <location filename="../build/ui_mainwindow.h" line="502"/>
+ <source>Ctrl+2</source>
+ <translation>Ctrl+2</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
<location filename="../build/ui_mainwindow.h" line="503"/>
<source>&amp;Profile</source>
<translation>&amp;Profil</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+ <location filename="../build/ui_mainwindow.h" line="504"/>
+ <source>Ctrl+3</source>
+ <translation>Ctrl+3</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
<location filename="../build/ui_mainwindow.h" line="505"/>
<source>&amp;Info</source>
<translation>&amp;Info</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+ <location filename="../build/ui_mainwindow.h" line="506"/>
+ <source>Ctrl+4</source>
+ <translation>Ctrl+4</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
<location filename="../build/ui_mainwindow.h" line="507"/>
<source>&amp;All</source>
<translation>&amp;Alle</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+ <location filename="../build/ui_mainwindow.h" line="508"/>
+ <source>Ctrl+1</source>
+ <translation>Ctrl+1</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+ <location filename="../build/ui_mainwindow.h" line="509"/>
+ <source>P&amp;revious DC</source>
+ <translation>Fo&amp;rrige computer</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+ <location filename="../build/ui_mainwindow.h" line="510"/>
+ <source>Left</source>
+ <translation>Venstre</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
<location filename="../build/ui_mainwindow.h" line="511"/>
<source>&amp;Next DC</source>
<translation>&amp;Neste computer</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+ <location filename="../build/ui_mainwindow.h" line="512"/>
+ <source>Right</source>
+ <translation>Høyre</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
<location filename="../build/ui_mainwindow.h" line="513"/>
<source>&amp;About Subsurface</source>
<translation>Om Subsurf&amp;ace</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+ <location filename="../build/ui_mainwindow.h" line="514"/>
+ <source>User &amp;manual</source>
+ <translation>Bruker&amp;manual</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+ <location filename="../build/ui_mainwindow.h" line="515"/>
+ <source>F1</source>
+ <translation>F1</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
<location filename="../build/ui_mainwindow.h" line="516"/>
<source>&amp;Globe</source>
<translation>&amp;Globus</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+ <location filename="../build/ui_mainwindow.h" line="517"/>
+ <source>Ctrl+5</source>
+ <translation>Ctrl+5</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+ <location filename="../build/ui_mainwindow.h" line="518"/>
+ <source>P&amp;lan dive</source>
+ <translation>P&amp;lanlegg dykk</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+ <location filename="../build/ui_mainwindow.h" line="519"/>
+ <source>Ctrl+L</source>
+ <translation>Ctrl+L</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+ <location filename="../build/ui_mainwindow.h" line="520"/>
+ <source>&amp;Import log files</source>
+ <translation>&amp;Importer loggfiler</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+ <location filename="../build/ui_mainwindow.h" line="522"/>
+ <source>Import divelog files from other applications</source>
+ <translation>Importer dykkelogg fra andre programmer</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
<location filename="../build/ui_mainwindow.h" line="524"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
<location filename="../build/ui_mainwindow.h" line="525"/>
<source>Import &amp;from divelogs.de</source>
<translation>Importer &amp;fra divelogs.de</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
<location filename="../build/ui_mainwindow.h" line="526"/>
<source>&amp;Full screen</source>
<translation>&amp;Fullskjerm</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
<location filename="../build/ui_mainwindow.h" line="528"/>
<source>Toggle full screen</source>
<translation>Fullskjerm av/på</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+ <location filename="../build/ui_mainwindow.h" line="530"/>
+ <source>F11</source>
+ <translation>F11</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
<location filename="../build/ui_mainwindow.h" line="531"/>
<source>&amp;Check for updates</source>
<translation>Se etter oppdateringer</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
<location filename="../build/ui_mainwindow.h" line="532"/>
<source>&amp;Export</source>
<translation>&amp;Eksport</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+ <location filename="../build/ui_mainwindow.h" line="534"/>
+ <source>Export dive logs</source>
+ <translation>Eksporter dykkelogger</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
<location filename="../build/ui_mainwindow.h" line="536"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+ <location filename="../build/ui_mainwindow.h" line="537"/>
+ <source>Configure &amp;dive computer</source>
+ <translation>Konfigurer &amp;dykkecomputer</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
<location filename="../build/ui_mainwindow.h" line="538"/>
<source>Ctrl+Shift+C</source>
<translation>Ctrl+Shift+C</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
<location filename="../build/ui_mainwindow.h" line="539"/>
<source>Edit &amp;dive in planner</source>
<translation>Rediger &amp;dykk i planlegger</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
<location filename="../build/ui_mainwindow.h" line="540"/>
<source>Toggle pO₂ graph</source>
<translation>Skru av/på pO₂-graf</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
<location filename="../build/ui_mainwindow.h" line="541"/>
<source>Toggle pN₂ graph</source>
<translation>Skru av/på pN₂-graf</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+ <location filename="../build/ui_mainwindow.h" line="542"/>
+ <source>Toggle pHe graph</source>
+ <translation>Skru pHe-graf av/på</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+ <location filename="../build/ui_mainwindow.h" line="543"/>
+ <source>Toggle DC reported ceiling</source>
+ <translation>Skru av/på dekograf fra computer</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+ <location filename="../build/ui_mainwindow.h" line="544"/>
+ <source>Toggle calculated ceiling</source>
+ <translation>Skru av/på dekograf</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+ <location filename="../build/ui_mainwindow.h" line="545"/>
+ <source>Toggle calculating all tissues</source>
+ <translation>Skru av/på utregning av vev</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+ <location filename="../build/ui_mainwindow.h" line="546"/>
+ <source>Toggle calculated ceiling with 3m increments</source>
+ <translation>Skru av/på 3m-inkrementer for dekotak</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+ <location filename="../build/ui_mainwindow.h" line="547"/>
+ <source>Toggle heart rate</source>
+ <translation>Skru av/på hjertefrekvens</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+ <location filename="../build/ui_mainwindow.h" line="548"/>
+ <source>Toggle MOD</source>
+ <translation>Skru av/på MOD</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+ <location filename="../build/ui_mainwindow.h" line="549"/>
+ <source>Toggle EAD, END, EADD</source>
+ <translation>Skru av/på EAD, END, EADD</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+ <location filename="../build/ui_mainwindow.h" line="550"/>
+ <source>Toggle NDL, TTS</source>
+ <translation>Skru av/på NDL, TTS</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+ <location filename="../build/ui_mainwindow.h" line="551"/>
+ <source>Toggle SAC rate</source>
+ <translation>Skru av/på SAC</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+ <location filename="../build/ui_mainwindow.h" line="552"/>
+ <source>Toggle ruler</source>
+ <translation>Skru av/på linjal</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
<location filename="../build/ui_mainwindow.h" line="553"/>
<source>Scale graph</source>
<translation>Skaler graf</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
<location filename="../build/ui_mainwindow.h" line="554"/>
<source>Toggle pictures</source>
<translation>Skru av/på bilder</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
<location filename="../build/ui_mainwindow.h" line="555"/>
<source>Toggle tank bar</source>
<translation>Skru av/på tank-linjen</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
<location filename="../build/ui_mainwindow.h" line="556"/>
<source>&amp;Filter divelist</source>
<translation>&amp;Filtrer dykkeliste</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
- <location filename="../build/ui_mainwindow.h" line="558"/>
- <source>Toggle tissue graph</source>
- <translation>Skru av/på vev-graf</translation>
+ <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+ <location filename="../build/ui_mainwindow.h" line="557"/>
+ <source>Ctrl+F</source>
+ <translation>Ctrl+F</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+ <source>Toggle tissue heat-map</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
<location filename="../build/ui_mainwindow.h" line="559"/>
<source>User &amp;survey</source>
<translation>Brukerunder&amp;søkelse</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
<location filename="../build/ui_mainwindow.h" line="560"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
<source>&amp;Undo</source>
<translation>Angre</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
<location filename="../build/ui_mainwindow.h" line="561"/>
<source>Ctrl+Z</source>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
<location filename="../build/ui_mainwindow.h" line="562"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
<source>&amp;Redo</source>
<translation>Gjør om</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
<location filename="../build/ui_mainwindow.h" line="563"/>
<source>Ctrl+Shift+Z</source>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
<location filename="../build/ui_mainwindow.h" line="564"/>
<source>&amp;Find moved images</source>
<translation>&amp;Finn bilder som er flyttet</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
<source>Open c&amp;loud storage</source>
<translation>Åpne skylager</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
<source>Save to clo&amp;ud storage</source>
<translation>Lagre til skylager</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
<location filename="../build/ui_mainwindow.h" line="567"/>
<source>&amp;Manage dive sites</source>
<translation>Dykkestedsdatabase</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
<source>Dive Site &amp;Edit</source>
<translation>R&amp;ediger dykkested</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
<source>Facebook</source>
<translation>Facebook</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
- <source>Add GPS location here</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+ <source>Take cloud storage online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
- <location filename="../build/ui_mainwindow.h" line="557"/>
- <source>Ctrl+F</source>
- <translation>Ctrl+F</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
- <location filename="../build/ui_mainwindow.h" line="478"/>
- <source>&amp;Print</source>
- <translation>Skriv ut</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
- <location filename="../build/ui_mainwindow.h" line="481"/>
- <source>Ctrl+,</source>
- <translation>Ctrl+,</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
- <location filename="../build/ui_mainwindow.h" line="482"/>
- <source>&amp;Quit</source>
- <translation>Avslutt</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
- <location filename="../build/ui_mainwindow.h" line="484"/>
- <source>Import from &amp;dive computer</source>
- <translation>Importer fra &amp;dykkecomputer</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
- <location filename="../build/ui_mainwindow.h" line="487"/>
- <source>Ctrl+G</source>
- <translation>Ctrl+G</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
- <location filename="../build/ui_mainwindow.h" line="490"/>
- <source>Ctrl++</source>
- <translation>Ctrl++</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
- <location filename="../build/ui_mainwindow.h" line="496"/>
- <source>&amp;Renumber</source>
- <translation>Nummere&amp;r på nytt</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
- <location filename="../build/ui_mainwindow.h" line="497"/>
- <source>Ctrl+R</source>
- <translation>Ctrl+R</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
- <location filename="../build/ui_mainwindow.h" line="500"/>
- <source>Ctrl+Y</source>
- <translation>Ctrl+Y</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
- <location filename="../build/ui_mainwindow.h" line="519"/>
- <source>Ctrl+L</source>
- <translation>Ctrl+L</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
- <location filename="../build/ui_mainwindow.h" line="479"/>
- <source>Ctrl+P</source>
- <translation>Ctrl+P</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
- <location filename="../build/ui_mainwindow.h" line="483"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
- <location filename="../build/ui_mainwindow.h" line="485"/>
- <source>Ctrl+D</source>
- <translation>Ctrl+D</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
- <location filename="../build/ui_mainwindow.h" line="489"/>
- <source>&amp;Add dive</source>
- <translation>Legg til dykk</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
- <location filename="../build/ui_mainwindow.h" line="498"/>
- <source>Auto &amp;group</source>
- <translation>Auto&amp;grupper</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
- <location filename="../build/ui_mainwindow.h" line="499"/>
- <source>&amp;Yearly statistics</source>
- <translation>Årsstatistikk</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
- <location filename="../build/ui_mainwindow.h" line="501"/>
- <source>&amp;Dive list</source>
- <translation>&amp;Dykkeliste</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
- <location filename="../build/ui_mainwindow.h" line="502"/>
- <source>Ctrl+2</source>
- <translation>Ctrl+2</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
- <location filename="../build/ui_mainwindow.h" line="504"/>
- <source>Ctrl+3</source>
- <translation>Ctrl+3</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
- <location filename="../build/ui_mainwindow.h" line="506"/>
- <source>Ctrl+4</source>
- <translation>Ctrl+4</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
- <location filename="../build/ui_mainwindow.h" line="508"/>
- <source>Ctrl+1</source>
- <translation>Ctrl+1</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
- <location filename="../build/ui_mainwindow.h" line="509"/>
- <source>P&amp;revious DC</source>
- <translation>Fo&amp;rrige computer</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
- <location filename="../build/ui_mainwindow.h" line="510"/>
- <source>Left</source>
- <translation>Venstre</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
- <location filename="../build/ui_mainwindow.h" line="512"/>
- <source>Right</source>
- <translation>Høyre</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
- <location filename="../build/ui_mainwindow.h" line="514"/>
- <source>User &amp;manual</source>
- <translation>Bruker&amp;manual</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
- <location filename="../build/ui_mainwindow.h" line="515"/>
- <source>F1</source>
- <translation>F1</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
- <location filename="../build/ui_mainwindow.h" line="517"/>
- <source>Ctrl+5</source>
- <translation>Ctrl+5</translation>
+ <location filename="../build/ui_mainwindow.h" line="558"/>
+ <source>Toggle tissue graph</source>
+ <translation>Skru av/på vev-graf</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
- <location filename="../build/ui_mainwindow.h" line="518"/>
- <source>P&amp;lan dive</source>
- <translation>P&amp;lanlegg dykk</translation>
+ <location filename="../build/ui_mainwindow.h" line="565"/>
+ <source>Open cloud storage</source>
+ <translation>Åpne skylager</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
- <location filename="../build/ui_mainwindow.h" line="520"/>
- <source>&amp;Import log files</source>
- <translation>&amp;Importer loggfiler</translation>
+ <location filename="../build/ui_mainwindow.h" line="566"/>
+ <source>Save to cloud storage</source>
+ <translation>Lagre til skyen</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
- <location filename="../build/ui_mainwindow.h" line="522"/>
- <source>Import divelog files from other applications</source>
- <translation>Importer dykkelogg fra andre programmer</translation>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+ <source>Connect to</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
- <location filename="../build/ui_mainwindow.h" line="530"/>
- <source>F11</source>
- <translation>F11</translation>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+ <source>Please save or cancel the current dive edit before opening a new file.</source>
+ <translation>Lagre eller avbryt redigeringa før du åpner en ny fil.</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
<source>Open file</source>
<translation>Åpne fil</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
<location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@@ -5253,6 +5352,16 @@ fra luft og bruker:
<translation>Går gjennom bilder... (dette kan ta en stund)</translation>
</message>
<message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+ <source>Warning</source>
+ <translation>Advarsel</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
<source>Please save or cancel the current dive edit before closing the file.</source>
<translation>Lagre eller avbryt redigeringen før du lukker fila.</translation>
@@ -5268,125 +5377,98 @@ fra luft og bruker:
<translation>Skriv ut løpetidstabel</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+ <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+ <translation>Prøver å re-planlegge et dykk som ikke allerede er et planlagt dykk.</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+ <source>Please, first finish the current edition before trying to do another.</source>
+ <translation>Avslutt denne redigeringa før du starter en ny.</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
<source>Trying to edit a dive that&apos;s not a manually added dive.</source>
<translation>Prøver å redigere et dykk som ikke er lagt til manuelt.</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+ <source>Yearly statistics</source>
+ <translation>Årsstatistikk</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
<source>Do you want to save the changes that you made in the file %1?</source>
<translation>Vil du lagre endringene i fila %1?</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
<source>Do you want to save the changes that you made in the data file?</source>
<translation>Vil du lagre endrinene i datafila?</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
<source>Save changes?</source>
<translation>Lagre endringer?</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+ <source>Changes will be lost if you don&apos;t save them.</source>
+ <translation>Endringer vil gå tapt hvis du ikke lagrer.</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
<source>Save file as</source>
<translation>Lagre fil som</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+ <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+ <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+ <source>[local cache for] %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
<source>[cloud storage for] %1</source>
<translation>[skylager for] %1</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
<source>Opening datafile from older version</source>
<translation>Åpner datafil fra eldre versjon</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
<source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
<translation>Du åpnet en datafil fra en eldre versjon av Subsurface. Vi anbefaler at du leser manualen for å else om endringene i den nye versjonen, særlig med tanke på dykkestedsdatabasen.
Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på dykkestedsdatabasen og sjekke at alt er greit.</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
<source>Open dive log file</source>
<translation>Åpne dykkelogg</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
<source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
<source>Contacting cloud service...</source>
<translation>Kontakter skylager...</translation>
</message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
- <source>Changes will be lost if you don&apos;t save them.</source>
- <translation>Endringer vil gå tapt hvis du ikke lagrer.</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
- <source>Warning</source>
- <translation>Advarsel</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
- <source>Please save or cancel the current dive edit before opening a new file.</source>
- <translation>Lagre eller avbryt redigeringa før du åpner en ny fil.</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
- <source>Connect to</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
- <source>Trying to replan a dive that&apos;s not a planned dive.</source>
- <translation>Prøver å re-planlegge et dykk som ikke allerede er et planlagt dykk.</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
- <source>Yearly statistics</source>
- <translation>Årsstatistikk</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
- <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
- <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
- <source>Please, first finish the current edition before trying to do another.</source>
- <translation>Avslutt denne redigeringa før du starter en ny.</translation>
- </message>
- <message>
- <location filename="../build/ui_mainwindow.h" line="565"/>
- <source>Open cloud storage</source>
- <translation>Åpne skylager</translation>
- </message>
- <message>
- <location filename="../build/ui_mainwindow.h" line="566"/>
- <source>Save to cloud storage</source>
- <translation>Lagre til skyen</translation>
- </message>
</context>
<context>
<name>MultiFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
<source>Filter shows %1 (of %2) dives</source>
<translation>Filter viser %1 (av %2) dykk</translation>
</message>
@@ -5394,12 +5476,12 @@ Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på
<context>
<name>OstcFirmwareCheck</name>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
<source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
<translation>Du burde oppdatere firmwaren på computeren din: du har versjon %1 men den siste stabile versjonen er %2</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
<source>
Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5408,27 +5490,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal laste ned logbook, før du fortsetter med oppdateringa</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
<source>Not now</source>
<translation>Ikke nå</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
<source>Update firmware</source>
<translation>Oppdater firmware</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
<source>Firmware upgrade notice</source>
<translation>Firmwareoppgraderingsnotis</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
<source>Save the downloaded firmware as</source>
<translation>Lagre den nedlastede firmwaren som</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
<source>HEX files (*.hex)</source>
<translation>HEX-filer (*.hex)</translation>
</message>
@@ -5436,79 +5518,89 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<context>
<name>PlannerSettingsWidget</name>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
<source>Open circuit</source>
<translation>Åpent system</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
<source>CCR</source>
<translation>CCR</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
<source>pSCR</source>
<translation>pSCR</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
<source>ft/min</source>
<translation>ft/min</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
<source>Last stop at 20ft</source>
<translation>Siste stopp ved 20ft</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
<source>50% avg. depth to 20ft</source>
<translation>50% av snittdybde til 20ft</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
<source>20ft to surface</source>
<translation>20ft til overflaten</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+ <source>ft</source>
+ <translation>ft</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
<source>m/min</source>
<translation>m/min</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
<source>Last stop at 6m</source>
<translation>Siste stopp ved 6m</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
<source>50% avg. depth to 6m</source>
<translation>50% av snittdybde til 6m</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
<source>6m to surface</source>
<translation>6m til overflaten</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
- <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+ <source>m</source>
+ <translation>m</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
<source>cuft/min</source>
<translation>ft³/min</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
- <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
<source>ℓ/min</source>
<translation>ℓ/min</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
<source>bar</source>
<translation>bar</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
<source>psi</source>
<translation>psi</translation>
</message>
@@ -5658,6 +5750,11 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<context>
<name>PreferencesDialog</name>
<message>
+ <location filename="../build/ui_preferences.h" line="1283"/>
+ <source>Preferences</source>
+ <translation>Valg</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1288"/>
<source>Defaults</source>
<translation>Standardvalg</translation>
@@ -5693,6 +5790,11 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>Geo-referanse</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1303"/>
+ <source>Lists and tables</source>
+ <translation>Lister og tabeller</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1304"/>
<source>Font</source>
<translation>Skrifttype</translation>
@@ -5708,6 +5810,11 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>Dykk</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1307"/>
+ <source>Default dive log file</source>
+ <translation>Standard loggfil</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1308"/>
<source>No default file</source>
<translation>Ingen forhåndsvalgt fil</translation>
@@ -5738,6 +5845,21 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>...</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1314"/>
+ <source>Display invalid</source>
+ <translation>Vis ugyldige</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1316"/>
+ <source>Default cylinder</source>
+ <translation>Standardflaske</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1317"/>
+ <source>Use default cylinder</source>
+ <translation>Bruk standardflaske</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1318"/>
<source>Animations</source>
<translation>Animasjoner</translation>
@@ -5768,40 +5890,24 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>System</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1401"/>
- <source>Dive site geo lookup</source>
- <translation>Geo-oppslag av dykkested</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1402"/>
- <source>Enable geocoding for dive site management</source>
- <translation>Skru på geo-koding for dykkestedsdatabase</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1403"/>
- <source>Parse site without GPS data</source>
- <translation>Les inn sted uten GPS-data</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1404"/>
- <source>Same format for existing dives</source>
- <translation>Samme format for eksisterende dyk</translation>
+ <location filename="../build/ui_preferences.h" line="1324"/>
+ <source>&amp;Metric</source>
+ <translation>&amp;Metrisk</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1405"/>
- <source>Dive Site Layout</source>
- <translation>Dykkestedsoppsett</translation>
+ <location filename="../build/ui_preferences.h" line="1325"/>
+ <source>Imperial</source>
+ <translation>Britiske mål</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1406"/>
- <location filename="../build/ui_preferences.h" line="1407"/>
- <source>/</source>
- <translation>/</translation>
+ <location filename="../build/ui_preferences.h" line="1326"/>
+ <source>Personali&amp;ze</source>
+ <translation>Personifiser</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1325"/>
- <source>Imperial</source>
- <translation>Britiske mål</translation>
+ <location filename="../build/ui_preferences.h" line="1327"/>
+ <source>Individual settings</source>
+ <translation>Individuelle valg</translation>
</message>
<message>
<location filename="../build/ui_preferences.h" line="1328"/>
@@ -5819,6 +5925,11 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>fot</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1331"/>
+ <source>Pressure</source>
+ <translation>Trykk</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1332"/>
<location filename="../build/ui_preferences.h" line="1366"/>
<source>bar</source>
@@ -5830,11 +5941,26 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>psi</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1334"/>
+ <source>Volume</source>
+ <translation>Volum</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1335"/>
+ <source>&amp;liter</source>
+ <translation>&amp;liter</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1336"/>
<source>cu ft</source>
<translation>ft³</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1337"/>
+ <source>Temperature</source>
+ <translation>Temperatur</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1338"/>
<source>celsius</source>
<translation>celsius</translation>
@@ -5845,11 +5971,121 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>fahrenheit</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1340"/>
+ <source>Weight</source>
+ <translation>Vekt</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1341"/>
<source>kg</source>
<translation>kg</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1342"/>
+ <source>lbs</source>
+ <translation>pund</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1343"/>
+ <source>Time units</source>
+ <translation>Tidsenheter</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1344"/>
+ <source>Ascent/descent speed denominator</source>
+ <translation>Tidsenhet for opp- og nedstigning</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1345"/>
+ <source>Minutes</source>
+ <translation>Minutter</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1346"/>
+ <source>Seconds</source>
+ <translation>Sekunder</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1347"/>
+ <source>GPS coordinates</source>
+ <translation>GPS-koordinater</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1348"/>
+ <source>Location Display</source>
+ <translation>Stedsvisning</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1349"/>
+ <source>traditional (dms)</source>
+ <translation>tradisjonell (dms)</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1350"/>
+ <source>decimal</source>
+ <translation>desimal</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1351"/>
+ <source>Show</source>
+ <translation>Vis</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1352"/>
+ <source>Threshold when showing pO₂</source>
+ <translation>Grense når pO₂ vises</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1353"/>
+ <source>Threshold when showing pN₂</source>
+ <translation>Grense når pN₂ vises</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1354"/>
+ <source>Threshold when showing pHe</source>
+ <translation>Grense når pHe vises</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1355"/>
+ <source>Max pO₂ when showing MOD</source>
+ <translation>Maks pO₂ når MOD vises</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1356"/>
+ <source>Draw dive computer reported ceiling red</source>
+ <translation>Farg dekograf fra dykkecomputer i rødt</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1357"/>
+ <source>Show unused cylinders in Equipment tab</source>
+ <translation>Vis ubrukte flasker i utstyrsfanen</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1358"/>
+ <source>Show average depth</source>
+ <translation>Vis snittdybde</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1359"/>
+ <source>Misc</source>
+ <translation>Ymse</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1360"/>
+ <source>GFLow</source>
+ <translation>GF lav</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1361"/>
+ <source>GFHigh</source>
+ <translation>GF høy</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1362"/>
+ <source>GFLow at max depth</source>
+ <translation>GF lav ved maksdybde</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1363"/>
<source>CCR: show setpoints when viewing pO₂</source>
<translation>CCR: vis settpunkter når pO₂ vises</translation>
@@ -5895,14 +6131,19 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>Systemstandard</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1374"/>
+ <source>Filter</source>
+ <translation>Filter</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1375"/>
<source>Proxy</source>
<translation>Proxy</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1379"/>
- <source>Proxy type</source>
- <translation>Proxytype</translation>
+ <location filename="../build/ui_preferences.h" line="1376"/>
+ <source>Port</source>
+ <translation>Port</translation>
</message>
<message>
<location filename="../build/ui_preferences.h" line="1377"/>
@@ -5910,16 +6151,16 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>Tjener</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1376"/>
- <source>Port</source>
- <translation>Port</translation>
- </message>
- <message>
<location filename="../build/ui_preferences.h" line="1378"/>
<source>Requires authentication</source>
<translation>Krever autentisering</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1379"/>
+ <source>Proxy type</source>
+ <translation>Proxytype</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1380"/>
<source>Username</source>
<translation>Brukernavn</translation>
@@ -5931,46 +6172,6 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>Passord</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1400"/>
- <source>Disconnect from Facebook</source>
- <translation>Koble fra Facebook</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1374"/>
- <source>Filter</source>
- <translation>Filter</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1331"/>
- <source>Pressure</source>
- <translation>Trykk</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1303"/>
- <source>Lists and tables</source>
- <translation>Lister og tabeller</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1307"/>
- <source>Default dive log file</source>
- <translation>Standard loggfil</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1314"/>
- <source>Display invalid</source>
- <translation>Vis ugyldige</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1316"/>
- <source>Default cylinder</source>
- <translation>Standardflaske</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1317"/>
- <source>Use default cylinder</source>
- <translation>Bruk standardflaske</translation>
- </message>
- <message>
<location filename="../build/ui_preferences.h" line="1382"/>
<source>Subsurface cloud storage</source>
<translation>Skylager for Subsurface</translation>
@@ -6011,149 +6212,40 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>Lagre bruker-ID lokalt?</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1334"/>
- <source>Volume</source>
- <translation>Volum</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1337"/>
- <source>Temperature</source>
- <translation>Temperatur</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1340"/>
- <source>Weight</source>
- <translation>Vekt</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1342"/>
- <source>lbs</source>
- <translation>pund</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1343"/>
- <source>Time units</source>
- <translation>Tidsenheter</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1345"/>
- <source>Minutes</source>
- <translation>Minutter</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1346"/>
- <source>Seconds</source>
- <translation>Sekunder</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1351"/>
- <source>Show</source>
- <translation>Vis</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1362"/>
- <source>GFLow at max depth</source>
- <translation>GF lav ved maksdybde</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1359"/>
- <source>Misc</source>
- <translation>Ymse</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1283"/>
- <source>Preferences</source>
- <translation>Valg</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1324"/>
- <source>&amp;Metric</source>
- <translation>&amp;Metrisk</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1326"/>
- <source>Personali&amp;ze</source>
- <translation>Personifiser</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1327"/>
- <source>Individual settings</source>
- <translation>Individuelle valg</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1335"/>
- <source>&amp;liter</source>
- <translation>&amp;liter</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1344"/>
- <source>Ascent/descent speed denominator</source>
- <translation>Tidsenhet for opp- og nedstigning</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1347"/>
- <source>GPS coordinates</source>
- <translation>GPS-koordinater</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1348"/>
- <source>Location Display</source>
- <translation>Stedsvisning</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1349"/>
- <source>traditional (dms)</source>
- <translation>tradisjonell (dms)</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1350"/>
- <source>decimal</source>
- <translation>desimal</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1352"/>
- <source>Threshold when showing pO₂</source>
- <translation>Grense når pO₂ vises</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1353"/>
- <source>Threshold when showing pN₂</source>
- <translation>Grense når pN₂ vises</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1354"/>
- <source>Threshold when showing pHe</source>
- <translation>Grense når pHe vises</translation>
+ <location filename="../build/ui_preferences.h" line="1400"/>
+ <source>Disconnect from Facebook</source>
+ <translation>Koble fra Facebook</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1355"/>
- <source>Max pO₂ when showing MOD</source>
- <translation>Maks pO₂ når MOD vises</translation>
+ <location filename="../build/ui_preferences.h" line="1401"/>
+ <source>Dive site geo lookup</source>
+ <translation>Geo-oppslag av dykkested</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1356"/>
- <source>Draw dive computer reported ceiling red</source>
- <translation>Farg dekograf fra dykkecomputer i rødt</translation>
+ <location filename="../build/ui_preferences.h" line="1402"/>
+ <source>Enable geocoding for dive site management</source>
+ <translation>Skru på geo-koding for dykkestedsdatabase</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1357"/>
- <source>Show unused cylinders in Equipment tab</source>
- <translation>Vis ubrukte flasker i utstyrsfanen</translation>
+ <location filename="../build/ui_preferences.h" line="1403"/>
+ <source>Parse site without GPS data</source>
+ <translation>Les inn sted uten GPS-data</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1358"/>
- <source>Show average depth</source>
- <translation>Vis snittdybde</translation>
+ <location filename="../build/ui_preferences.h" line="1404"/>
+ <source>Same format for existing dives</source>
+ <translation>Samme format for eksisterende dyk</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1360"/>
- <source>GFLow</source>
- <translation>GF lav</translation>
+ <location filename="../build/ui_preferences.h" line="1405"/>
+ <source>Dive Site Layout</source>
+ <translation>Dykkestedsoppsett</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1361"/>
- <source>GFHigh</source>
- <translation>GF høy</translation>
+ <location filename="../build/ui_preferences.h" line="1406"/>
+ <location filename="../build/ui_preferences.h" line="1407"/>
+ <source>/</source>
+ <translation>/</translation>
</message>
</context>
<context>
@@ -6209,106 +6301,136 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
- <source>Show</source>
- <translation>Vis</translation>
+ <source>Gas pressure display setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
- <source>Threshold when showing pO₂</source>
- <translation>Grense når pO₂ vises</translation>
+ <source>Threshold for pO₂ (bar)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
- <source>Threshold when showing pN₂</source>
- <translation>Grense når pN₂ vises</translation>
+ <source>Threshold for pN₂ (bar)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
- <source>Threshold when showing pHe</source>
- <translation>Grense når pHe vises</translation>
+ <source>Threshold for pHe (bar)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
- <source>Max pO₂ when showing MOD</source>
- <translation>Maks pO₂ når MOD vises</translation>
+ <source>pO₂ in calculating MOD (bar)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+ <source>CCR options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+ <source>Dive planner default setpoint (bar)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+ <source>Show setpoints when viewing pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+ <source>Show individual O₂ sensor values when viewing pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+ <source>Ceiling display setup</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
<source>Draw dive computer reported ceiling red</source>
<translation>Farg dekograf fra dykkecomputer i rødt</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
- <source>Show unused cylinders in Equipment tab</source>
- <translation>Vis ubrukte flasker i utstyrsfanen</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+ <source>Algorithm for calculated ceiling:</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
- <source>Show mean depth</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+ <source>VPM-B</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
- <source>Misc</source>
- <translation>Ymse</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+ <source>VPM-B Conservatism</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
- <source>bar</source>
- <translation>bar</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+ <source>+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
- <source>Default CCR set-point for dive planning</source>
- <translation>Standard CCR settpunkt for dykkeplanlegging</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+ <source>Bühlmann</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
- <source>pSCR O₂ metabolism rate</source>
- <translation>pSCR O₂ metabolisme-rate</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+ <source>GFHigh</source>
+ <translation>GF høy</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
<source>GFLow</source>
<translation>GF lav</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
- <source>GFHigh</source>
- <translation>GF høy</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+ <source>GFLow at max depth</source>
+ <translation>GF lav ved maksdybde</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
- <source>ℓ/min</source>
- <translation>ℓ/min</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+ <source>pSCR options:</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
- <source>pSCR ratio</source>
- <translation>pSCR-forhold</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+ <source>Metabolic rate (ℓ O₂/min)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+ <source>Dilution ratio</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
<source>1:</source>
<translation>1:</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
- <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
- <translation>CCR: vis individuelle O₂-sensorverdier når pO₂ vises</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+ <source>Misc</source>
+ <translation>Ymse</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
- <source>CCR: show setpoints when viewing pO₂</source>
- <translation>CCR: vis settpunkter når pO₂ vises</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+ <source>Show unused cylinders in Equipment tab</source>
+ <translation>Vis ubrukte flasker i utstyrsfanen</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
- <source>GFLow at max depth</source>
- <translation>GF lav ved maksdybde</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+ <source>Show mean depth in Profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
<source>Graph</source>
<translation>Graf</translation>
</message>
@@ -6377,15 +6499,29 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>Språk</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
<source>Restart required</source>
<translation>Programmet må startes på nytt</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
<source>To correctly load a new language you must restart Subsurface.</source>
<translation>For å bytte språk må du starte Subsurface på nytt.</translation>
</message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+ <source>Literal characters</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+ <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>PreferencesNetwork</name>
@@ -6432,7 +6568,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
<source>Subsurface cloud storage</source>
<translation>Skylager for Subsurface</translation>
</message>
@@ -6477,39 +6613,39 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>Lagre bruker-ID lokalt?</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
<source>Network</source>
<translation>Nettverk</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
<source>No proxy</source>
<translation>Ingen proxy</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
<source>System proxy</source>
<translation>System-proxy</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
<source>HTTP proxy</source>
<translation>HTTP-proxy</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
<source>SOCKS proxy</source>
<translation>SOCKS-proxy</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
<source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
<translation>Epost og passord for skylager kan bare bestå av bokstaver, tall og &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, og &apos;+&apos;.</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
<source>Subsurface cloud storage (credentials verified)</source>
<translation>Skylager for Subsurface (bruker godkjent)</translation>
</message>
@@ -6667,7 +6803,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>desimal</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+ <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
<source>Units</source>
<translation>Enheter</translation>
</message>
@@ -6675,17 +6811,17 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<context>
<name>PrintDialog</name>
<message>
- <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
- <source>&amp;Preview</source>
- <translation>Forhåndsvisning</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+ <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
<source>P&amp;rint</source>
<translation>Skriv ut</translation>
</message>
<message>
- <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+ <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+ <source>&amp;Preview</source>
+ <translation>Forhåndsvisning</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
<source>Print</source>
<translation>Skriv ut</translation>
</message>
@@ -6693,19 +6829,10 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<context>
<name>PrintOptions</name>
<message>
- <location filename="../build/ui_printoptions.h" line="150"/>
- <source>&amp;Table print</source>
- <translation>&amp;Tabellutskrift</translation>
- </message>
- <message>
- <location filename="../build/ui_printoptions.h" line="158"/>
- <source>One dive per page</source>
- <translation>Ett dykk per side</translation>
- </message>
- <message>
- <location filename="../build/ui_printoptions.h" line="159"/>
- <source>Two dives per page</source>
- <translation>To dykk per side</translation>
+ <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+ <location filename="../build/ui_printoptions.h" line="148"/>
+ <source>Print type</source>
+ <translation>Utskriftstype</translation>
</message>
<message>
<location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6765,10 +6892,19 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>Import</translation>
</message>
<message>
- <location filename="../desktop-widgets/printoptions.ui" line="29"/>
- <location filename="../build/ui_printoptions.h" line="148"/>
- <source>Print type</source>
- <translation>Utskriftstype</translation>
+ <location filename="../build/ui_printoptions.h" line="150"/>
+ <source>&amp;Table print</source>
+ <translation>&amp;Tabellutskrift</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_printoptions.h" line="158"/>
+ <source>One dive per page</source>
+ <translation>Ett dykk per side</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_printoptions.h" line="159"/>
+ <source>Two dives per page</source>
+ <translation>To dykk per side</translation>
</message>
<message>
<location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6810,103 +6946,103 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>Ukjent computer</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
<source>Show NDL / TTS was disabled because of excessive processing time</source>
<translation>Funksjonen Vis NDL/TTS ble avskrudd siden den brukte for mye ressurser</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
<source>Make first divecomputer</source>
<translation>Gjør til første dykkecomputer</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
<source>Delete this divecomputer</source>
<translation>Slett denne dykkecomputeren</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
<source>Add gas change</source>
<translation>Legg til gassbytte</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
<source> (Tank %1)</source>
<translation>(Tank %1)</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
<source>Add set-point change</source>
<translation>Legg til settpunktendring</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
<source>Add bookmark</source>
<translation>Legg til bokmerke</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
<source>Edit the profile</source>
<translation>Rediger profil</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
<source>Remove event</source>
<translation>Fjern hendelse</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
<source>Hide similar events</source>
<translation>Skjul lignende hendelser</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
<source>Edit name</source>
<translation>Rediger navn</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
- <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
<source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
<translation>Juster trykket i tank %1 (nå er den satt til %2)</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
<source>Unhide all events</source>
<translation>Vis alle hendelser</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
<source>Hide events</source>
<translation>Skjul hendelser</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
<source>Hide all %1 events?</source>
<translation>Skjul alle %1 hendelser?</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
<source>Remove the selected event?</source>
<translation>Fjern den valgte hendelsen?</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
<source>%1 @ %2:%3</source>
<translation>%1 @ %2:%3</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
<source>Edit name of bookmark</source>
<translation>Rediger navn på bokmerke</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
<source>Custom name:</source>
<translation>Tilpasset navn:</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
<source>Name is too long!</source>
<translation>Navnet er for langt</translation>
</message>
@@ -6914,91 +7050,101 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<context>
<name>QMLManager</name>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
<source>Starting...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
<source>working in no-cloud mode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
<source>no cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
<source>Please enter valid cloud credentials.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
<source>Attempting to open cloud storage with new credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
<source>Testing cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+ <source>No response from cloud server to validate the credentials</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+ <source>Cannot connect to cloud storage - cloud account not verified</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
<source>Cloud credentials are invalid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
<source>Cannot open cloud storage: Error creating https connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
<source>Cannot open cloud storage: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
<source>Cannot connect to cloud storage</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
<source>Cloud storage error: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
<source>Failed to connect to cloud server, reverting to no cloud status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
<source>Cloud storage open successfully. No dives in dive list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
<source>h</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
<source>min</source>
<translation>min</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
<source>sec</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
<source>Unknown GPS location</source>
<translation type="unfinished"/>
</message>
@@ -7006,126 +7152,126 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<context>
<name>QObject</name>
<message>
- <location filename="../core/qthelper.cpp" line="866"/>
- <location filename="../core/qthelper.cpp" line="1214"/>
- <source>AIR</source>
- <translation>Luft</translation>
+ <location filename="../core/gpslocation.h" line="13"/>
+ <source>Waiting to aquire GPS location</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="1214"/>
- <source>OXYGEN</source>
- <translation>Oksygen</translation>
+ <location filename="../core/qthelper.cpp" line="766"/>
+ <location filename="../core/qthelper.cpp" line="1275"/>
+ <source>m</source>
+ <translation>m</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
- <source>Remove this point</source>
- <translation>Fjern dette punktet</translation>
+ <location filename="../core/qthelper.cpp" line="768"/>
+ <location filename="../core/qthelper.cpp" line="1274"/>
+ <source>ft</source>
+ <translation>ft</translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
- <source>Average</source>
- <translation>Gjennomsnitt</translation>
+ <location filename="../core/qthelper.cpp" line="794"/>
+ <source>C</source>
+ <translation>C</translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
- <source>Minimum</source>
- <translation>Minimum</translation>
+ <location filename="../core/qthelper.cpp" line="796"/>
+ <source>F</source>
+ <translation>F</translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
- <source>Maximum</source>
- <translation>Maksimum</translation>
+ <location filename="../core/qthelper.cpp" line="821"/>
+ <location filename="../core/qthelper.cpp" line="1250"/>
+ <source>kg</source>
+ <translation>kg</translation>
</message>
<message>
- <location filename="../desktop-widgets/globe.cpp" line="327"/>
- <source>Move the map and double-click to set the dive location</source>
- <translation>Finn sted i kartet og dobbeltklikk for å sette posisjon</translation>
+ <location filename="../core/qthelper.cpp" line="823"/>
+ <location filename="../core/qthelper.cpp" line="1251"/>
+ <source>lbs</source>
+ <translation>pund</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
- <source>unknown</source>
- <translation>ukjent</translation>
+ <location filename="../core/qthelper.cpp" line="848"/>
+ <location filename="../core/qthelper.cpp" line="1300"/>
+ <source>bar</source>
+ <translation>bar</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
- <source>h:</source>
- <translation>t:</translation>
+ <location filename="../core/qthelper.cpp" line="850"/>
+ <location filename="../core/qthelper.cpp" line="1299"/>
+ <source>psi</source>
+ <translation>psi</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
- <source>min</source>
- <translation>min</translation>
+ <location filename="../core/qthelper.cpp" line="871"/>
+ <location filename="../core/qthelper.cpp" line="1235"/>
+ <source>AIR</source>
+ <translation>Luft</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
- <source>Multiple</source>
+ <location filename="../core/qthelper.cpp" line="873"/>
+ <source>EAN</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../core/qthelper.cpp" line="957"/>
+ <location filename="../core/qthelper.cpp" line="962"/>
<source>(%n dive(s))</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="816"/>
- <location filename="../core/qthelper.cpp" line="1228"/>
- <source>kg</source>
- <translation>kg</translation>
+ <location filename="../core/qthelper.cpp" line="1235"/>
+ <source>OXYGEN</source>
+ <translation>Oksygen</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="818"/>
- <location filename="../core/qthelper.cpp" line="1229"/>
- <source>lbs</source>
- <translation>pund</translation>
+ <location filename="../core/qthelper.cpp" line="1322"/>
+ <source>l</source>
+ <translation>l</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="763"/>
- <location filename="../core/qthelper.cpp" line="1252"/>
- <source>ft</source>
- <translation>ft</translation>
+ <location filename="../core/qthelper.cpp" line="1323"/>
+ <source>cuft</source>
+ <translation>ft³</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="761"/>
- <location filename="../core/qthelper.cpp" line="1253"/>
- <source>m</source>
- <translation>m</translation>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+ <source>unknown</source>
+ <translation>ukjent</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="789"/>
- <source>C</source>
- <translation>C</translation>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+ <source>h:</source>
+ <translation>t:</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="791"/>
- <source>F</source>
- <translation>F</translation>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+ <source>min</source>
+ <translation>min</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="845"/>
- <location filename="../core/qthelper.cpp" line="1275"/>
- <source>psi</source>
- <translation>psi</translation>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+ <source>Remove this point</source>
+ <translation>Fjern dette punktet</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="843"/>
- <location filename="../core/qthelper.cpp" line="1276"/>
- <source>bar</source>
- <translation>bar</translation>
+ <location filename="../desktop-widgets/globe.cpp" line="327"/>
+ <source>Move the map and double-click to set the dive location</source>
+ <translation>Finn sted i kartet og dobbeltklikk for å sette posisjon</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="868"/>
- <source>EAN</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+ <source>Average</source>
+ <translation>Gjennomsnitt</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="1298"/>
- <source>l</source>
- <translation>l</translation>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+ <source>Minimum</source>
+ <translation>Minimum</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="1299"/>
- <source>cuft</source>
- <translation>ft³</translation>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+ <source>Maximum</source>
+ <translation>Maksimum</translation>
</message>
<message>
<location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7147,17 +7293,12 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<source>Malformed XML response. Line %1: %2</source>
<translation>Feil formattert XML-svar. Linje %1: %2</translation>
</message>
- <message>
- <location filename="../core/gpslocation.h" line="13"/>
- <source>Waiting to aquire GPS location</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ReadSettingsThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
<source>This feature is not yet available for the selected dive computer.</source>
<translation>Denne funksjonen er ikke tilgjengelig for den valgte computeren.</translation>
</message>
@@ -7186,7 +7327,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<context>
<name>ResetSettingsThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
<source>Reset settings failed!</source>
<translation>Kunne ikke nullstille innstillinger!</translation>
</message>
@@ -7224,6 +7365,12 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<context>
<name>ShiftImageTimesDialog</name>
<message>
+ <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+ <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+ <source>Shift selected image times</source>
+ <translation>Flytt tid for valgte bilder</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
<location filename="../build/ui_shiftimagetimes.h" line="185"/>
<source>Shift times of image(s) by</source>
@@ -7236,12 +7383,6 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
<translation>h:mm</translation>
</message>
<message>
- <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
- <location filename="../build/ui_shiftimagetimes.h" line="184"/>
- <source>Shift selected image times</source>
- <translation>Flytt tid for valgte bilder</translation>
- </message>
- <message>
<location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
<location filename="../build/ui_shiftimagetimes.h" line="187"/>
<source>Earlier</source>
@@ -7293,12 +7434,12 @@ valgte dykk. </translation>
<translation>Hvilket dato og tid vises på bildet?</translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
<source>Open image file</source>
<translation>Åpne bilder</translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
<source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
<translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
</message>
@@ -7456,54 +7597,54 @@ valgte dykk. </translation>
<context>
<name>SocialNetworkDialog</name>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
<source>Dive date: %1
</source>
<translation>Dato: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
<source>Duration: %1
</source>
<translation>Varighet: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
<source>h:</source>
<comment>abbreviation for hours plus separator</comment>
<translation>t:</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
<source>min</source>
<comment>abbreviation for minutes</comment>
<translation>min</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
<source>Dive location: %1
</source>
<translation>Sted: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
<source>Buddy: %1
</source>
<translation>Buddy: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
<source>Divemaster: %1
</source>
<translation>Dykkeleder: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
<source>
%1</source>
<translation>
@@ -7589,9 +7730,20 @@ valgte dykk. </translation>
<name>StartPage</name>
<message>
<location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
- <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+ <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+ <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+ <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
<translation type="unfinished"/>
</message>
</context>
@@ -7630,7 +7782,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>SubsurfaceWebServices</name>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+ <source>Enter User ID and click Download</source>
+ <translation>Skriv inn bruker-ID og trykk Last ned</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
<source>Webservice</source>
<translation>Nettjeneste</translation>
</message>
@@ -7655,30 +7812,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation>Forbindelsesfeil:</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
- <source>Download successful</source>
- <translation>Nedlasting ferdig</translation>
- </message>
- <message>
<location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
<source>Invalid user identifier!</source>
<translation>Ugyldig bruker-ID!</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
- <source>Enter User ID and click Download</source>
- <translation>Skriv inn bruker-ID og trykk Last ned</translation>
- </message>
- <message>
<location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
<source>Cannot parse response!</source>
<translation>Kan ikke lese svar!</translation>
</message>
+ <message>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+ <source>Download successful</source>
+ <translation>Nedlasting ferdig</translation>
+ </message>
</context>
<context>
<name>SuitFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
<source>Suits: </source>
<translation>Drakter:</translation>
</message>
@@ -7686,7 +7838,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>SuitsFilterModel</name>
<message>
- <location filename="../qt-models/filtermodels.cpp" line="123"/>
+ <location filename="../qt-models/filtermodels.cpp" line="128"/>
<source>No suit set</source>
<translation>Ingen drakt er satt</translation>
</message>
@@ -7705,7 +7857,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TagFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
<source>Tags: </source>
<translation>Emneord:</translation>
</message>
@@ -7713,7 +7865,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TagFilterModel</name>
<message>
- <location filename="../qt-models/filtermodels.cpp" line="148"/>
+ <location filename="../qt-models/filtermodels.cpp" line="153"/>
<source>Empty tags</source>
<translation>Ingen emneord</translation>
</message>
@@ -7739,6 +7891,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TemplateEdit</name>
<message>
+ <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+ <source>Edit template</source>
+ <translation>Rediger mal</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/templateedit.ui" line="37"/>
<source>Preview</source>
<translation>Forhåndsvisning</translation>
@@ -7784,11 +7941,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation>Skriftstørrelse</translation>
</message>
<message>
- <location filename="../desktop-widgets/templateedit.ui" line="14"/>
- <source>Edit template</source>
- <translation>Rediger mal</translation>
- </message>
- <message>
<location filename="../desktop-widgets/templateedit.ui" line="165"/>
<source>Color palette</source>
<translation>Fargepalett</translation>
@@ -7970,85 +8122,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TextHyperlinkEventFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
<source>%1click to visit %2</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>ThemeTest</name>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
- <source>Theme Information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
- <source>Screen</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
- <source>Geometry (pixels):</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
- <source>Geometry (gridUnits):</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
- <source>Units.gridUnit:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
- <source>Units.devicePixelRatio:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
- <source>Font Metrics</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
- <source>FontMetrics pointSize:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
- <source>FontMetrics pixelSize:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
- <source>FontMetrics devicePixelRatio:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
- <source>Text item pixelSize:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
- <source>Text item pointSize:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
- <source>Pixel density:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
- <source>Height of default font:</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>ToolTipItem</name>
<message>
<location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8059,102 +8138,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TripItem</name>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="68"/>
<source>(%1 shown)</source>
<translation>(%1 vist)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="212"/>
<source>#</source>
<translation>#</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="215"/>
<source>Date</source>
<translation>Dato</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="218"/>
<source>Rating</source>
<translation>Vurdering</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="221"/>
<source>Depth(%1)</source>
<translation>Dybde(%1)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="221"/>
<source>m</source>
<translation>m</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="221"/>
<source>ft</source>
<translation>ft</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="224"/>
<source>Duration</source>
<translation>Varighet</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="227"/>
<source>Temp(%1%2)</source>
<translation>Temp(%1%2)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="230"/>
<source>Weight(%1)</source>
<translation>Vekt(%1)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="230"/>
<source>kg</source>
<translation>kg</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="230"/>
<source>lbs</source>
<translation>pund</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="233"/>
<source>Suit</source>
<translation>Drakt</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="236"/>
<source>Cyl</source>
<translation>Flaske</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="239"/>
<source>Gas</source>
<translation>Gass</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="244"/>
<source>SAC(%1)</source>
<translation>SAC(%1)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="244"/>
<source>/min</source>
<translation>/min</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="247"/>
<source>OTU</source>
<translation>OTU</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="250"/>
<source>Max CNS</source>
<translation>Maks CNS</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+ <source>Photos before/during/after dive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="256"/>
<source>Location</source>
<translation>Sted</translation>
</message>
@@ -8177,72 +8261,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>UpdateManager</name>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
<source>Check for updates.</source>
<translation>Se etter oppdateringer.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface klarte ikke å se etter oppdateringer.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
<source>The following error occurred:</source>
<translation>Den følgende feilen inntraff:</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
<source>Please check your internet connection.</source>
<translation>Sjekk internettforbindelsen din.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
<source>You are using the latest version of Subsurface.</source>
<translation>Du bruker den siste versjonen av Subsurface.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>En ny Subsurface-versjon er tilgjengelig.&lt;br/&gt;Klikk på &lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; for å laste den ned.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
<source>A new version of Subsurface is available.</source>
<translation>En ny versjon av Subsurface er tilgjengelig.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
<source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
<translation>Den siste versjonen er %1, se på %2 nedlastingssiden vår %3 for informasjon om hvordan du oppgraderer.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
<source>Newest release version is </source>
<translation>Den nyeste versjonen er</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
<source>The server returned the following information:</source>
<translation>Serveren svarte med denne informasjonen: </translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
- <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
- <translation>Subsurface sjekker automatisk etter ny versjon annenhver uke. Hvis du vil skru av sjekken, trykk Avslå. </translation>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+ <source>Subsurface is checking every two weeks if a new version is available.
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
<source>Decline</source>
<translation>Avslå</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
<source>Accept</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
<source>Automatic check for updates</source>
<translation>Sjekk etter oppdateringer automatisk</translation>
</message>
@@ -8264,24 +8349,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>UserSurvey</name>
<message>
- <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
- <location filename="../build/ui_usersurvey.h" line="151"/>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Vi ønsker å lære mer om brukerne være, valgene deres og bruksmønster. Fyll gjerne ut dette skjemaet og sen til Subsurface-teamet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
- <location filename="../build/ui_usersurvey.h" line="156"/>
- <source>Other software/sources</source>
- <translation>Annen programvare/kilder</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
- <location filename="../build/ui_usersurvey.h" line="157"/>
- <source>Manually entering dives</source>
- <translation>Legge inn dykk manuelt</translation>
- </message>
- <message>
<location filename="../desktop-widgets/usersurvey.ui" line="14"/>
<location filename="../build/ui_usersurvey.h" line="149"/>
<source>User survey</source>
@@ -8294,6 +8361,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation>Brukerundersøkelse for Subsurface</translation>
</message>
<message>
+ <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+ <location filename="../build/ui_usersurvey.h" line="151"/>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Vi ønsker å lære mer om brukerne være, valgene deres og bruksmønster. Fyll gjerne ut dette skjemaet og sen til Subsurface-teamet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/usersurvey.ui" line="63"/>
<location filename="../build/ui_usersurvey.h" line="152"/>
<source>Technical diver</source>
@@ -8318,6 +8391,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation>Støttede dykkecomputere</translation>
</message>
<message>
+ <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+ <location filename="../build/ui_usersurvey.h" line="156"/>
+ <source>Other software/sources</source>
+ <translation>Annen programvare/kilder</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+ <location filename="../build/ui_usersurvey.h" line="157"/>
+ <source>Manually entering dives</source>
+ <translation>Legge inn dykk manuelt</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/usersurvey.ui" line="141"/>
<location filename="../build/ui_usersurvey.h" line="158"/>
<source>Android/iPhone companion app</source>
@@ -8348,6 +8433,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation>Hvor importerer du dykkedata fra?</translation>
</message>
<message>
+ <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+ <source>Send</source>
+ <translation>Send</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
<source>
Operating system: %1</source>
@@ -8390,19 +8480,14 @@ Language: %1</source>
<translation>Spør senere</translation>
</message>
<message>
- <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
- <source>Submit user survey.</source>
- <translation>Send inn brukerundersøkelse.</translation>
- </message>
- <message>
<location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
<source>Ask again?</source>
<translation>Spørre igjen?</translation>
</message>
<message>
- <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
- <source>Send</source>
- <translation>Send</translation>
+ <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+ <source>Submit user survey.</source>
+ <translation>Send inn brukerundersøkelse.</translation>
</message>
<message>
<location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8494,12 +8579,12 @@ Language: %1</source>
<translation>Last opp</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
<source>Operation timed out</source>
<translation>Handlingen fikk tidsavbrudd</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
<source>Transferring data...</source>
<translation>Overfører data...</translation>
</message>
@@ -8534,18 +8619,18 @@ Language: %1</source>
<context>
<name>WriteSettingsThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
- <source>Failed!</source>
- <translation>Feil!</translation>
- </message>
- <message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
<source>This feature is not yet available for the selected dive computer.</source>
<translation>Denne funksjonen er ikke tilgjengelig for den valgte computeren.</translation>
</message>
+ <message>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+ <source>Failed!</source>
+ <translation>Feil!</translation>
+ </message>
</context>
<context>
<name>YearlyStatisticsModel</name>
@@ -8670,7 +8755,7 @@ Snitt</translation>
<context>
<name>getextFromC</name>
<message>
- <location filename="../core/libdivecomputer.c" line="674"/>
+ <location filename="../core/libdivecomputer.c" line="737"/>
<source>Error parsing the header</source>
<translation>Kunne ikke lese header</translation>
</message>
@@ -8678,38 +8763,377 @@ Snitt</translation>
<context>
<name>gettextFromC</name>
<message>
+ <location filename="../core/cochran.c" line="309"/>
+ <location filename="../core/cochran.c" line="315"/>
+ <location filename="../core/cochran.c" line="385"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>deco stop</source>
+ <translation>dekostopp</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="336"/>
+ <location filename="../core/cochran.c" line="390"/>
+ <location filename="../core/file.c" line="777"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>ascent</source>
+ <translation>oppstigning</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="342"/>
+ <location filename="../core/file.c" line="755"/>
+ <source>battery</source>
+ <translation>batteri</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="348"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
+ <source>OLF</source>
+ <translation>OLF</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="353"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
+ <source>maxdepth</source>
+ <translation>maksdybde</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="358"/>
+ <location filename="../core/cochran.c" line="404"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
+ <source>pO₂</source>
+ <translation>pO₂</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="365"/>
+ <location filename="../core/cochran.c" line="414"/>
+ <location filename="../core/cochran.c" line="421"/>
+ <location filename="../core/file.c" line="868"/>
+ <location filename="../core/libdivecomputer.c" line="225"/>
+ <location filename="../core/libdivecomputer.c" line="228"/>
+ <source>gaschange</source>
+ <translation>gassbytte</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="370"/>
+ <location filename="../core/cochran.c" line="409"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>rbt</source>
+ <translation>rbt</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="379"/>
+ <location filename="../core/cochran.c" line="426"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>ceiling</source>
+ <translation>tak</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="395"/>
+ <location filename="../core/libdivecomputer.c" line="224"/>
+ <source>transmitter</source>
+ <translation>sender</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="153"/>
+ <source>Error: the file does not appear to be a DATATRAK divelog</source>
+ <translation>Feil: dette ser ikke ut til å være en DATATRAK-fil</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="286"/>
+ <source>clear</source>
+ <translation>klart</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="289"/>
+ <source>misty</source>
+ <translation>lett tåke</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="292"/>
+ <source>fog</source>
+ <translation>tåke</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="295"/>
+ <source>rain</source>
+ <translation>regn</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="298"/>
+ <source>storm</source>
+ <translation>storm</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="301"/>
+ <source>snow</source>
+ <translation>sn</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="321"/>
+ <source>No suit</source>
+ <translation>Ingen drakt</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="324"/>
+ <source>Shorty</source>
+ <translation>Shorty</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="327"/>
+ <source>Combi</source>
+ <translation>Kombi</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="330"/>
+ <source>Wet suit</source>
+ <translation>Våtdrakt</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="333"/>
+ <source>Semidry suit</source>
+ <translation>Semidry</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="336"/>
+ <source>Dry suit</source>
+ <translation>Tørrdrakt</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="396"/>
+ <source>no stop</source>
+ <translation>ingen stop</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="398"/>
+ <location filename="../core/dive.c" line="29"/>
+ <source>deco</source>
+ <translation>deko</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="400"/>
+ <source>single ascent</source>
+ <translation>enkel oppstigning</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="402"/>
+ <source>multiple ascent</source>
+ <translation>flere oppstigninger</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="404"/>
+ <location filename="../core/dive.c" line="27"/>
+ <source>fresh</source>
+ <translation>ferskvann</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="406"/>
+ <source>salt water</source>
+ <translation>saltvan</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="431"/>
+ <source>sight seeing</source>
+ <translation>sightseeing</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="433"/>
+ <source>club dive</source>
+ <translation>klubbdyk</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="435"/>
+ <location filename="../core/dive.c" line="28"/>
+ <source>instructor</source>
+ <translation>instruktør</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="437"/>
+ <source>instruction</source>
+ <translation>instruksjon</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="439"/>
+ <location filename="../core/dive.c" line="27"/>
+ <source>night</source>
+ <translation>nattdykk</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="441"/>
+ <location filename="../core/dive.c" line="25"/>
+ <source>cave</source>
+ <translation>grotte</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="443"/>
+ <location filename="../core/dive.c" line="24"/>
+ <source>ice</source>
+ <translation>isdykk</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="445"/>
+ <source>search</source>
+ <translation>søk</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="455"/>
+ <location filename="../core/dive.c" line="25"/>
+ <source>wreck</source>
+ <translation>vrakdykk</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="457"/>
+ <location filename="../core/dive.c" line="26"/>
+ <source>river</source>
+ <translation>elv</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="459"/>
+ <location filename="../core/dive.c" line="23"/>
+ <source>drift</source>
+ <translation>strømdykk</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="461"/>
+ <location filename="../core/dive.c" line="28"/>
+ <source>photo</source>
+ <translation>foto</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="463"/>
+ <source>other</source>
+ <translation>annet</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="474"/>
+ <source>Other activities</source>
+ <translation>Andre aktiviteter</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="498"/>
+ <source>Datatrak/Wlog notes</source>
+ <translation>Datatrak/Wlog-notater</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="537"/>
+ <source>Manually entered dive</source>
+ <translation>Dykk lagt inn manuelt</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="588"/>
+ <source>Unknown</source>
+ <translation>Ukjent</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="674"/>
+ <source>Error: couldn&apos;t open the file %s</source>
+ <translation>Feil: kunne ikke åpne %s</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="687"/>
+ <source>Error: no dive</source>
+ <translation>Feil: Ikke noe dykk</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="23"/>
+ <source>boat</source>
+ <translation>båt</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="23"/>
+ <source>shore</source>
+ <translation>landdykk</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="24"/>
+ <source>deep</source>
+ <translation>dypdykk</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="24"/>
+ <source>cavern</source>
+ <translation>hule</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="25"/>
+ <source>altitude</source>
+ <translation>høydedykk</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="26"/>
+ <source>pool</source>
+ <translation>basseng</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="26"/>
+ <source>lake</source>
+ <translation>innsjø</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="27"/>
+ <source>student</source>
+ <translation>elev</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="28"/>
+ <source>video</source>
+ <translation>video</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="33"/>
+ <source>OC-gas</source>
+ <translation>OC-gass</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="33"/>
+ <source>diluent</source>
+ <translation>diluent</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="33"/>
+ <location filename="../core/equipment.c" line="88"/>
+ <location filename="../core/planner.c" line="1436"/>
+ <location filename="../core/planner.c" line="1439"/>
+ <source>oxygen</source>
+ <translation>oksygen</translation>
+ </message>
+ <message>
<location filename="../core/dive.c" line="181"/>
<source>pascal</source>
<translation>pascal</translation>
</message>
<message>
<location filename="../core/dive.c" line="186"/>
- <location filename="../core/qthelper.cpp" line="669"/>
+ <location filename="../core/qthelper.cpp" line="674"/>
<source>bar</source>
<translation>bar</translation>
</message>
<message>
<location filename="../core/dive.c" line="190"/>
- <location filename="../core/qthelper.cpp" line="672"/>
+ <location filename="../core/qthelper.cpp" line="677"/>
<source>psi</source>
<translation>psi</translation>
</message>
<message>
+ <location filename="../core/dive.c" line="227"/>
+ <source>ℓ</source>
+ <translation>ℓ</translation>
+ </message>
+ <message>
<location filename="../core/dive.c" line="232"/>
<source>cuft</source>
<translation>ft³</translation>
</message>
<message>
<location filename="../core/dive.c" line="269"/>
- <location filename="../core/qthelper.cpp" line="590"/>
- <location filename="../core/qthelper.cpp" line="605"/>
+ <location filename="../core/qthelper.cpp" line="595"/>
+ <location filename="../core/qthelper.cpp" line="610"/>
<source>m</source>
<translation>m</translation>
</message>
<message>
<location filename="../core/dive.c" line="274"/>
- <location filename="../core/qthelper.cpp" line="593"/>
- <location filename="../core/qthelper.cpp" line="607"/>
+ <location filename="../core/qthelper.cpp" line="598"/>
+ <location filename="../core/qthelper.cpp" line="612"/>
<source>ft</source>
<translation>ft</translation>
</message>
@@ -8735,53 +9159,58 @@ Snitt</translation>
</message>
<message>
<location filename="../core/dive.c" line="325"/>
- <location filename="../core/qthelper.cpp" line="616"/>
- <location filename="../core/qthelper.cpp" line="626"/>
+ <location filename="../core/qthelper.cpp" line="621"/>
+ <location filename="../core/qthelper.cpp" line="631"/>
<source>lbs</source>
<translation>pund</translation>
</message>
<message>
<location filename="../core/dive.c" line="329"/>
- <location filename="../core/qthelper.cpp" line="614"/>
- <location filename="../core/qthelper.cpp" line="624"/>
+ <location filename="../core/qthelper.cpp" line="619"/>
+ <location filename="../core/qthelper.cpp" line="629"/>
<source>kg</source>
<translation>kg</translation>
</message>
<message>
- <location filename="../core/dive.c" line="1772"/>
+ <location filename="../core/dive.c" line="1751"/>
<source>(%s) or (%s)</source>
<translation>(%s) eller (%s)</translation>
</message>
<message>
- <location filename="../core/divelist.c" line="484"/>
+ <location filename="../core/divelist.c" line="487"/>
<location filename="../core/equipment.c" line="84"/>
- <location filename="../core/planner.c" line="1411"/>
- <location filename="../core/planner.c" line="1414"/>
+ <location filename="../core/planner.c" line="1432"/>
+ <location filename="../core/planner.c" line="1435"/>
<source>air</source>
<translation>luft</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="197"/>
+ <location filename="../core/equipment.c" line="86"/>
+ <source>EAN%d</source>
+ <translation>EAN%d</translation>
+ </message>
+ <message>
+ <location filename="../core/equipment.c" line="198"/>
<source>integrated</source>
<translation>integrert bly</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="198"/>
+ <location filename="../core/equipment.c" line="199"/>
<source>belt</source>
<translation>vektbelte</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="199"/>
+ <location filename="../core/equipment.c" line="200"/>
<source>ankle</source>
<translation>ankelvekt</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="200"/>
+ <location filename="../core/equipment.c" line="201"/>
<source>backplate weight</source>
<translation>p-vekt</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="201"/>
+ <location filename="../core/equipment.c" line="202"/>
<source>clip-on</source>
<translation>clip-on</translation>
</message>
@@ -8794,8 +9223,8 @@ Snitt</translation>
<location filename="../core/file.c" line="121"/>
<location filename="../core/file.c" line="512"/>
<location filename="../core/file.c" line="597"/>
- <location filename="../core/file.c" line="924"/>
- <location filename="../core/file.c" line="1056"/>
+ <location filename="../core/file.c" line="909"/>
+ <location filename="../core/file.c" line="1092"/>
<location filename="../core/ostctools.c" line="80"/>
<source>Failed to read &apos;%s&apos;</source>
<translation>Kunne ikke åpne &apos;%s&apos;</translation>
@@ -8853,486 +9282,496 @@ Snitt</translation>
<translation>O₂-kalibrering</translation>
</message>
<message>
- <location filename="../core/file.c" line="887"/>
- <source>No matching DC found for file &apos;%s&apos;</source>
- <translation>Ingen matchende computer funnet for fila &apos;%s&apos;</translation>
+ <location filename="../core/git-access.c" line="134"/>
+ <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+ <translation>Lokalt mellomlager i %s er ødelagt - kan ikke synkronisere med Subsurface skylager</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>none</source>
- <translation>ingen</translation>
+ <location filename="../core/git-access.c" line="157"/>
+ <location filename="../core/git-access.c" line="177"/>
+ <source>Could not update local cache to newer remote data</source>
+ <translation>Kunne ikke oppdatere lokalt mellomlager med nyere data</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="309"/>
- <location filename="../core/cochran.c" line="315"/>
- <location filename="../core/cochran.c" line="385"/>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>deco stop</source>
- <translation>dekostopp</translation>
+ <location filename="../core/git-access.c" line="170"/>
+ <source>Subsurface cloud storage corrupted</source>
+ <translation>Subsurface skylager ødelagt</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="342"/>
- <location filename="../core/file.c" line="755"/>
- <source>battery</source>
- <translation>batteri</translation>
+ <location filename="../core/git-access.c" line="284"/>
+ <source>Could not update Subsurface cloud storage, try again later</source>
+ <translation>Kunne ikke oppdatere Subsurface skylager, prøv igjen senere</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="370"/>
- <location filename="../core/cochran.c" line="409"/>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>rbt</source>
- <translation>rbt</translation>
+ <location filename="../core/git-access.c" line="344"/>
+ <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+ <translation>Skylager og lokal data avviker. Feil: merge failed (%s)</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="336"/>
- <location filename="../core/cochran.c" line="390"/>
- <location filename="../core/file.c" line="777"/>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>ascent</source>
- <translation>oppstigning</translation>
+ <location filename="../core/git-access.c" line="374"/>
+ <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+ <translation>Skylager og lokal data er forskjellig. Klarer ikke å kombinere nye data med lokale data.</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="379"/>
- <location filename="../core/cochran.c" line="426"/>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>ceiling</source>
- <translation>tak</translation>
+ <location filename="../core/git-access.c" line="408"/>
+ <source>Remote storage and local data diverged</source>
+ <translation>Skylager og lokal data er forskjellig</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>workload</source>
- <translation>arbeidsbelastning</translation>
+ <location filename="../core/git-access.c" line="411"/>
+ <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+ <translation>Skylager og lokal data er forskjellig. Feil: kunne ikke skrive data (%s)</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="395"/>
- <location filename="../core/libdivecomputer.c" line="203"/>
- <source>transmitter</source>
- <translation>sender</translation>
+ <location filename="../core/git-access.c" line="420"/>
+ <source>Problems with local cache of Subsurface cloud data</source>
+ <translation>Problemer med det lokale mellomlageret til skylageret</translation>
+ </message>
+ <message>
+ <location filename="../core/git-access.c" line="421"/>
+ <source>Moved cache data to %s. Please try the operation again.</source>
+ <translation>Flyttet mellomlager til %s. Prøv igjen.</translation>
+ </message>
+ <message>
+ <location filename="../core/git-access.c" line="743"/>
+ <source>Error connecting to Subsurface cloud storage</source>
+ <translation>Klarte ikke å koble til skylager for Subsurface</translation>
+ </message>
+ <message>
+ <location filename="../core/git-access.c" line="746"/>
+ <source>git clone of %s failed (%s)</source>
+ <translation>git clone of %s failed (%s)</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="210"/>
+ <location filename="../core/parse-xml.c" line="3317"/>
+ <location filename="../core/uemis-downloader.c" line="134"/>
+ <source>unknown</source>
+ <translation>ukjent</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>none</source>
+ <translation>ingen</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="203"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>workload</source>
+ <translation>arbeidsbelastning</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="224"/>
<source>violation</source>
<translation>brudd</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="203"/>
+ <location filename="../core/libdivecomputer.c" line="224"/>
<source>bookmark</source>
<translation>bokmerke</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="203"/>
+ <location filename="../core/libdivecomputer.c" line="224"/>
<source>surface</source>
<translation>overflate</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="203"/>
+ <location filename="../core/libdivecomputer.c" line="224"/>
<source>safety stop</source>
<translation>sikkerhetsstopp</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="365"/>
- <location filename="../core/cochran.c" line="414"/>
- <location filename="../core/cochran.c" line="421"/>
- <location filename="../core/file.c" line="868"/>
- <location filename="../core/libdivecomputer.c" line="204"/>
- <location filename="../core/libdivecomputer.c" line="207"/>
- <source>gaschange</source>
- <translation>gassbytte</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="204"/>
+ <location filename="../core/libdivecomputer.c" line="225"/>
<source>safety stop (voluntary)</source>
<translation>sikkerhetsstopp (frivillig)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="204"/>
+ <location filename="../core/libdivecomputer.c" line="225"/>
<source>safety stop (mandatory)</source>
<translation>sikkerhetsstopp (obligatorisk)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="205"/>
+ <location filename="../core/libdivecomputer.c" line="226"/>
<source>deepstop</source>
<translation>dypstopp</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="205"/>
+ <location filename="../core/libdivecomputer.c" line="226"/>
<source>ceiling (safety stop)</source>
<translation>tak (sikkerhetsstopp)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="205"/>
- <source>divetime</source>
- <translation>dykketid</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="205"/>
+ <location filename="../core/libdivecomputer.c" line="226"/>
<source>below floor</source>
<comment>event showing dive is below deco floor and adding deco time</comment>
<translation>under tak</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="353"/>
- <location filename="../core/libdivecomputer.c" line="206"/>
- <source>maxdepth</source>
- <translation>maksdybde</translation>
- </message>
- <message>
- <location filename="../core/cochran.c" line="348"/>
- <location filename="../core/libdivecomputer.c" line="206"/>
- <source>OLF</source>
- <translation>OLF</translation>
+ <location filename="../core/libdivecomputer.c" line="226"/>
+ <source>divetime</source>
+ <translation>dykketid</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="206"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
<source>airtime</source>
<translation>lufttid</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="206"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
<source>rgbm</source>
<translation>rgbm</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="206"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
<source>heading</source>
<translation>retning</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="358"/>
- <location filename="../core/cochran.c" line="404"/>
- <location filename="../core/libdivecomputer.c" line="206"/>
- <source>pO₂</source>
- <translation>pO₂</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="207"/>
+ <location filename="../core/libdivecomputer.c" line="228"/>
<source>tissue level warning</source>
<translation>Advarsel: nivå i vev</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="207"/>
+ <location filename="../core/libdivecomputer.c" line="228"/>
<source>non stop time</source>
<translation>tid uten stopp</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="224"/>
+ <location filename="../core/libdivecomputer.c" line="237"/>
<source>invalid event number</source>
<translation>ugyldig hendelsesnummer</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="658"/>
- <source>Unable to create parser for %s %s</source>
- <translation>Kunne ikke lage parser for %s %s</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="664"/>
- <source>Error registering the data</source>
- <translation>Feil ved registrering av data</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="495"/>
+ <location filename="../core/libdivecomputer.c" line="553"/>
<source>Error parsing the datetime</source>
<translation>Feil ved lesing av dato</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="513"/>
+ <location filename="../core/libdivecomputer.c" line="571"/>
<source>Dive %d: %s</source>
<translation>Dykk %d: %s</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="519"/>
+ <location filename="../core/libdivecomputer.c" line="577"/>
<source>Error parsing the divetime</source>
<translation>Feil ved lesing av dykketid</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="529"/>
+ <location filename="../core/libdivecomputer.c" line="587"/>
<source>Error parsing the maxdepth</source>
<translation>Feil ved lesing av maksdybde</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="548"/>
+ <location filename="../core/libdivecomputer.c" line="606"/>
<source>Error parsing temperature</source>
<translation>Klarte ikke å lese temperatur</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="568"/>
+ <location filename="../core/libdivecomputer.c" line="626"/>
<source>Error parsing the gas mix count</source>
<translation>Feil ved lesing av gassmiksantall</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="580"/>
+ <location filename="../core/libdivecomputer.c" line="638"/>
<source>Error obtaining water salinity</source>
<translation>Feil ved lesing av salthetsgrad</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="589"/>
+ <location filename="../core/libdivecomputer.c" line="647"/>
<source>Error obtaining surface pressure</source>
<translation>Klarte ikke å hente overflatetrykk</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="614"/>
+ <location filename="../core/libdivecomputer.c" line="672"/>
<source>Error obtaining divemode</source>
<translation>Klarte ikke å lese dykkemodus</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="634"/>
+ <location filename="../core/libdivecomputer.c" line="692"/>
<source>Error parsing the gas mix</source>
<translation>Feil ved lesing av gassmiks</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="684"/>
+ <location filename="../core/libdivecomputer.c" line="717"/>
+ <source>Unable to create parser for %s %s</source>
+ <translation>Kunne ikke lage parser for %s %s</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="723"/>
+ <source>Error registering the data</source>
+ <translation>Feil ved registrering av data</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="744"/>
<source>Error parsing the samples</source>
<translation>Feil ved lesing av detaljer</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="822"/>
+ <location filename="../core/libdivecomputer.c" line="882"/>
<source>Event: waiting for user action</source>
<translation>Hendelse: Venter på bruker</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="830"/>
+ <location filename="../core/libdivecomputer.c" line="890"/>
<source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
<translation>modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="894"/>
+ <location filename="../core/libdivecomputer.c" line="954"/>
<source>Error registering the event handler.</source>
<translation>Feil ved registrering av hendelseshåndterer.</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="899"/>
+ <location filename="../core/libdivecomputer.c" line="959"/>
<source>Error registering the cancellation handler.</source>
<translation>Feil ved registrering av avbruddshåndterer.</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="920"/>
+ <location filename="../core/libdivecomputer.c" line="980"/>
<source>Dive data import error</source>
<translation>Feil ved import av dykkedata</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="959"/>
+ <location filename="../core/libdivecomputer.c" line="1019"/>
<source>Unable to create libdivecomputer context</source>
<translation>Kunne ikke opprette kontekst for libdivecomputer</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="966"/>
+ <location filename="../core/libdivecomputer.c" line="1026"/>
<source>Unable to open %s %s (%s)</source>
<translation>Fikk ikke åpnet %s %s (%s)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="992"/>
+ <location filename="../core/libdivecomputer.c" line="1048"/>
<source>Insufficient privileges to open the device %s %s (%s)</source>
<translation>Har ikke tilgang til å åpne enhet %s %s (%s)</translation>
</message>
<message>
- <location filename="../core/parse-xml.c" line="517"/>
- <source>Strange percentage reading %s
+ <location filename="../core/load-git.c" line="194"/>
+ <location filename="../core/parse-xml.c" line="1242"/>
+ <source>multiple GPS locations for this dive site; also %s
</source>
- <translation>Rar lesing av prosent %s
+ <translation>Flere GPS-posisjoner for dette steder; også %s
</translation>
</message>
<message>
- <location filename="../core/load-git.c" line="194"/>
- <location filename="../core/parse-xml.c" line="1238"/>
- <source>multiple GPS locations for this dive site; also %s
+ <location filename="../core/load-git.c" line="222"/>
+ <location filename="../core/parse-xml.c" line="1304"/>
+ <source>additional name for site: %s
</source>
- <translation>Flere GPS-posisjoner for dette steder; også %s
+ <translation>ytterligere navn for sted: %s
</translation>
</message>
<message>
- <location filename="../core/parse-xml.c" line="2044"/>
+ <location filename="../core/ostctools.c" line="120"/>
+ <location filename="../core/ostctools.c" line="152"/>
+ <source>Unknown DC in dive %d</source>
+ <translation>Ukjent computer i dykk %d</translation>
+ </message>
+ <message>
+ <location filename="../core/ostctools.c" line="165"/>
+ <source>Error - %s - parsing dive %d</source>
+ <translation>Feil - %s - leser dykk %d</translation>
+ </message>
+ <message>
+ <location filename="../core/parse-xml.c" line="517"/>
+ <source>Strange percentage reading %s
+</source>
+ <translation>Rar lesing av prosent %s
+</translation>
+ </message>
+ <message>
+ <location filename="../core/parse-xml.c" line="2051"/>
<source>Failed to parse &apos;%s&apos;</source>
<translation>Kunne ikke lese &apos;%s&apos;</translation>
</message>
<message>
- <location filename="../core/parse-xml.c" line="3741"/>
+ <location filename="../core/parse-xml.c" line="3774"/>
<source>Can&apos;t open stylesheet %s</source>
<translation>Kan ikke åpne stilark %s</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="86"/>
- <source>EAN%d</source>
- <translation>EAN%d</translation>
+ <location filename="../core/planner.c" line="555"/>
+ <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+ <translation>Advarsel: Dette er en ny implementasjon av %s og er en dykkeplan-implementasjon som bare har sett begrenset med testing. Vi anbefaler å ikke planlegge dykk utelukkende på bakgrunn av disse resultatene.</translation>
</message>
<message>
- <location filename="../core/planner.c" line="1032"/>
- <location filename="../core/planner.c" line="1184"/>
- <source>Can&apos;t find gas %s</source>
- <translation>Finner ikke gassen %s</translation>
+ <location filename="../core/planner.c" line="569"/>
+ <source>Decompression calculation aborted due to excessive time</source>
+ <translation>Kalkulering av dekompresjon tok for lang tid, og er avbrutt</translation>
</message>
<message>
- <location filename="../core/planner.c" line="368"/>
- <source>Too many gas mixes</source>
- <translation>For mange gassmikser</translation>
+ <location filename="../core/planner.c" line="571"/>
+ <location filename="../core/planner.c" line="829"/>
+ <location filename="../core/planner.c" line="834"/>
+ <location filename="../core/planner.c" line="860"/>
+ <location filename="../core/planner.c" line="870"/>
+ <source>Warning:</source>
+ <translation>Advarsel:</translation>
</message>
<message>
- <location filename="../core/planner.c" line="568"/>
- <source>Decompression calculation aborted due to excessive time</source>
- <translation>Kalkulering av dekompresjon tok for lang tid, og er avbrutt</translation>
+ <location filename="../core/planner.c" line="581"/>
+ <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="586"/>
+ <source>based on VPM-B at nominal conservatism</source>
+ <translation>basert på VPM-B med standard konservatisme</translation>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="588"/>
+ <source>based on VPM-B at +%d conservatism</source>
+ <translation>basert på VPM-B med +%d konservatisme</translation>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="590"/>
+ <source>, effective GF=%d/%d</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="594"/>
+ <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+ <translation>rekreasjonsmodus basert på Bühlmann ZHL-16B med GFlow = %d og GFhigh = %d</translation>
</message>
<message>
- <location filename="../core/planner.c" line="592"/>
+ <location filename="../core/planner.c" line="598"/>
<source>Subsurface dive plan</source>
<translation>Subsurface dykkeplan</translation>
</message>
<message>
- <location filename="../core/planner.c" line="596"/>
- <source>depth</source>
- <translation>dybde</translation>
+ <location filename="../core/planner.c" line="599"/>
+ <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="602"/>
- <source>runtime</source>
- <translation>løpetid</translation>
+ <location filename="../core/planner.c" line="604"/>
+ <source>depth</source>
+ <translation>dybde</translation>
</message>
<message>
- <location filename="../core/planner.c" line="599"/>
+ <location filename="../core/planner.c" line="607"/>
<source>duration</source>
<translation>lengde</translation>
</message>
<message>
- <location filename="../core/planner.c" line="554"/>
- <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
- <translation>Advarsel: Dette er en ny implementasjon av %s og er en dykkeplan-implementasjon som bare har sett begrenset med testing. Vi anbefaler å ikke planlegge dykk utelukkende på bakgrunn av disse resultatene.</translation>
+ <location filename="../core/planner.c" line="610"/>
+ <source>runtime</source>
+ <translation>løpetid</translation>
</message>
<message>
- <location filename="../core/planner.c" line="605"/>
+ <location filename="../core/planner.c" line="613"/>
<source>gas</source>
<translation>gass</translation>
</message>
<message>
- <location filename="../core/planner.c" line="648"/>
+ <location filename="../core/planner.c" line="656"/>
<source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
<translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u i %s (SP = %.1fbar)</translation>
</message>
<message>
- <location filename="../core/planner.c" line="656"/>
+ <location filename="../core/planner.c" line="664"/>
<source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
<translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u på %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="669"/>
+ <location filename="../core/planner.c" line="677"/>
<source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
<translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s (SP = %.1fbar)</translation>
</message>
<message>
- <location filename="../core/planner.c" line="676"/>
+ <location filename="../core/planner.c" line="684"/>
<source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
<translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="721"/>
+ <location filename="../core/planner.c" line="729"/>
<source>%3.0f%s</source>
<translation>%3.0f%s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="724"/>
- <location filename="../core/planner.c" line="728"/>
+ <location filename="../core/planner.c" line="732"/>
+ <location filename="../core/planner.c" line="736"/>
<source>%3dmin</source>
<translation>%3dmin</translation>
</message>
<message>
- <location filename="../core/planner.c" line="737"/>
- <location filename="../core/planner.c" line="749"/>
+ <location filename="../core/planner.c" line="745"/>
+ <location filename="../core/planner.c" line="757"/>
<source>(SP = %.1fbar)</source>
<translation>(SP = %.1fbar)</translation>
</message>
<message>
- <location filename="../core/planner.c" line="772"/>
+ <location filename="../core/planner.c" line="780"/>
<source>Switch gas to %s (SP = %.1fbar)</source>
<translation>Bytt gass til %s (SP = %.1fbar)</translation>
</message>
<message>
- <location filename="../core/planner.c" line="774"/>
+ <location filename="../core/planner.c" line="782"/>
<source>Switch gas to %s</source>
<translation>Bytt til gass %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="793"/>
+ <location filename="../core/planner.c" line="801"/>
<source>CNS</source>
<translation>CNS</translation>
</message>
<message>
- <location filename="../core/planner.c" line="795"/>
+ <location filename="../core/planner.c" line="803"/>
<source>OTU</source>
<translation>OTU</translation>
</message>
<message>
- <location filename="../core/planner.c" line="799"/>
+ <location filename="../core/planner.c" line="807"/>
<source>Gas consumption (CCR legs excluded):</source>
<translation>Gassforbruk (CCR-etapper ekskludert):</translation>
</message>
<message>
- <location filename="../core/planner.c" line="801"/>
+ <location filename="../core/planner.c" line="809"/>
<source>Gas consumption:</source>
<translation>Gassforbruk:</translation>
</message>
<message>
- <location filename="../core/planner.c" line="570"/>
- <location filename="../core/planner.c" line="821"/>
- <location filename="../core/planner.c" line="826"/>
- <location filename="../core/planner.c" line="851"/>
- <location filename="../core/planner.c" line="861"/>
- <source>Warning:</source>
- <translation>Advarsel:</translation>
- </message>
- <message>
- <location filename="../core/planner.c" line="580"/>
- <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
- <translation>basert på Bühlmann ZHL-16B med GFlow = %d og GFhigh = %d</translation>
- </message>
- <message>
- <location filename="../core/planner.c" line="584"/>
- <source>based on VPM-B at nominal conservatism</source>
- <translation>basert på VPM-B med standard konservatisme</translation>
- </message>
- <message>
- <location filename="../core/planner.c" line="586"/>
- <source>based on VPM-B at +%d conservatism</source>
- <translation>basert på VPM-B med +%d konservatisme</translation>
- </message>
- <message>
- <location filename="../core/planner.c" line="588"/>
- <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
- <translation>rekreasjonsmodus basert på Bühlmann ZHL-16B med GFlow = %d og GFhigh = %d</translation>
- </message>
- <message>
- <location filename="../core/planner.c" line="822"/>
+ <location filename="../core/planner.c" line="830"/>
<source>this is more gas than available in the specified cylinder!</source>
<translation>dette er mer gass en det som er tilgjengelig i tanken!</translation>
</message>
<message>
- <location filename="../core/planner.c" line="827"/>
+ <location filename="../core/planner.c" line="835"/>
<source>not enough reserve for gas sharing on ascent!</source>
<translation>ikke nok i reserve til å dele gass under oppstigning!</translation>
</message>
<message>
- <location filename="../core/planner.c" line="829"/>
+ <location filename="../core/planner.c" line="837"/>
<source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
<translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s i planlagt oppstigning)</translation>
</message>
<message>
- <location filename="../core/planner.c" line="831"/>
+ <location filename="../core/planner.c" line="839"/>
<source>%.0f%s (%.0f%s during planned ascent) of %s</source>
<translation>%.0f%s (%.0f%s under planlagt oppstigning) av %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="848"/>
+ <location filename="../core/planner.c" line="857"/>
<source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
<translation>høy pO₂-verdi %.2f ve %d:%02u med gass %s ved dybde %.*f %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="858"/>
+ <location filename="../core/planner.c" line="867"/>
<source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
<translation>lav pO₂ verdi %.2f ved %d:%02u med gass %s ved dybde %.*f %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="1419"/>
+ <location filename="../core/planner.c" line="1194"/>
+ <source>Can&apos;t find gas %s</source>
+ <translation>Finner ikke gassen %s</translation>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="1440"/>
<source>ean</source>
<translation>ean</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1280"/>
+ <location filename="../core/profile.c" line="1298"/>
<source>@: %d:%02d
D: %.1f%s
</source>
@@ -9341,70 +9780,70 @@ D: %.1f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1283"/>
+ <location filename="../core/profile.c" line="1301"/>
<source>P: %d%s
</source>
<translation>P: %d%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1287"/>
+ <location filename="../core/profile.c" line="1305"/>
<source>T: %.1f%s
</source>
<translation>T: %.1f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1293"/>
+ <location filename="../core/profile.c" line="1311"/>
<source>V: %.1f%s
</source>
<translation>V: %.1f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1296"/>
+ <location filename="../core/profile.c" line="1314"/>
<source>SAC: %.*f%s/min
</source>
<translation>SAC: %.*f%s/min
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1298"/>
+ <location filename="../core/profile.c" line="1316"/>
<source>CNS: %u%%
</source>
<translation>CNS: %u%%
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1300"/>
+ <location filename="../core/profile.c" line="1318"/>
<source>pO%s: %.2fbar
</source>
<translation>pO%s: %.2fbar
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1302"/>
+ <location filename="../core/profile.c" line="1320"/>
<source>pN%s: %.2fbar
</source>
<translation>pN%s: %.2fbar
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1304"/>
+ <location filename="../core/profile.c" line="1322"/>
<source>pHe: %.2fbar
</source>
<translation>pHe: %.2fbar
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1307"/>
+ <location filename="../core/profile.c" line="1325"/>
<source>MOD: %d%s
</source>
<translation>MOD: %d%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1314"/>
+ <location filename="../core/profile.c" line="1332"/>
<source>EAD: %d%s
EADD: %d%s
</source>
@@ -9413,7 +9852,7 @@ EADD: %d%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1318"/>
+ <location filename="../core/profile.c" line="1336"/>
<source>END: %d%s
EADD: %d%s
</source>
@@ -9422,174 +9861,179 @@ EADD: %d%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1331"/>
+ <location filename="../core/profile.c" line="1349"/>
<source>Safetystop: %umin @ %.0f%s
</source>
<translation>Sikkerhetsstopp: %umin @ %.0f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1334"/>
+ <location filename="../core/profile.c" line="1352"/>
<source>Safetystop: unkn time @ %.0f%s
</source>
<translation>Sikkerhetsstopp: ukjent tid @ %.0f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1339"/>
+ <location filename="../core/profile.c" line="1357"/>
<source>Deco: %umin @ %.0f%s
</source>
<translation>Deko: %umin @ %.0f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1342"/>
+ <location filename="../core/profile.c" line="1360"/>
<source>Deco: unkn time @ %.0f%s
</source>
<translation>Deko: ukjent tid @ %.0f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1346"/>
+ <location filename="../core/profile.c" line="1364"/>
<source>In deco
</source>
<translation>I deko
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1348"/>
+ <location filename="../core/profile.c" line="1366"/>
<source>NDL: %umin
</source>
<translation>NDL: %umin
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1351"/>
+ <location filename="../core/profile.c" line="1369"/>
<source>TTS: %umin
</source>
<translation>TTS: %umin
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1354"/>
+ <location filename="../core/profile.c" line="1372"/>
<source>Deco: %umin @ %.0f%s (calc)
</source>
<translation>Deko: %umin @ %.0f%s (kalk.)
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1362"/>
+ <location filename="../core/profile.c" line="1380"/>
<source>In deco (calc)
</source>
<translation>I deko (kalk.)
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1365"/>
+ <location filename="../core/profile.c" line="1383"/>
<source>NDL: %umin (calc)
</source>
<translation>NDL: %umin (kalk.)
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1367"/>
+ <location filename="../core/profile.c" line="1385"/>
<source>NDL: &gt;2h (calc)
</source>
<translation>NDL: &gt;2h (kalk.)
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1371"/>
+ <location filename="../core/profile.c" line="1389"/>
<source>TTS: %umin (calc)
</source>
<translation>TTS: %umin (kalk.)
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1373"/>
+ <location filename="../core/profile.c" line="1391"/>
<source>TTS: &gt;2h (calc)
</source>
<translation>TTS: &gt;2h (kalk.)
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1376"/>
+ <location filename="../core/profile.c" line="1394"/>
<source>RBT: %umin
</source>
<translation>RBT: %umin
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1379"/>
+ <location filename="../core/profile.c" line="1397"/>
<source>Calculated ceiling %.0f%s
</source>
<translation>Kalkulert tak %.0f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1385"/>
+ <location filename="../core/profile.c" line="1403"/>
<source>Tissue %.0fmin: %.1f%s
</source>
<translation>Vev %.0fmin: %.1f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1391"/>
+ <location filename="../core/profile.c" line="1409"/>
<source>heartbeat: %d
</source>
<translation>puls: %d
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1393"/>
+ <location filename="../core/profile.c" line="1411"/>
<source>bearing: %d
</source>
<translation>retning: %d
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1396"/>
+ <location filename="../core/profile.c" line="1414"/>
<source>mean depth to here %.1f%s
</source>
<translation>snittdybde hit %.1f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1491"/>
+ <location filename="../core/profile.c" line="1515"/>
<source>%sT: %d:%02d min</source>
<translation>%sT: %d:%02d min</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1495"/>
- <location filename="../core/profile.c" line="1499"/>
- <location filename="../core/profile.c" line="1503"/>
+ <location filename="../core/profile.c" line="1519"/>
+ <location filename="../core/profile.c" line="1523"/>
+ <location filename="../core/profile.c" line="1527"/>
<source>%s %sD:%.1f%s</source>
<translation>%s %sD:%.1f%s</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1507"/>
+ <location filename="../core/profile.c" line="1531"/>
<source>%s %sD:%.1f%s
</source>
<translation>%s %sD:%.1f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1511"/>
+ <location filename="../core/profile.c" line="1535"/>
<source>%s%sV:%.2f%s</source>
<translation>%s%sV:%.2f%s</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1515"/>
- <location filename="../core/profile.c" line="1519"/>
+ <location filename="../core/profile.c" line="1539"/>
+ <location filename="../core/profile.c" line="1543"/>
<source>%s %sV:%.2f%s</source>
<translation>%s %sV:%.2f%s</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1526"/>
+ <location filename="../core/profile.c" line="1550"/>
<source>%s %sP:%d %s</source>
<translation>%s %sP:%d %s</translation>
</message>
<message>
+ <location filename="../core/profile.c" line="1575"/>
+ <source>%s SAC:%.*f %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../core/qthelper.cpp" line="67"/>
<source>%1km</source>
<translation>%1km</translation>
@@ -9610,446 +10054,460 @@ EADD: %d%s
<translation>%1yd</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="635"/>
+ <location filename="../core/qthelper.cpp" line="91"/>
+ <location filename="../core/qthelper.cpp" line="226"/>
+ <source>N</source>
+ <translation>N</translation>
+ </message>
+ <message>
+ <location filename="../core/qthelper.cpp" line="91"/>
+ <location filename="../core/qthelper.cpp" line="227"/>
+ <source>S</source>
+ <translation>S</translation>
+ </message>
+ <message>
+ <location filename="../core/qthelper.cpp" line="92"/>
+ <location filename="../core/qthelper.cpp" line="228"/>
+ <source>E</source>
+ <translation>Ø</translation>
+ </message>
+ <message>
+ <location filename="../core/qthelper.cpp" line="92"/>
+ <location filename="../core/qthelper.cpp" line="229"/>
+ <source>W</source>
+ <translation>V</translation>
+ </message>
+ <message>
+ <location filename="../core/qthelper.cpp" line="640"/>
<source>C</source>
<translation>C</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="638"/>
+ <location filename="../core/qthelper.cpp" line="643"/>
<source>F</source>
<translation>F</translation>
</message>
<message>
- <location filename="../core/dive.c" line="23"/>
- <source>boat</source>
- <translation>båt</translation>
+ <location filename="../core/save-html.c" line="469"/>
+ <location filename="../core/save-html.c" line="553"/>
+ <location filename="../core/worldmap-save.c" line="111"/>
+ <source>Can&apos;t open file %s</source>
+ <translation>Klarer ikke åpne fila %s</translation>
</message>
<message>
- <location filename="../core/dive.c" line="23"/>
- <source>shore</source>
- <translation>landdykk</translation>
+ <location filename="../core/save-html.c" line="488"/>
+ <source>Number</source>
+ <translation>Tall</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="459"/>
- <location filename="../core/dive.c" line="23"/>
- <source>drift</source>
- <translation>strømdykk</translation>
+ <location filename="../core/save-html.c" line="489"/>
+ <source>Date</source>
+ <translation>Dato</translation>
</message>
<message>
- <location filename="../core/dive.c" line="24"/>
- <source>deep</source>
- <translation>dypdykk</translation>
+ <location filename="../core/save-html.c" line="490"/>
+ <source>Time</source>
+ <translation>Tid</translation>
</message>
<message>
- <location filename="../core/dive.c" line="24"/>
- <source>cavern</source>
- <translation>hule</translation>
+ <location filename="../core/save-html.c" line="491"/>
+ <source>Location</source>
+ <translation>Sted</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="443"/>
- <location filename="../core/dive.c" line="24"/>
- <source>ice</source>
- <translation>isdykk</translation>
+ <location filename="../core/save-html.c" line="492"/>
+ <source>Air temp.</source>
+ <translation>Lufttemp.</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="445"/>
- <source>search</source>
- <translation>søk</translation>
+ <location filename="../core/save-html.c" line="493"/>
+ <source>Water temp.</source>
+ <translation>Vanntemp.</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="455"/>
- <location filename="../core/dive.c" line="25"/>
- <source>wreck</source>
- <translation>vrakdykk</translation>
+ <location filename="../core/save-html.c" line="494"/>
+ <source>Dives</source>
+ <translation>Dykk</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="441"/>
- <location filename="../core/dive.c" line="25"/>
- <source>cave</source>
- <translation>grotte</translation>
+ <location filename="../core/save-html.c" line="495"/>
+ <source>Expand all</source>
+ <translation>Fold ut turer</translation>
</message>
<message>
- <location filename="../core/dive.c" line="25"/>
- <source>altitude</source>
- <translation>høydedykk</translation>
+ <location filename="../core/save-html.c" line="496"/>
+ <source>Collapse all</source>
+ <translation>Fold sammen turer</translation>
</message>
<message>
- <location filename="../core/dive.c" line="26"/>
- <source>pool</source>
- <translation>basseng</translation>
+ <location filename="../core/save-html.c" line="497"/>
+ <source>Trips</source>
+ <translation>Turer</translation>
</message>
<message>
- <location filename="../core/dive.c" line="26"/>
- <source>lake</source>
- <translation>innsjø</translation>
+ <location filename="../core/save-html.c" line="498"/>
+ <source>Statistics</source>
+ <translation>Statistikk</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="457"/>
- <location filename="../core/dive.c" line="26"/>
- <source>river</source>
- <translation>elv</translation>
+ <location filename="../core/save-html.c" line="499"/>
+ <source>Advanced search</source>
+ <translation>Avansert søk</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="439"/>
- <location filename="../core/dive.c" line="27"/>
- <source>night</source>
- <translation>nattdykk</translation>
+ <location filename="../core/save-html.c" line="502"/>
+ <source>Rating</source>
+ <translation>Vurdering</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="153"/>
- <source>Error: the file does not appear to be a DATATRAK divelog</source>
- <translation>Feil: dette ser ikke ut til å være en DATATRAK-fil</translation>
+ <location filename="../core/save-html.c" line="503"/>
+ <source>Visibility</source>
+ <translation>Sikt</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="286"/>
- <source>clear</source>
- <translation>klart</translation>
+ <location filename="../core/save-html.c" line="504"/>
+ <source>Duration</source>
+ <translation>Varighet</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="289"/>
- <source>misty</source>
- <translation>lett tåke</translation>
+ <location filename="../core/save-html.c" line="505"/>
+ <source>Divemaster</source>
+ <translation>Dykkeleder</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="292"/>
- <source>fog</source>
- <translation>tåke</translation>
+ <location filename="../core/save-html.c" line="506"/>
+ <source>Buddy</source>
+ <translation>Buddy</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="295"/>
- <source>rain</source>
- <translation>regn</translation>
+ <location filename="../core/save-html.c" line="507"/>
+ <source>Suit</source>
+ <translation>Drakt</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="298"/>
- <source>storm</source>
- <translation>storm</translation>
+ <location filename="../core/save-html.c" line="508"/>
+ <source>Tags</source>
+ <translation>Emner</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="301"/>
- <source>snow</source>
- <translation>sn</translation>
+ <location filename="../core/save-html.c" line="509"/>
+ <location filename="../smtk-import/smartrak.c" line="251"/>
+ <location filename="../smtk-import/smartrak.c" line="321"/>
+ <source>Notes</source>
+ <translation>Notater</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="321"/>
- <source>No suit</source>
- <translation>Ingen drakt</translation>
+ <location filename="../core/save-html.c" line="510"/>
+ <source>Show more details</source>
+ <translation>Vis flere detaljer</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="324"/>
- <source>Shorty</source>
- <translation>Shorty</translation>
+ <location filename="../core/save-html.c" line="513"/>
+ <source>Yearly statistics</source>
+ <translation>Årsstatistikk</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="327"/>
- <source>Combi</source>
- <translation>Kombi</translation>
+ <location filename="../core/save-html.c" line="514"/>
+ <source>Year</source>
+ <translation>År</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="330"/>
- <source>Wet suit</source>
- <translation>Våtdrakt</translation>
+ <location filename="../core/save-html.c" line="515"/>
+ <source>Total time</source>
+ <translation>Totaltid</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="333"/>
- <source>Semidry suit</source>
- <translation>Semidry</translation>
+ <location filename="../core/save-html.c" line="516"/>
+ <source>Average time</source>
+ <translation>Snittid</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="336"/>
- <source>Dry suit</source>
- <translation>Tørrdrakt</translation>
+ <location filename="../core/save-html.c" line="517"/>
+ <source>Shortest time</source>
+ <translation>Korteste tid</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="396"/>
- <source>no stop</source>
- <translation>ingen stop</translation>
+ <location filename="../core/save-html.c" line="518"/>
+ <source>Longest time</source>
+ <translation>Lengste tid</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="400"/>
- <source>single ascent</source>
- <translation>enkel oppstigning</translation>
+ <location filename="../core/save-html.c" line="519"/>
+ <source>Average depth</source>
+ <translation>Snittdybde</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="402"/>
- <source>multiple ascent</source>
- <translation>flere oppstigninger</translation>
+ <location filename="../core/save-html.c" line="520"/>
+ <source>Min. depth</source>
+ <translation>Min. dybde</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="404"/>
- <location filename="../core/dive.c" line="27"/>
- <source>fresh</source>
- <translation>ferskvann</translation>
+ <location filename="../core/save-html.c" line="521"/>
+ <source>Max. depth</source>
+ <translation>Maksdybde</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="406"/>
- <source>salt water</source>
- <translation>saltvan</translation>
+ <location filename="../core/save-html.c" line="522"/>
+ <source>Average SAC</source>
+ <translation>Snitt-SAC</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="431"/>
- <source>sight seeing</source>
- <translation>sightseeing</translation>
+ <location filename="../core/save-html.c" line="523"/>
+ <source>Min. SAC</source>
+ <translation>Min. SAC</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="433"/>
- <source>club dive</source>
- <translation>klubbdyk</translation>
+ <location filename="../core/save-html.c" line="524"/>
+ <source>Max. SAC</source>
+ <translation>Maks. SAC</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="437"/>
- <source>instruction</source>
- <translation>instruksjon</translation>
+ <location filename="../core/save-html.c" line="525"/>
+ <source>Average temp.</source>
+ <translation>Snitt-temp.</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="463"/>
- <source>other</source>
- <translation>annet</translation>
+ <location filename="../core/save-html.c" line="526"/>
+ <source>Min. temp.</source>
+ <translation>Min. temp</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="474"/>
- <source>Other activities</source>
- <translation>Andre aktiviteter</translation>
+ <location filename="../core/save-html.c" line="527"/>
+ <source>Max. temp.</source>
+ <translation>Maks. temp.</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="498"/>
- <source>Datatrak/Wlog notes</source>
- <translation>Datatrak/Wlog-notater</translation>
+ <location filename="../core/save-html.c" line="528"/>
+ <source>Back to list</source>
+ <translation>Tilbake til liste</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="537"/>
- <source>Manually entered dive</source>
- <translation>Dykk lagt inn manuelt</translation>
+ <location filename="../core/save-html.c" line="531"/>
+ <source>Dive No.</source>
+ <translation>Dykk nr.</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="588"/>
- <source>Unknown</source>
- <translation>Ukjent</translation>
+ <location filename="../core/save-html.c" line="532"/>
+ <source>Dive profile</source>
+ <translation>Dykkeprofil</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="674"/>
- <source>Error: couldn&apos;t open the file %s</source>
- <translation>Feil: kunne ikke åpne %s</translation>
+ <location filename="../core/save-html.c" line="533"/>
+ <source>Dive information</source>
+ <translation>Dykkeinformasjon</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="687"/>
- <source>Error: no dive</source>
- <translation>Feil: Ikke noe dykk</translation>
+ <location filename="../core/save-html.c" line="534"/>
+ <source>Dive equipment</source>
+ <translation>Dykkerutstyr</translation>
</message>
<message>
- <location filename="../core/dive.c" line="27"/>
- <source>student</source>
- <translation>elev</translation>
+ <location filename="../core/save-html.c" line="535"/>
+ <location filename="../core/save-html.c" line="542"/>
+ <source>Type</source>
+ <translation>Type</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="461"/>
- <location filename="../core/dive.c" line="28"/>
- <source>photo</source>
- <translation>foto</translation>
+ <location filename="../core/save-html.c" line="536"/>
+ <source>Size</source>
+ <translation>Størrelse</translation>
</message>
<message>
- <location filename="../core/dive.c" line="28"/>
- <source>video</source>
- <translation>video</translation>
+ <location filename="../core/save-html.c" line="537"/>
+ <source>Work pressure</source>
+ <translation>Trykkrating</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="435"/>
- <location filename="../core/dive.c" line="28"/>
- <source>instructor</source>
- <translation>instruktør</translation>
+ <location filename="../core/save-html.c" line="538"/>
+ <source>Start pressure</source>
+ <translation>Starttrykk</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="398"/>
- <location filename="../core/dive.c" line="29"/>
- <source>deco</source>
- <translation>deko</translation>
+ <location filename="../core/save-html.c" line="539"/>
+ <source>End pressure</source>
+ <translation>Sluttrykk</translation>
</message>
<message>
- <location filename="../core/dive.c" line="33"/>
- <source>OC-gas</source>
- <translation>OC-gass</translation>
+ <location filename="../core/save-html.c" line="540"/>
+ <source>Gas</source>
+ <translation>Gass</translation>
</message>
<message>
- <location filename="../core/dive.c" line="33"/>
- <source>diluent</source>
- <translation>diluent</translation>
+ <location filename="../core/save-html.c" line="541"/>
+ <source>Weight</source>
+ <translation>Vekt</translation>
</message>
<message>
- <location filename="../core/dive.c" line="33"/>
- <location filename="../core/equipment.c" line="88"/>
- <location filename="../core/planner.c" line="1415"/>
- <location filename="../core/planner.c" line="1418"/>
- <source>oxygen</source>
- <translation>oksygen</translation>
+ <location filename="../core/save-html.c" line="543"/>
+ <source>Events</source>
+ <translation>Hendelser</translation>
</message>
<message>
- <location filename="../core/dive.c" line="227"/>
- <source>ℓ</source>
- <translation>ℓ</translation>
+ <location filename="../core/save-html.c" line="544"/>
+ <source>Name</source>
+ <translation>Navn</translation>
+ </message>
+ <message>
+ <location filename="../core/save-html.c" line="545"/>
+ <source>Value</source>
+ <translation>Verdi</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="239"/>
+ <location filename="../core/save-html.c" line="546"/>
+ <source>Coordinates</source>
+ <translation>Koordinater</translation>
+ </message>
+ <message>
+ <location filename="../core/save-html.c" line="547"/>
+ <source>Dive status</source>
+ <translation>Dykkestatus</translation>
+ </message>
+ <message>
+ <location filename="../core/statistics.c" line="242"/>
<source>more than %d days</source>
<translation>mer enn %d dager</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="246"/>
+ <location filename="../core/statistics.c" line="249"/>
<source>%dd %dh %dmin</source>
<translation>%dt %dt %dmin</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="249"/>
+ <location filename="../core/statistics.c" line="252"/>
<source>%dmin %dsecs</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/statistics.c" line="251"/>
+ <location filename="../core/statistics.c" line="254"/>
<source>%dh %dmin</source>
<translation>%dt %dmin</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="263"/>
+ <location filename="../core/statistics.c" line="266"/>
<source>for dives #</source>
<translation>for dykk #</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="269"/>
+ <location filename="../core/statistics.c" line="272"/>
<source>for selected dives</source>
<translation>for valgte dykk</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="304"/>
+ <location filename="../core/statistics.c" line="307"/>
<source>for dive #%d</source>
<translation>for dykk #%d</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="306"/>
+ <location filename="../core/statistics.c" line="309"/>
<source>for selected dive</source>
<translation>for valgte dykk</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="308"/>
+ <location filename="../core/statistics.c" line="311"/>
<source>for all dives</source>
<translation>for alle dykk</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="310"/>
+ <location filename="../core/statistics.c" line="313"/>
<source>(no dives)</source>
<translation>(ingen dykk)</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Sun</source>
<translation>søn</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Mon</source>
<translation>man</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Tue</source>
<translation>tir</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Wed</source>
<translation>ons</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Thu</source>
<translation>tor</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Fri</source>
<translation>fre</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Sat</source>
<translation>lør</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Jan</source>
<translation>jan</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Feb</source>
<translation>feb</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Mar</source>
<translation>mar</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Apr</source>
<translation>apr</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>May</source>
<translation>mai</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Jun</source>
<translation>jun</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Jul</source>
<translation>jul</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Aug</source>
<translation>aug</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Sep</source>
<translation>sep</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Oct</source>
<translation>okt</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Nov</source>
<translation>nov</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Dec</source>
<translation>des</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="191"/>
- <location filename="../core/parse-xml.c" line="3284"/>
- <location filename="../core/uemis-downloader.c" line="134"/>
- <source>unknown</source>
- <translation>ukjent</translation>
- </message>
- <message>
- <location filename="../core/uemis-downloader.c" line="467"/>
- <source>data</source>
- <translation>data</translation>
- </message>
- <message>
- <location filename="../core/uemis-downloader.c" line="447"/>
- <source>%s %s</source>
- <translation>%s %s</translation>
- </message>
- <message>
<location filename="../core/uemis-downloader.c" line="27"/>
<source>Uemis Zurich: the file system is almost full.
Disconnect/reconnect the dive computer
@@ -10081,6 +10539,16 @@ Er Uemis Zurich plugget i ordentlig?</translation>
<translation>Ingen dykk å laste ned</translation>
</message>
<message>
+ <location filename="../core/uemis-downloader.c" line="447"/>
+ <source>%s %s</source>
+ <translation>%s %s</translation>
+ </message>
+ <message>
+ <location filename="../core/uemis-downloader.c" line="467"/>
+ <source>data</source>
+ <translation>data</translation>
+ </message>
+ <message>
<location filename="../core/uemis-downloader.c" line="495"/>
<source>divelog #</source>
<translation>logg # </translation>
@@ -10251,281 +10719,6 @@ Er Uemis Zurich plugget i ordentlig?</translation>
<translation>Alarm: dårlig batteri</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="469"/>
- <location filename="../core/save-html.c" line="553"/>
- <location filename="../core/worldmap-save.c" line="111"/>
- <source>Can&apos;t open file %s</source>
- <translation>Klarer ikke åpne fila %s</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="488"/>
- <source>Number</source>
- <translation>Tall</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="489"/>
- <source>Date</source>
- <translation>Dato</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="490"/>
- <source>Time</source>
- <translation>Tid</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="491"/>
- <source>Location</source>
- <translation>Sted</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="492"/>
- <source>Air temp.</source>
- <translation>Lufttemp.</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="493"/>
- <source>Water temp.</source>
- <translation>Vanntemp.</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="498"/>
- <source>Statistics</source>
- <translation>Statistikk</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="502"/>
- <source>Rating</source>
- <translation>Vurdering</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="503"/>
- <source>Visibility</source>
- <translation>Sikt</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="504"/>
- <source>Duration</source>
- <translation>Varighet</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="494"/>
- <source>Dives</source>
- <translation>Dykk</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="495"/>
- <source>Expand all</source>
- <translation>Fold ut turer</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="496"/>
- <source>Collapse all</source>
- <translation>Fold sammen turer</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="497"/>
- <source>Trips</source>
- <translation>Turer</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="499"/>
- <source>Advanced search</source>
- <translation>Avansert søk</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="505"/>
- <source>Divemaster</source>
- <translation>Dykkeleder</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="506"/>
- <source>Buddy</source>
- <translation>Buddy</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="507"/>
- <source>Suit</source>
- <translation>Drakt</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="508"/>
- <source>Tags</source>
- <translation>Emner</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="509"/>
- <location filename="../smtk-import/smartrak.c" line="251"/>
- <location filename="../smtk-import/smartrak.c" line="321"/>
- <source>Notes</source>
- <translation>Notater</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="510"/>
- <source>Show more details</source>
- <translation>Vis flere detaljer</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="513"/>
- <source>Yearly statistics</source>
- <translation>Årsstatistikk</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="514"/>
- <source>Year</source>
- <translation>År</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="515"/>
- <source>Total time</source>
- <translation>Totaltid</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="516"/>
- <source>Average time</source>
- <translation>Snittid</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="517"/>
- <source>Shortest time</source>
- <translation>Korteste tid</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="518"/>
- <source>Longest time</source>
- <translation>Lengste tid</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="519"/>
- <source>Average depth</source>
- <translation>Snittdybde</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="520"/>
- <source>Min. depth</source>
- <translation>Min. dybde</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="521"/>
- <source>Max. depth</source>
- <translation>Maksdybde</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="523"/>
- <source>Min. SAC</source>
- <translation>Min. SAC</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="524"/>
- <source>Max. SAC</source>
- <translation>Maks. SAC</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="525"/>
- <source>Average temp.</source>
- <translation>Snitt-temp.</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="526"/>
- <source>Min. temp.</source>
- <translation>Min. temp</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="527"/>
- <source>Max. temp.</source>
- <translation>Maks. temp.</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="528"/>
- <source>Back to list</source>
- <translation>Tilbake til liste</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="534"/>
- <source>Dive equipment</source>
- <translation>Dykkerutstyr</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="537"/>
- <source>Work pressure</source>
- <translation>Trykkrating</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="538"/>
- <source>Start pressure</source>
- <translation>Starttrykk</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="539"/>
- <source>End pressure</source>
- <translation>Sluttrykk</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="547"/>
- <source>Dive status</source>
- <translation>Dykkestatus</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="522"/>
- <source>Average SAC</source>
- <translation>Snitt-SAC</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="531"/>
- <source>Dive No.</source>
- <translation>Dykk nr.</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="532"/>
- <source>Dive profile</source>
- <translation>Dykkeprofil</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="533"/>
- <source>Dive information</source>
- <translation>Dykkeinformasjon</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="535"/>
- <location filename="../core/save-html.c" line="542"/>
- <source>Type</source>
- <translation>Type</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="536"/>
- <source>Size</source>
- <translation>Størrelse</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="540"/>
- <source>Gas</source>
- <translation>Gass</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="541"/>
- <source>Weight</source>
- <translation>Vekt</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="543"/>
- <source>Events</source>
- <translation>Hendelser</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="544"/>
- <source>Name</source>
- <translation>Navn</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="545"/>
- <source>Value</source>
- <translation>Verdi</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="546"/>
- <source>Coordinates</source>
- <translation>Koordinater</translation>
- </message>
- <message>
<location filename="../core/worldmap-save.c" line="39"/>
<source>Date:</source>
<translation>Dato:</translation>
@@ -10571,110 +10764,6 @@ Er Uemis Zurich plugget i ordentlig?</translation>
<translation>Notater:</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="91"/>
- <location filename="../core/qthelper.cpp" line="226"/>
- <source>N</source>
- <translation>N</translation>
- </message>
- <message>
- <location filename="../core/qthelper.cpp" line="91"/>
- <location filename="../core/qthelper.cpp" line="227"/>
- <source>S</source>
- <translation>S</translation>
- </message>
- <message>
- <location filename="../core/qthelper.cpp" line="92"/>
- <location filename="../core/qthelper.cpp" line="228"/>
- <source>E</source>
- <translation>Ø</translation>
- </message>
- <message>
- <location filename="../core/qthelper.cpp" line="92"/>
- <location filename="../core/qthelper.cpp" line="229"/>
- <source>W</source>
- <translation>V</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="341"/>
- <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
- <translation>Skylager og lokal data avviker. Feil: merge failed (%s)</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="134"/>
- <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
- <translation>Lokalt mellomlager i %s er ødelagt - kan ikke synkronisere med Subsurface skylager</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="157"/>
- <location filename="../core/git-access.c" line="177"/>
- <source>Could not update local cache to newer remote data</source>
- <translation>Kunne ikke oppdatere lokalt mellomlager med nyere data</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="170"/>
- <source>Subsurface cloud storage corrupted</source>
- <translation>Subsurface skylager ødelagt</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="285"/>
- <source>Could not update Subsurface cloud storage, try again later</source>
- <translation>Kunne ikke oppdatere Subsurface skylager, prøv igjen senere</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="371"/>
- <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
- <translation>Skylager og lokal data er forskjellig. Klarer ikke å kombinere nye data med lokale data.</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="405"/>
- <source>Remote storage and local data diverged</source>
- <translation>Skylager og lokal data er forskjellig</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="408"/>
- <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
- <translation>Skylager og lokal data er forskjellig. Feil: kunne ikke skrive data (%s)</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="417"/>
- <source>Problems with local cache of Subsurface cloud data</source>
- <translation>Problemer med det lokale mellomlageret til skylageret</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="418"/>
- <source>Moved cache data to %s. Please try the operation again.</source>
- <translation>Flyttet mellomlager til %s. Prøv igjen.</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="737"/>
- <source>Error connecting to Subsurface cloud storage</source>
- <translation>Klarte ikke å koble til skylager for Subsurface</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="740"/>
- <source>git clone of %s failed (%s)</source>
- <translation>git clone of %s failed (%s)</translation>
- </message>
- <message>
- <location filename="../core/load-git.c" line="222"/>
- <location filename="../core/parse-xml.c" line="1300"/>
- <source>additional name for site: %s
-</source>
- <translation>ytterligere navn for sted: %s
-</translation>
- </message>
- <message>
- <location filename="../core/ostctools.c" line="120"/>
- <location filename="../core/ostctools.c" line="152"/>
- <source>Unknown DC in dive %d</source>
- <translation>Ukjent computer i dykk %d</translation>
- </message>
- <message>
- <location filename="../core/ostctools.c" line="165"/>
- <source>Error - %s - parsing dive %d</source>
- <translation>Feil - %s - leser dykk %d</translation>
- </message>
- <message>
<location filename="../smtk-import/smartrak.c" line="247"/>
<source>Built</source>
<translation type="unfinished"/>
@@ -10758,155 +10847,120 @@ Er Uemis Zurich plugget i ordentlig?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="103"/>
<source>Subsurface</source>
<translation>Subsurface</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="110"/>
<source>Dive list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="125"/>
<source>Cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="139"/>
<source>Manage dives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="141"/>
<source>Add dive manually</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="149"/>
<source>Manual sync with cloud</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="167"/>
<source>Offline mode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="167"/>
<source>Enable auto cloud sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="187"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="190"/>
<source>GPS-tag dives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="197"/>
<source>Upload GPS data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="204"/>
<source>Download GPS data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="211"/>
<source>Show GPS fixes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="220"/>
<source>Clear GPS cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="226"/>
<source>Preferences</source>
<translation>Valg</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="237"/>
<source>Developer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="239"/>
<source>App log</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="246"/>
<source>Theme information</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="253"/>
<source>User manual</source>
<translation>Brukermanual</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="259"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="304"/>
<source>Run location service</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="304"/>
<source>No GPS source available</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="316"/>
<source>Actions</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
- <source>Hello World</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
- <source>File</source>
- <translation>Fil</translation>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
- <source>&amp;Open</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
- <source>Exit</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
- <source>Button 1 pressed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
- <source>Button 2 pressed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
- <source>May I have your attention, please?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>plannerDetails</name>
@@ -10984,6 +11038,24 @@ p, li { white-space: pre-wrap; }
<translation>m/min</translation>
</message>
<message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+ <location filename="../build/ui_plannerSettings.h" line="425"/>
+ <source>75% to 50% avg. depth</source>
+ <translation>75% til 50% av snittdybde</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+ <location filename="../build/ui_plannerSettings.h" line="427"/>
+ <source>50% avg. depth to 6m</source>
+ <translation>50% av snittdybde til 6m</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+ <location filename="../build/ui_plannerSettings.h" line="429"/>
+ <source>6m to surface</source>
+ <translation>6m til overflaten</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
<location filename="../build/ui_plannerSettings.h" line="431"/>
<source>Descent</source>
@@ -11007,12 +11079,35 @@ p, li { white-space: pre-wrap; }
<translation>VPM-B deko</translation>
</message>
<message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+ <source>Bühlmann deco</source>
+ <translation>Bühlmann deko</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
<location filename="../build/ui_plannerSettings.h" line="445"/>
<source>Reserve gas</source>
<translation>Reservegass</translation>
</message>
<message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+ <location filename="../build/ui_plannerSettings.h" line="446"/>
+ <location filename="../build/ui_plannerSettings.h" line="459"/>
+ <location filename="../build/ui_plannerSettings.h" line="461"/>
+ <source>bar</source>
+ <translation>bar</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+ <location filename="../build/ui_plannerSettings.h" line="437"/>
+ <location filename="../build/ui_plannerSettings.h" line="440"/>
+ <source>%</source>
+ <translation>%</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
<location filename="../build/ui_plannerSettings.h" line="449"/>
<source>Postpone gas change if a stop is not required</source>
@@ -11031,12 +11126,10 @@ p, li { white-space: pre-wrap; }
<translation>GF low</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
- <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
- <location filename="../build/ui_plannerSettings.h" line="437"/>
- <location filename="../build/ui_plannerSettings.h" line="440"/>
- <source>%</source>
- <translation>%</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+ <location filename="../build/ui_plannerSettings.h" line="436"/>
+ <source>Plan backgas breaks</source>
+ <translation>Planlegg stopp med bakgass</translation>
</message>
<message>
<location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11045,10 +11138,10 @@ p, li { white-space: pre-wrap; }
<translation>GF high</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
- <location filename="../build/ui_plannerSettings.h" line="441"/>
- <source>Drop to first depth</source>
- <translation>Dropp til første dybde</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+ <location filename="../build/ui_plannerSettings.h" line="453"/>
+ <source>min</source>
+ <translation>min</translation>
</message>
<message>
<location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11057,163 +11150,139 @@ p, li { white-space: pre-wrap; }
<translation>Siste stopp ved 6m</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
- <location filename="../build/ui_plannerSettings.h" line="436"/>
- <source>Plan backgas breaks</source>
- <translation>Planlegg stopp med bakgass</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+ <source>Maximize bottom time allowed by gas and no decompression limits</source>
+ <translation>Maksimal bunntid utifra gass og dekompresjonsgrenser</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
- <location filename="../build/ui_plannerSettings.h" line="455"/>
- <source>Gas options</source>
- <translation>Gassvalg</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+ <location filename="../build/ui_plannerSettings.h" line="443"/>
+ <source>Recreational mode</source>
+ <translation>Rekreasjonsmodus</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
- <location filename="../build/ui_plannerSettings.h" line="456"/>
- <source>Bottom SAC</source>
- <translation>SAC på bunn</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+ <location filename="../build/ui_plannerSettings.h" line="441"/>
+ <source>Drop to first depth</source>
+ <translation>Dropp til første dybde</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
- <location filename="../build/ui_plannerSettings.h" line="457"/>
- <source>Deco SAC</source>
- <translation>SAC under deko</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+ <location filename="../build/ui_plannerSettings.h" line="452"/>
+ <source>Min. switch duration</source>
+ <translation>Minimum tid for bytte</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
- <location filename="../build/ui_plannerSettings.h" line="458"/>
- <source>Bottom pO₂</source>
- <translation>pO₂ på bunn</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+ <location filename="../build/ui_plannerSettings.h" line="444"/>
+ <source>Safety stop</source>
+ <translation>Sikkerhetsstopp</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
- <location filename="../build/ui_plannerSettings.h" line="460"/>
- <source>Deco pO₂</source>
- <translation>pO₂ for deko</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+ <source>Conservatism level</source>
+ <translation>Konservatisme</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+ <location filename="../build/ui_plannerSettings.h" line="455"/>
+ <source>Gas options</source>
+ <translation>Gassvalg</translation>
</message>
<message>
<location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
- <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
<location filename="../build/ui_plannerSettings.h" line="462"/>
<location filename="../build/ui_plannerSettings.h" line="463"/>
<source>ℓ/min</source>
<translation>ℓ/min</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
- <location filename="../build/ui_plannerSettings.h" line="468"/>
- <source>Display runtime</source>
- <translation>Vis løpetid</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
- <location filename="../build/ui_plannerSettings.h" line="472"/>
- <source>Display segment duration</source>
- <translation>Vis lengde på segment</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
- <location filename="../build/ui_plannerSettings.h" line="476"/>
- <source>Display transitions in deco</source>
- <translation>Vis overganger i deko</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
- <location filename="../build/ui_plannerSettings.h" line="477"/>
- <source>Verbatim dive plan</source>
- <translation>Utdypende dykkeplan</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
- <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
- <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
- <location filename="../build/ui_plannerSettings.h" line="446"/>
- <location filename="../build/ui_plannerSettings.h" line="459"/>
- <location filename="../build/ui_plannerSettings.h" line="461"/>
- <source>bar</source>
- <translation>bar</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
- <location filename="../build/ui_plannerSettings.h" line="425"/>
- <source>75% to 50% avg. depth</source>
- <translation>75% til 50% av snittdybde</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
- <location filename="../build/ui_plannerSettings.h" line="427"/>
- <source>50% avg. depth to 6m</source>
- <translation>50% av snittdybde til 6m</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
- <location filename="../build/ui_plannerSettings.h" line="429"/>
- <source>6m to surface</source>
- <translation>6m til overflaten</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
- <source>Bühlmann deco</source>
- <translation>Bühlmann deko</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
- <location filename="../build/ui_plannerSettings.h" line="453"/>
- <source>min</source>
- <translation>min</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
- <source>Maximize bottom time allowed by gas and no decompression limits</source>
- <translation>Maksimal bunntid utifra gass og dekompresjonsgrenser</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+ <source>m</source>
+ <translation>m</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
- <location filename="../build/ui_plannerSettings.h" line="443"/>
- <source>Recreational mode</source>
- <translation>Rekreasjonsmodus</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+ <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
- <location filename="../build/ui_plannerSettings.h" line="452"/>
- <source>Min. switch duration</source>
- <translation>Minimum tid for bytte</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+ <location filename="../build/ui_plannerSettings.h" line="456"/>
+ <source>Bottom SAC</source>
+ <translation>SAC på bunn</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
- <location filename="../build/ui_plannerSettings.h" line="444"/>
- <source>Safety stop</source>
- <translation>Sikkerhetsstopp</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+ <location filename="../build/ui_plannerSettings.h" line="458"/>
+ <source>Bottom pO₂</source>
+ <translation>pO₂ på bunn</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
- <source>Conservatism level</source>
- <translation>Konservatisme</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+ <source>Best mix END</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
<location filename="../build/ui_plannerSettings.h" line="464"/>
<source>Notes</source>
<translation>Notater</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
<location filename="../build/ui_plannerSettings.h" line="466"/>
<source>In dive plan, show runtime (absolute time) of stops</source>
<translation>I dykkeplanen, vis stoppenes løpetid (absolutt tid)</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+ <location filename="../build/ui_plannerSettings.h" line="468"/>
+ <source>Display runtime</source>
+ <translation>Vis løpetid</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
<location filename="../build/ui_plannerSettings.h" line="470"/>
<source>In dive plan, show duration (relative time) of stops</source>
<translation>I dykkeplanen, vis stoppenes lengde (relativ tid)</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+ <location filename="../build/ui_plannerSettings.h" line="472"/>
+ <source>Display segment duration</source>
+ <translation>Vis lengde på segment</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
<location filename="../build/ui_plannerSettings.h" line="474"/>
<source>In diveplan, list transitions or treat them as implicit</source>
<translation>I dykkeplanen, vis overganger eller behandle dem eksplisitt</translation>
</message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+ <location filename="../build/ui_plannerSettings.h" line="476"/>
+ <source>Display transitions in deco</source>
+ <translation>Vis overganger i deko</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+ <location filename="../build/ui_plannerSettings.h" line="477"/>
+ <source>Verbatim dive plan</source>
+ <translation>Utdypende dykkeplan</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+ <location filename="../build/ui_plannerSettings.h" line="460"/>
+ <source>Deco pO₂</source>
+ <translation>pO₂ for deko</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+ <location filename="../build/ui_plannerSettings.h" line="457"/>
+ <source>Deco SAC</source>
+ <translation>SAC under deko</translation>
+ </message>
</context>
</TS> \ No newline at end of file
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-26 15:17:41 +0000