diff options
Diffstat (limited to 'translations/subsurface_nb_NO.ts')
| -rw-r--r-- | translations/subsurface_nb_NO.ts | 3181 |
1 files changed, 2102 insertions, 1079 deletions
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index c3ad6e0a4..e6f4b2647 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -36,6 +36,22 @@ </message> </context> <context> + <name>AddDivesToTrip</name> + <message numerus="yes"> + <location filename="../desktop-widgets/command_divelist.cpp" line="700"/> + <source>add %n dives to trip</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> +</context> +<context> + <name>AutogroupDives</name> + <message> + <location filename="../desktop-widgets/command_divelist.cpp" line="720"/> + <source>autogroup dives</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>BackButton</name> <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="51"/> @@ -47,279 +63,290 @@ <name>BtDeviceSelectionDialog</name> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="240"/> <source>Remote Bluetooth device selection</source> <translation>Valg av bluetooth-enhet</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="32"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="250"/> <source>Discovered devices</source> <translation>Oppdagede enheter</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="241"/> <source>Save</source> <translation>Lagre</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="242"/> <source>Quit</source> <translation>Avslutt</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="251"/> <source>Bluetooth mode</source> <translation>Blåtannmodus</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="252"/> <source>Auto</source> <translation>Auto</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="253"/> <source>Force LE</source> <translation>Tving LE</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="254"/> <source>Force classical</source> <translation>Tving klassisk</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="256"/> <source>Scan</source> <translation>Scan</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="257"/> <source>Clear</source> <translation>Fjern</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="26"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="244"/> <source>Local Bluetooth device details</source> <translation>Detaljer for lokal bluetooth-enhet</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="245"/> <source>Name: </source> <translation>Navn:</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="28"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="246"/> <source>Address:</source> <translation>Adresse:</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="30"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="247"/> <source>Bluetooth powered on</source> <translation>Bluetooth er påskrudd</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="31"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="248"/> <source>Turn on/off</source> <translation>Skru av/på</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="27"/> + <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="249"/> <source>Select device:</source> <translation>Velg enhet:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="36"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="29"/> <source>Name:</source> <translation>Navn:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> - <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="139"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="101"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Prøver å skru på lokal bluetooth-enhet...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="104"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Prøver å skru av lokal bluetooth-enhet...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="132"/> <source>Remote devices list was cleared.</source> <translation>Enhetsliste ble slettet.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="189"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="144"/> <source>Scanning for remote devices...</source> <translation>Leter etter enheter...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="202"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="157"/> <source>Scanning finished successfully.</source> <translation>Scanning ferdig.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>Den lokale Bluetooth-enheten ble %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="168"/> <source>turned on</source> <translation>skrudd på</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="216"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="168"/> <source>turned off</source> <translation>skrudd av</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="392"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="315"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="335"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="377"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="187"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="320"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> <source>PAIRED</source> <translation>PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="239"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="382"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="190"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="325"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="334"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORIZED_PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="254"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="205"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Tilstand: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="277"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="228"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Enheten %1 kan brukes. Trykk "Lagre"-knappen.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="290"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="408"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="241"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="351"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Enheten %1 må pares for å bli bruk. Bruk menyen for paringsvalg.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="296"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="247"/> <source>A device needs a non-zero address for a connection.</source> <translation>En tom adresse kan ikke brukes for en enhetstilkobling</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="267"/> <source>The local device was changed.</source> <translation>Den lokale enheten ble endret.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> <source>Pair</source> <translation>Par</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="284"/> <source>Remove pairing</source> <translation>Fjern paring</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="300"/> <source>Trying to pair device %1</source> <translation>Prøver å pare %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="304"/> <source>Trying to unpair device %1</source> <translation>Prøver å fjerne paring for %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="316"/> <source>Device %1 was unpaired.</source> <translation>Fjernet paring for %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="323"/> <source>Device %1 was paired.</source> <translation>%1 er paret.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="328"/> <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="411"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="354"/> <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 "Lagre"-knappen.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> <source>Local device error: %1.</source> <translation>Enhetsfeil: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="367"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Paringsfeil. Hvis enheten krever en spesiell PIN-kode, prøv å pare den ved hjelp av operativsystemet.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="426"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="369"/> <source>Unknown error</source> <translation>Ukjent feil</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="435"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Bluetoothadapteren er avskrudd, skru den på før søk.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="438"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Feil ved skriving til eller lesing fra enheten.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>An unknown error has occurred.</source> <translation>En ukjent feil inntraff.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="449"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="388"/> <source>Device discovery error: %1.</source> <translation>Feil ved søk etter enhet: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="503"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="439"/> <source>Not available</source> <translation>Ikke tilgjengelig</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="446"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Den lokale bluetooth-adapteren er ikke tilgjengelig.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="560"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="485"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Søkeagenten ble ikke opprettet siden adressen %1 ikke stemmer overens med den fysiske adressen til noen av de lokale bluetooth-enhetene.</translation> </message> @@ -327,12 +354,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="542"/> <source>Person</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="543"/> <source>Searches for buddies and divemasters</source> <translation>Søk etter buddyer og dykkeledere</translation> </message> @@ -340,7 +367,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="374"/> + <location filename="../qt-models/filtermodels.cpp" line="491"/> <source>No buddies</source> <translation>Ingen buddyer</translation> </message> @@ -412,187 +439,216 @@ <context> <name>ColumnNameProvider</name> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="67"/> <source>Dive #</source> <translation>Dykk #</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="67"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="67"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="67"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="67"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="67"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="67"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="67"/> <source>Cyl. size</source> <translation>Tankstr.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="67"/> <source>Start pressure</source> <translation>Starttrykk</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="68"/> <source>End pressure</source> <translation>Sluttrykk</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="68"/> <source>Max. depth</source> <translation>Maksdybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="68"/> <source>Avg. depth</source> <translation>Snittdybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="68"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="68"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="68"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="68"/> <source>Notes</source> <translation>Notater</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="68"/> <source>Tags</source> <translation>Emner</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="68"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="68"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/> <source>O₂</source> <translation>O₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/> <source>He</source> <translation>He</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/> <source>Sample time</source> <translation>Datapunkt: tid</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/> <source>Sample depth</source> <translation>Datapunkt: dybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/> <source>Sample temperature</source> <translation>Datapunkt: temperatur</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/> <source>Sample pO₂</source> <translation>Datapunkt: pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/> <source>Sample CNS</source> <translation>Datapunkt: CNS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/> <source>Sample NDL</source> <translation>Datapunkt: NDL</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/> <source>Sample TTS</source> <translation>Datapunkt: TTS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/> <source>Sample stopdepth</source> <translation>Datapunkt: stoppdybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/> <source>Sample pressure</source> <translation>Datapunkt: trykk</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="51"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/> <source>Sample sensor1 pO₂</source> <translation>Sample sensor1 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="51"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/> <source>Sample sensor2 pO₂</source> <translation>Sample sensor2 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="51"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/> <source>Sample sensor3 pO₂</source> <translation>Sample sensor3 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="52"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/> <source>Sample setpoint</source> <translation>Sample settpunkt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="52"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/> <source>Visibility</source> <translation>Sikt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="52"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/> <source>Rating</source> <translation>Vurdering</translation> </message> </context> <context> + <name>Command</name> + <message> + <location filename="../desktop-widgets/command_base.cpp" line="17"/> + <source>&Undo</source> + <translation>Angre</translation> + </message> + <message> + <location filename="../desktop-widgets/command_base.cpp" line="22"/> + <source>&Redo</source> + <translation>Gjør om</translation> + </message> +</context> +<context> + <name>Command::AddDive</name> + <message> + <location filename="../desktop-widgets/command_divelist.cpp" line="488"/> + <source>add dive</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Command::DeleteDive</name> + <message numerus="yes"> + <location filename="../desktop-widgets/command_divelist.cpp" line="558"/> + <source>delete %n dive(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> +</context> +<context> <name>ConfigureDiveComputer</name> <message> <location filename="../core/configuredivecomputer.cpp" line="221"/> @@ -639,86 +695,103 @@ <name>ConfigureDiveComputerDialog</name> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2535"/> <source>Configure dive computer</source> <translation>Konfigurer dykkecomputer</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="22"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2536"/> <source>Device or mount point</source> <translation>Enhet eller disk</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2537"/> <source>Connect via Bluetooth</source> <translation>Koble til med Bluetooth</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2538"/> <source>Connect</source> <translation>Koble til</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2539"/> <source>Disconnect</source> <translation>Koble fra</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2540"/> <source>Retrieve available details</source> <translation>Hent tilgjengelige data</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2542"/> <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="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2544"/> <source>Save changes to device</source> <translation>Lagre endringer til computer</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2546"/> <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="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2548"/> <source>Backup</source> <translation>Sikkerhetskopi</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="129"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2549"/> <source>Restore backup</source> <translation>Hent sikkerhetskopi</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="139"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2550"/> <source>Update firmware</source> <translation>Oppdater firmware</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2551"/> <source>Save libdivecomputer logfile</source> <translation>Lagre loggfil fra libdivecomputer</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2552"/> <source>...</source> <translation>...</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2553"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="241"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2564"/> <source>Suunto Vyper family</source> <translation>Suunty Vyper-familien</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2562"/> <source>OSTC 4</source> <translation>OSTC 4</translation> </message> @@ -727,24 +800,34 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1194"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2492"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3567"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2589"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2751"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2911"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3055"/> <source>Basic settings</source> <translation>Innstillinger</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1201"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2499"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2688"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2866"/> <source>Eco</source> <translation>Øko</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1206"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2504"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2689"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2867"/> <source>Medium</source> <translation>Medium</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1211"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2509"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2690"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2868"/> <source>High</source> <translation>Høy</translation> </message> @@ -771,42 +854,76 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2955"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2991"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3069"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2593"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2605"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2607"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2609"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2613"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2615"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2692"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2758"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2760"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2762"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2765"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2772"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2774"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2784"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2785"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2857"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2870"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2913"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2918"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2920"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2923"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2932"/> <source>%</source> <translation>%</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1230"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2528"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2693"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2871"/> <source>English</source> <translation>Engelsk</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2533"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2694"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2872"/> <source>German</source> <translation>Tysk</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2538"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2695"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2873"/> <source>French</source> <translation>Fransk</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1245"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2543"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2696"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2874"/> <source>Italian</source> <translation>Italiensk</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1254"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2698"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2876"/> <source>m/°C</source> <translation>m/°C</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1259"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2557"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2699"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2877"/> <source>ft/°F</source> <translation>ft/°F</translation> </message> @@ -815,6 +932,10 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1267"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2565"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3662"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2567"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2701"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2879"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3024"/> <source>Serial No.</source> <translation>Serienr.</translation> </message> @@ -823,30 +944,42 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1290"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2588"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3685"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2569"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2702"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2880"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3025"/> <source>Firmware version</source> <translation>Firmware-versjon</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1301"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2599"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2703"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2881"/> <source>MMDDYY</source> <translation>MMDDÅÅ</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1306"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2604"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2704"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2882"/> <source>DDMMYY</source> <translation>DDMMÅÅ</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1311"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2609"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2705"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2883"/> <source>YYMMDD</source> <translation>ÅÅMMDD</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1326"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2624"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2707"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2885"/> <source>Language</source> <translation>Språk</translation> </message> @@ -854,12 +987,17 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="388"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1336"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2634"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2574"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2708"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2886"/> <source>Date format</source> <translation>Datoformat</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1346"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2644"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2709"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2887"/> <source>Brightness</source> <translation>Lysstyrke</translation> </message> @@ -867,63 +1005,79 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1356"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2654"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3856"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2710"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2888"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3046"/> <source>Units</source> <translation>Enheter</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1366"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2664"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2711"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2889"/> <source>Salinity (0-5%)</source> <translation>Saltnivå (0-5%)</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1379"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2677"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2712"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2890"/> <source>Reset device to default settings</source> <translation>Resett dykkecomputer til standardinnstillinger</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1393"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2713"/> <source>230LSB/Gauss</source> <translation>230LSB/Gauss</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1398"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2714"/> <source>330LSB/Gauss</source> <translation>330LSB/Gauss</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1403"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2715"/> <source>390LSB/Gauss</source> <translation>390LSB/Gauss</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1408"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2716"/> <source>440LSB/Gauss</source> <translation>440LSB/Gauss</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1413"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2717"/> <source>660LSB/Gauss</source> <translation>660LSB/Gauss</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1418"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2718"/> <source>820LSB/Gauss</source> <translation>820LSB/Gauss</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1423"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2719"/> <source>1090LSB/Gauss</source> <translation>1090LSB/Gauss</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1428"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2720"/> <source>1370LSB/Gauss</source> <translation>1370LSB/Gauss</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1462"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2722"/> <source>Compass gain</source> <translation>Kompassdeviasjon</translation> </message> @@ -931,6 +1085,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1472"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2710"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3805"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2723"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2891"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3040"/> <source>Computer model</source> <translation>Computermodell</translation> </message> @@ -939,18 +1096,26 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1479"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2717"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3719"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2570"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2724"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2892"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3027"/> <source>Custom text</source> <translation>Tekst</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1497"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2735"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2725"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2893"/> <source>OC</source> <translation>OC</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1502"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2740"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2726"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2894"/> <source>CC</source> <translation>CC</translation> </message> @@ -958,6 +1123,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1507"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2745"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2597"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2727"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2895"/> <source>Gauge</source> <translation>Gauge</translation> </message> @@ -965,53 +1133,71 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1512"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2750"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2599"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2728"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2896"/> <source>Apnea</source> <translation>Fridykking</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1520"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2758"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2730"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2898"/> <source>Dive mode</source> <translation>Dykkemodus</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1531"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2731"/> <source>2s</source> <translation>2s</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1536"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3775"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2732"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3034"/> <source>10s</source> <translation>10s</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="359"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1544"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2573"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2734"/> <source>Sampling rate</source> <translation>Samplingsfrekvens</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1555"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2769"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2735"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2899"/> <source>Standard</source> <translation>Standard</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1560"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2774"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2736"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2900"/> <source>Red</source> <translation>Rød</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1565"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2779"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2737"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2901"/> <source>Green</source> <translation>Grøn</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1570"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2784"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2738"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2902"/> <source>Blue</source> <translation>Blå</translation> </message> @@ -1019,12 +1205,17 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="417"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1578"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2792"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2579"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2740"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2904"/> <source>Sync dive computer time with PC</source> <translation>Synkroniser tid på dykkecomputer med PC</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1585"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2799"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2741"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2905"/> <source>Dive mode color</source> <translation>Dykkemodusfarge</translation> </message> @@ -1032,12 +1223,17 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="345"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1595"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2809"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2572"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2742"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2906"/> <source>Show safety stop</source> <translation>Vis sikkerhetsstop</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="470"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1602"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2583"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2743"/> <source>End Depth</source> <translation>Sluttdybde</translation> </message> @@ -1045,6 +1241,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1628"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2835"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2568"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2745"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2908"/> <source>Length</source> <translation>Lengde</translation> </message> @@ -1052,12 +1251,17 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="463"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1635"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2842"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2582"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2746"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2909"/> <source>Start Depth</source> <translation>Startdybde</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1642"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2584"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2747"/> <source>Reset Depth</source> <translation>Nullstill dybde</translation> </message> @@ -1065,23 +1269,31 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="573"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1719"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2875"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2621"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2790"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2944"/> <source>Advanced settings</source> <translation>Avanserte innstillinger</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1725"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2752"/> <source>Left button sensitivity</source> <translation>Sensitivitet på venstre knapp</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1732"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3167"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2753"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2939"/> <source>Always show pO₂</source> <translation>Vis alltid pO₂</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1739"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2590"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2754"/> <source>Alt GF can be selected underwater</source> <translation>Alternativ GF kan velges under dykk</translation> </message> @@ -1089,12 +1301,17 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="596"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1746"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2911"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2592"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2755"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2915"/> <source>Future TTS</source> <translation>Framtidig TTS</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2918"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2756"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2916"/> <source>Pressure sensor offset</source> <translation>Trykksensoravvik</translation> </message> @@ -1102,6 +1319,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="815"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1760"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2925"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2614"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2757"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2917"/> <source>GFLow</source> <translation>GF lav</translation> </message> @@ -1109,12 +1329,17 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="792"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1783"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2948"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2612"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2759"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2919"/> <source>GFHigh</source> <translation>GF høy</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="586"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1806"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2591"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2761"/> <source>Desaturation</source> <translation>Avmetning</translation> </message> @@ -1122,6 +1347,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="645"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1858"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2984"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2595"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2764"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2922"/> <source>Decotype</source> <translation>Dekotype</translation> </message> @@ -1129,12 +1357,17 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="656"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1901"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3024"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2596"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2767"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2925"/> <source>ZH-L16</source> <translation>ZH-L16</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1906"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3029"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2768"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2926"/> <source>ZH-L16+GF</source> <translation>ZH-L16+GF</translation> </message> @@ -1142,6 +1375,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="723"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1924"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3052"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2606"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2771"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2930"/> <source>Last deco</source> <translation>Siste deko</translation> </message> @@ -1149,6 +1385,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="749"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1950"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3062"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2608"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2773"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2931"/> <source>Alt GFLow</source> <translation>Alt GF-Lav</translation> </message> @@ -1156,38 +1395,49 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="775"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1976"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3085"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2610"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2775"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2933"/> <source>Alt GFHigh</source> <translation>Alt GF-Høy</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="782"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1983"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2611"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2776"/> <source>Saturation</source> <translation>Metning</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1993"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2777"/> <source>Flip screen</source> <translation>Flipp skjerm</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2000"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2778"/> <source>Right button sensitivity</source> <translation>Sensitivitet på høyre knap</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2007"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2779"/> <source>MOD warning</source> <translation>MOD-advarsel</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="838"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2014"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2616"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2780"/> <source>Graphical speed indicator</source> <translation>Grafisk fartsindikator</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2021"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2781"/> <source>Dynamic ascent rate</source> <translation>Dynamisk oppstigningshastighet</translation> </message> @@ -1195,6 +1445,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="877"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2028"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3092"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2619"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2782"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2934"/> <source>Bottom gas consumption</source> <translation>Gassforbruk på bunngass</translation> </message> @@ -1202,18 +1455,25 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="884"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2035"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3099"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2620"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2783"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2935"/> <source>Deco gas consumption</source> <translation>Gassforbruk på dekogass</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2106"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3194"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2788"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2942"/> <source>Temperature sensor offset</source> <translation>Justering for temperatursensor</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2113"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3201"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2789"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2943"/> <source>°C</source> <translation>°C</translation> </message> @@ -1221,16 +1481,21 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="892"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2133"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3221"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2687"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2865"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3018"/> <source>Gas settings</source> <translation>Gassvalg</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2558"/> <source>OSTC Mk2/2N/2C</source> <translation>OSTC Mk2/2N/2C</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2560"/> <source>OSTC 2/3/Sport/Plus/cR</source> <translation>OSTC 2/3/Sport/Plus/cR</translation> </message> @@ -1245,6 +1510,16 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1845"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2852"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2971"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2586"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2587"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2588"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2594"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2748"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2749"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2750"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2763"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2910"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2921"/> <source>m</source> <translation>m</translation> </message> @@ -1256,6 +1531,13 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3106"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3122"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3138"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2617"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2618"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2786"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2787"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2936"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2937"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2938"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -1266,6 +1548,12 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3264"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3349"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2623"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2646"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2792"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2815"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2946"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2969"/> <source>%O₂</source> <translation>%O₂</translation> </message> @@ -1276,6 +1564,12 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2266"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3269"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3354"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2625"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2648"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2794"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2817"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2948"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2971"/> <source>%He</source> <translation>%He</translation> </message> @@ -1286,6 +1580,12 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3274"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3359"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2627"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2650"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2796"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2819"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2950"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2973"/> <source>Type</source> <translation>Type</translation> </message> @@ -1299,6 +1599,15 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3279"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3364"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3439"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2629"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2652"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2671"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2798"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2821"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2840"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2952"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2975"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2994"/> <source>Change depth</source> <translation>Endre dybde</translation> </message> @@ -1306,6 +1615,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="955"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2196"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3284"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2634"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2803"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2957"/> <source>Gas 1</source> <translation>Gass 1</translation> </message> @@ -1313,6 +1625,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2201"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3289"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2636"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2805"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2959"/> <source>Gas 2</source> <translation>Gass 2</translation> </message> @@ -1320,6 +1635,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3294"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2638"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2807"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2961"/> <source>Gas 3</source> <translation>Gass 3</translation> </message> @@ -1327,6 +1645,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="970"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2211"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3299"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2640"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2809"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2963"/> <source>Gas 4</source> <translation>Gass 4</translation> </message> @@ -1334,6 +1655,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="975"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2216"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3304"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2642"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2811"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2965"/> <source>Gas 5</source> <translation>Gass 5</translation> </message> @@ -1341,6 +1665,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1040"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2281"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3369"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2657"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2826"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2980"/> <source>Dil 1</source> <translation>Dil 1</translation> </message> @@ -1348,6 +1675,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1045"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2286"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3374"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2659"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2828"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2982"/> <source>Dil 2</source> <translation>Dil 2</translation> </message> @@ -1355,6 +1685,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1050"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2291"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3379"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2661"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2830"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2984"/> <source>Dil 3</source> <translation>Dil 3</translation> </message> @@ -1362,6 +1695,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1055"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2296"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3384"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2663"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2832"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2986"/> <source>Dil 4</source> <translation>Dil 4</translation> </message> @@ -1369,6 +1705,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1060"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2301"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3389"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2665"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2834"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2988"/> <source>Dil 5</source> <translation>Dil 5</translation> </message> @@ -1376,6 +1715,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1095"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3434"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2669"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2838"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2992"/> <source>Setpoint</source> <translation>Settpunkt</translation> </message> @@ -1383,6 +1725,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1105"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2356"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3444"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2676"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2845"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2999"/> <source>SP 1</source> <translation>SP 1</translation> </message> @@ -1390,6 +1735,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1110"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2361"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3449"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2678"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2847"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3001"/> <source>SP 2</source> <translation>SP 2</translation> </message> @@ -1397,6 +1745,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1115"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2366"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3454"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2680"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2849"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3003"/> <source>SP 3</source> <translation>SP 3</translation> </message> @@ -1407,46 +1758,64 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2450"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3509"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3525"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2683"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2684"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2861"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2862"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3014"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3015"/> <source>cbar</source> <translation>cbar</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1884"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3007"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2766"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2924"/> <source>mbar</source> <translation>mbar</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2371"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3459"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2851"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3005"/> <source>SP 4</source> <translation>SP 4</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2376"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3464"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2853"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3007"/> <source>SP 5</source> <translation>SP 5</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2384"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2856"/> <source>O₂ in calibration gas</source> <translation>O₂ i kalibreringsgass</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3473"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2858"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3010"/> <source>Fixed setpoint</source> <translation>Fast settpunkt</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2413"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3478"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2859"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3011"/> <source>Sensor</source> <translation>Sensor</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3486"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3013"/> <source>Setpoint fallback</source> <translation>Reserveverdi for settpunkt</translation> </message> @@ -1454,6 +1823,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1168"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2466"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3541"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2685"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2863"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3016"/> <source>pO₂ max</source> <translation>pO₂ maks</translation> </message> @@ -1461,75 +1833,92 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1175"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2473"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3548"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2686"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2864"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3017"/> <source>pO₂ min</source> <translation>pO₂ min</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3589"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3019"/> <source>Safety level</source> <translation>Sikkerhetsnivå</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3615"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3021"/> <source>Altitude range</source> <translation>Høydeområde</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3622"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3022"/> <source>Model</source> <translation>Modell</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="338"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3642"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2571"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3023"/> <source>Number of dives</source> <translation>Antall dyk</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3702"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3026"/> <source>Max. depth</source> <translation>Maksdybde</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3749"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3029"/> <source>P0 (none)</source> <extracomment>Suunto safety level</extracomment> <translation>P0 (ingen)</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3754"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3030"/> <source>P1 (medium)</source> <extracomment>Suunto safety level</extracomment> <translation>P1 (medium)</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3759"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3031"/> <source>P2 (high)</source> <extracomment>Suunto safety level</extracomment> <translation>P2 (høy)</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3767"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3033"/> <source>Sample rate</source> <translation>Samplingsfrekvens</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3780"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3035"/> <source>20s</source> <translation>20s</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3785"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3036"/> <source>30s</source> <translation>30s</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3790"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3037"/> <source>60s</source> <translation>60s</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3798"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3039"/> <source>Total dive time</source> <translation>Total dykketid</translation> </message> @@ -1539,31 +1928,41 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3042"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3822"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3914"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2604"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2770"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2929"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3041"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3053"/> <source>min</source> <translation>min</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3836"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3042"/> <source>24h</source> <translation>24t</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3841"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3043"/> <source>12h</source> <translation>12t</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3849"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3045"/> <source>Time format</source> <translation>Tidsformat</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3864"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3047"/> <source>Imperial</source> <translation>Britiske mål</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3869"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3048"/> <source>Metric</source> <translation>Metrisk</translation> </message> @@ -1572,91 +1971,112 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1612"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2819"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3880"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2585"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2744"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2907"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3050"/> <source>s</source> <translation>s</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3887"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3051"/> <source>Light</source> <translation>Lys</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3904"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3052"/> <source>Depth alarm</source> <translation>Dybdealarm</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3924"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3054"/> <source>Time alarm</source> <translation>Tidsalarm</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="399"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2575"/> <source>MM/DD/YY</source> <translation>MM/DD/ÅÅ</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="404"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2576"/> <source>DD/MM/YY</source> <translation>DD/MM/ÅÅ</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="409"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2577"/> <source>YY/MM/DD</source> <translation>ÅÅ/MM/DD</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="424"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2580"/> <source>Salinity</source> <translation>Saltholdighet</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="434"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2581"/> <source>kg/ℓ</source> <translation>kg/ℓ</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="666"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2598"/> <source>ZH-L16 CC</source> <translation>ZH-L16 CC</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="676"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2600"/> <source>L16-GF OC</source> <translation>L16-GF OC</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="681"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2601"/> <source>L16-GF CC</source> <translation>L16-GF CC</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="686"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2602"/> <source>PSCR-GF</source> <translation>PSCR-GF</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2881"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2912"/> <source>Travel gas consumption</source> <translation>Forbruk av reisegass</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2904"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2914"/> <source>Button sensitivity</source> <translation>Knappesensitivitet</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3034"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2927"/> <source>VPM</source> <translation>VPM</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3174"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2940"/> <source>VPM conservatism</source> <translation>VPM-konservatisme</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3181"/> + <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2941"/> <source>+</source> <translation>+</translation> </message> @@ -1770,6 +2190,14 @@ </message> </context> <context> + <name>CreateTrip</name> + <message> + <location filename="../desktop-widgets/command_divelist.cpp" line="707"/> + <source>create trip</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>CylindersModel</name> <message> <location filename="../qt-models/cylindermodel.cpp" line="16"/> @@ -1867,61 +2295,73 @@ <name>DiveComponentSelectionDialog</name> <message> <location filename="../desktop-widgets/divecomponentselection.ui" line="23"/> + <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="139"/> <source>Component selection</source> <translation>Valg av komponent</translation> </message> <message> <location filename="../desktop-widgets/divecomponentselection.ui" line="52"/> + <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="140"/> <source>Which components would you like to copy</source> <translation>Hvilke komponenter vil du kopiere</translation> </message> <message> <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/> + <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="141"/> <source>Dive site</source> <translation>Dykkested</translation> </message> <message> <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/> + <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="142"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/> + <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="143"/> <source>Visibility</source> <translation>Sikt</translation> </message> <message> <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/> + <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="144"/> <source>Notes</source> <translation>Notater</translation> </message> <message> <location filename="../desktop-widgets/divecomponentselection.ui" line="101"/> + <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="145"/> <source>Tags</source> <translation>Emner</translation> </message> <message> <location filename="../desktop-widgets/divecomponentselection.ui" line="108"/> + <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="146"/> <source>Weights</source> <translation>Vekter</translation> </message> <message> <location filename="../desktop-widgets/divecomponentselection.ui" line="115"/> + <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="147"/> <source>Cylinders</source> <translation>Flasker</translation> </message> <message> <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/> + <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="148"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> <message> <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/> + <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="149"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/> + <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="150"/> <source>Rating</source> <translation>Vurdering</translation> </message> @@ -1930,6 +2370,7 @@ <name>DiveComputerManagementDialog</name> <message> <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/> + <location filename="../subsurface/desktop-widgets/ui_divecomputermanagementdialog.h" line="65"/> <source>Edit dive computer nicknames</source> <translation>Rediger computerens navn</translation> </message> @@ -1990,140 +2431,150 @@ <source>Show on map</source> <translation>Vis på kart</translation> </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="192"/> + <source>Save edits</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="192"/> + <source>Edit dive</source> + <translation>Rediger dykk</translation> + </message> </context> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="158"/> <source>Dive %1</source> <translation>Dykk %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="162"/> <source>Date:</source> <translation>Dato:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="174"/> <source>Location:</source> <translation>Sted:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/> <source>Coordinates:</source> <translation>Koordinater:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="211"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/> <source>Use current GPS location:</source> <translation>Bruk nåværende GPS-posisjon:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/> <source>Depth:</source> <translation>Dybde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="244"/> <source>Duration:</source> <translation>Lengde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="258"/> <source>Air Temp:</source> <translation>Lufttemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="272"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="271"/> <source>Water Temp:</source> <translation>Vanntemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="284"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="306"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="325"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="346"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> <source>Weight:</source> <translation>Vekt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="361"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="360"/> <source>Cylinder1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="375"/> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="435"/> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="501"/> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="567"/> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="633"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="434"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="500"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="566"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="632"/> <source>Gas mix:</source> <translation>Gassmiks:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="390"/> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="452"/> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="518"/> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="584"/> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="650"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="389"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="451"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="517"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="583"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="649"/> <source>Start Pressure:</source> <translation>Starttrykk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="404"/> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="468"/> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="534"/> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="600"/> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="666"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="403"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="467"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="533"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="599"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="665"/> <source>End Pressure:</source> <translation>Sluttrykk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="419"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="418"/> <source>Cylinder2:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="483"/> <source>Cylinder3:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="550"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="549"/> <source>Cylinder4:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="616"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="615"/> <source>Cylinder5:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="681"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="680"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="694"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="693"/> <source>Visibility:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="708"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="707"/> <source>Notes:</source> <translation>Notater:</translation> </message> @@ -2268,23 +2719,42 @@ GPS-posisjon:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="355"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="361"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="340"/> <source>Dive list</source> <translation>Liste over dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="350"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="346"/> <source>Cloud credentials</source> <translation>Påloggingsinformasjon i skyen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="357"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="363"/> + <source>Please wait, filtering dive list</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveList.qml" line="478"/> + <source>Download dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveList.qml" line="488"/> + <source>Add dive</source> + <translation>Nytt dykk</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveList.qml" line="498"/> + <source>Filter dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveList.qml" line="342"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Trykk '+'-knappen for å legge til et dykk (eller last ned dykk fra en dykkecomputer)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="382"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="363"/> <source>No dives in dive list</source> <translation>Ingen dykk i lista</translation> </message> @@ -2292,117 +2762,117 @@ GPS-posisjon:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="848"/> + <location filename="../desktop-widgets/divelistview.cpp" line="885"/> <source>Expand all</source> <translation>Fold ut turer</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="850"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Collapse all</source> <translation>Fold sammen turer</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="854"/> + <location filename="../desktop-widgets/divelistview.cpp" line="891"/> <source>Collapse others</source> <translation>Slå sammen andre</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Remove dive(s) from trip</source> <translation>Fjern dykk fra tur</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="859"/> + <location filename="../desktop-widgets/divelistview.cpp" line="896"/> <source>Create new trip above</source> <translation>Lag ny tur</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="873"/> + <location filename="../desktop-widgets/divelistview.cpp" line="910"/> <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="875"/> + <location filename="../desktop-widgets/divelistview.cpp" line="912"/> <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="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="916"/> <source>Merge trip with trip above</source> <translation>Slå samme tur med turen over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="917"/> <source>Merge trip with trip below</source> <translation>Slå sammen tur med turen under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="884"/> + <location filename="../desktop-widgets/divelistview.cpp" line="921"/> <source>Delete dive(s)</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="923"/> <source>Mark dive(s) invalid</source> <translation>Marker dykk som ugyldige</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="890"/> + <location filename="../desktop-widgets/divelistview.cpp" line="927"/> <source>Merge selected dives</source> <translation>Slå sammen valgte dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="929"/> <source>Renumber dive(s)</source> <translation>Renummerer dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Shift dive times</source> <translation>Flytt på dykketider</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="931"/> <source>Split selected dives</source> <translation>Del opp valgte dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="932"/> <source>Load media from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="896"/> + <location filename="../desktop-widgets/divelistview.cpp" line="933"/> <source>Load media from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <location filename="../desktop-widgets/divelistview.cpp" line="959"/> <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="925"/> + <location filename="../desktop-widgets/divelistview.cpp" line="962"/> <source>Media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="926"/> + <location filename="../desktop-widgets/divelistview.cpp" line="963"/> <source>Image files</source> <translation>Bildefiler</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="927"/> + <location filename="../desktop-widgets/divelistview.cpp" line="964"/> <source>Video files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <location filename="../desktop-widgets/divelistview.cpp" line="965"/> <source>All files</source> <translation>Alle filer</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="984"/> + <location filename="../desktop-widgets/divelistview.cpp" line="1021"/> <source>%1 does not appear to be an image</source> <translation>%1 er ikke et bilde</translation> </message> @@ -2410,12 +2880,12 @@ GPS-posisjon:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="389"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="390"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Lag et nytt dykkested, og kopier relevant informasjon fra dette dykket</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="390"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site with this name</source> <translation>Opprett dykkested med dette navnet</translation> </message> @@ -2424,198 +2894,238 @@ GPS-posisjon:</translation> <name>DiveLogExportDialog</name> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="372"/> <source>Export dive log files</source> <translation>Eksporter loggfiler</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="392"/> <source>General export</source> <translation>Generell eksport</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="374"/> <source>Export format</source> <translation>Eksportformat</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="375"/> <source>Subsurface &XML</source> <translation>Subsurface &XML</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="376"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="377"/> <source>di&velogs.de</source> <translation>di&velogs.de</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="157"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="378"/> <source>DiveShare</source> <translation>DiveShare</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="167"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="379"/> <source>CSV dive profile</source> <translation>Dykkeprofil som CSV</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="177"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="380"/> <source>CSV dive details</source> <translation>Dykkedetaljer som CSV</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="381"/> <source>Worldmap</source> <translation>Verdenskart</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="382"/> <source>TeX</source> <translation>TeX</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="383"/> <source>I&mage depths</source> <translation>Bi&ldedypder</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="384"/> <source>Selection</source> <translation>Valg</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/> <location filename="../desktop-widgets/divelogexportdialog.ui" line="372"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="385"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="395"/> <source>Selected dives</source> <translation>Valgte dykk</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="386"/> <source>All dives</source> <translation>Alle dyk</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="387"/> <source>Options</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="301"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="388"/> <source>Metric</source> <translation>Metrisk</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="389"/> <source>Imperial</source> <translation>Britiske mål</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="320"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="391"/> <source>Anonymize</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="332"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="415"/> <source>HTML</source> <translation>HTML</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="350"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="393"/> <source>General settings</source> <translation>Generelle innstillinger</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="394"/> <source>Subsurface numbers</source> <translation>Subsurface-tall</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="396"/> <source>Export yearly statistics</source> <translation>Eksporter årsstatistikk</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="401"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="397"/> <source>All di&ves</source> <translation>Alle dykk</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="411"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="398"/> <source>Export list only</source> <translation>Bare eksporter liste</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="399"/> <source>Export photos</source> <translation>Eksporter bilder</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="434"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="400"/> <source>Style options</source> <translation>Stilvalg</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="401"/> <source>Font</source> <translation>Skrifttype</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="402"/> <source>Font size</source> <translation>Skriftstørrelse</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="470"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="403"/> <source>8</source> <translation>8</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="475"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="404"/> <source>10</source> <translation>10</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="480"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="405"/> <source>12</source> <translation>12</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="485"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="406"/> <source>14</source> <translation>14</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="490"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="407"/> <source>16</source> <translation>16</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="495"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="408"/> <source>18</source> <translation>18</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="500"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="409"/> <source>20</source> <translation>20</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="411"/> <source>Theme</source> <translation>Tema</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="519"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="412"/> <source>Light</source> <translation>Lys</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="524"/> + <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="413"/> <source>Sand</source> <translation>Sand</translation> </message> @@ -2743,284 +3253,294 @@ GPS-posisjon:</translation> <name>DiveLogImportDialog</name> <message> <location filename="../desktop-widgets/divelogimportdialog.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="157"/> <source>Import dive log file</source> <translation>Importer dykkelogg</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/> + <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="158"/> <source>dd.mm.yyyy</source> <translation>dd.mm.åååå</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.ui" line="94"/> + <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="159"/> <source>mm/dd/yyyy</source> <translation>mm/dd/åååå</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.ui" line="99"/> + <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="160"/> <source>yyyy-mm-dd</source> <translation>åååå-mm-dd</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/> + <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="162"/> <source>Seconds</source> <translation>Sekunder</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.ui" line="113"/> + <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="163"/> <source>Minutes</source> <translation>Minutter</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/> + <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="164"/> <source>Minutes:seconds</source> <translation>Minutter:sekunder</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/> + <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="166"/> <source>Metric</source> <translation>Metrisk</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/> + <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="167"/> <source>Imperial</source> <translation>Britiske mål</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/> + <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="169"/> <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="352"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="525"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="371"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="577"/> <source>Tab</source> <translation>Tab</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="595"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/> <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="633"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="809"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/> <source>Sample time</source> <translation>Datapunkt: tid</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="687"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="811"/> <source>Sample depth</source> <translation>Datapunkt: dybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="689"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="813"/> <source>Sample temperature</source> <translation>Datapunkt: temperatur</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="639"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="691"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="815"/> <source>Sample pO₂</source> <translation>Datapunkt: pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="693"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="817"/> <source>Sample sensor1 pO₂</source> <translation>Sample sensor1 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="695"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="819"/> <source>Sample sensor2 pO₂</source> <translation>Sample sensor2 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="697"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="821"/> <source>Sample sensor3 pO₂</source> <translation>Sample sensor3 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="699"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="823"/> <source>Sample CNS</source> <translation>Datapunkt: CNS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="701"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="825"/> <source>Sample NDL</source> <translation>Datapunkt: NDL</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="703"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="827"/> <source>Sample TTS</source> <translation>Datapunkt: TTS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="705"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="829"/> <source>Sample stopdepth</source> <translation>Datapunkt: stoppdybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="707"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="831"/> <source>Sample pressure</source> <translation>Datapunkt: trykk</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="709"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="833"/> <source>Sample setpoint</source> <translation>Sample settpunkt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="713"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="807"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/> <source>Dive #</source> <translation>Dykk #</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="714"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="801"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="715"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="805"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="880"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="716"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="886"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="717"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/> <source>Max. depth</source> <translation>Maksdybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="718"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/> <source>Avg. depth</source> <translation>Snittdybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="920"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="719"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="981"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="922"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="720"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="983"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="910"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="721"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/> <source>Cyl. size</source> <translation>Tankstr.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="912"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="722"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/> <source>Start pressure</source> <translation>Starttrykk</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="914"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/> <source>End pressure</source> <translation>Sluttrykk</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="916"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="724"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/> <source>O₂</source> <translation>O₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="918"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="725"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="979"/> <source>He</source> <translation>He</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="882"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="726"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="884"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="728"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="730"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="926"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="837"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="987"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="924"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="732"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="835"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="985"/> <source>Visibility</source> <translation>Sikt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="957"/> <source>Notes</source> <translation>Notater</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="734"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="959"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="961"/> <source>Tags</source> <translation>Emner</translation> </message> @@ -3028,7 +3548,7 @@ GPS-posisjon:</translation> <context> <name>DiveObjectHelper</name> <message numerus="yes"> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="339"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="344"/> <source>(%n dive(s))</source> <translation><numerusform>(%n dykk)</numerusform><numerusform>(%n dykk)</numerusform></translation> </message> @@ -3037,56 +3557,67 @@ GPS-posisjon:</translation> <name>DivePlanner</name> <message> <location filename="../desktop-widgets/diveplanner.ui" line="74"/> + <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="201"/> <source>Planned dive time</source> <translation>Planlagt dykketid</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="117"/> + <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="202"/> <source>Altitude</source> <translation>Høyde over havet</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="124"/> + <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="203"/> <source>ATM pressure</source> <translation>ATM-trykk</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="166"/> + <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="206"/> <source>mbar</source> <translation>mbar</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="144"/> + <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="205"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="131"/> + <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="204"/> <source>Water type</source> <translation>Vanntype</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="180"/> + <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="207"/> <source>Fresh water</source> <translation>Ferskvann</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="185"/> + <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="208"/> <source>Sea water</source> <translation>Saltvann</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="190"/> + <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="209"/> <source>EN13319</source> <translation>EN13319</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="195"/> + <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="210"/> <source>Custom</source> <translation>Tilpasset</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="221"/> + <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="215"/> <source>kg/ℓ</source> <translation>kg/ℓ</translation> </message> @@ -3094,62 +3625,62 @@ GPS-posisjon:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="170"/> + <location filename="../qt-models/diveplannermodel.cpp" line="171"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="271"/> + <location filename="../qt-models/diveplannermodel.cpp" line="272"/> <source>cyl.</source> <translation>syl.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="378"/> <source>Final depth</source> <translation>Siste dybde</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="380"/> <source>Run time</source> <translation>Løpetid</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="381"/> + <location filename="../qt-models/diveplannermodel.cpp" line="382"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="383"/> + <location filename="../qt-models/diveplannermodel.cpp" line="384"/> <source>Used gas</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="385"/> + <location filename="../qt-models/diveplannermodel.cpp" line="386"/> <source>CC setpoint</source> <translation>CC settpunkt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="387"/> + <location filename="../qt-models/diveplannermodel.cpp" line="388"/> <source>Dive mode</source> <translation>Dykkemodus</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1020"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1026"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1028"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1029"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1075"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1076"/> <source>Stop times</source> <translation>Stopptider</translation> </message> @@ -3299,46 +3830,55 @@ GPS-posisjon:</translation> <name>DiveShareExportDialog</name> <message> <location filename="../desktop-widgets/diveshareexportdialog.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="178"/> <source>Dialog</source> <translation>Dialogboks</translation> </message> <message> <location filename="../desktop-widgets/diveshareexportdialog.ui" line="61"/> + <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="179"/> <source>User ID</source> <translation>Bruker-ID</translation> </message> <message> <location filename="../desktop-widgets/diveshareexportdialog.ui" line="75"/> + <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="183"/> <source>⌫</source> <translation>⌫</translation> </message> <message> <location filename="../desktop-widgets/diveshareexportdialog.ui" line="82"/> + <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="184"/> <source>Get user ID</source> <translation>Hent bruker-ID</translation> </message> <message> <location filename="../desktop-widgets/diveshareexportdialog.ui" line="91"/> + <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="185"/> <source><html><head/><body><p><span style=" font-size:20pt; font-weight:600; color:#ff8000;">⚠</span> Not using a UserID means that you will need to manually keep bookmarks to your dives, to find them again.</p></body></html></source> <translation><html><head/><body><p><span style=" font-size:20pt; font-weight:600; color:#ff8000;">⚠</span> Å ikke bruke en bruker-ID medfører at du må bokmerke dykkene dine manuelt for å finne dem igjen.</p></body></html></translation> </message> <message> <location filename="../desktop-widgets/diveshareexportdialog.ui" line="104"/> + <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="187"/> <source>Private dives will not appear in "related dives" lists, and will only be accessible if their URL is known.</source> <translation>Private dykk blir ikke synlig i lista over "relaterte dykk", og vil bare være tilgjengelig hvis man kjenner URL-en.</translation> </message> <message> <location filename="../desktop-widgets/diveshareexportdialog.ui" line="107"/> + <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="189"/> <source>Keep dives private</source> <translation>La dykkene være private</translation> </message> <message> <location filename="../desktop-widgets/diveshareexportdialog.ui" line="129"/> + <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="190"/> <source>Upload dive data</source> <translation>Last opp dykkdata</translation> </message> <message> <location filename="../desktop-widgets/diveshareexportdialog.ui" line="174"/> + <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="191"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -3354,154 +3894,186 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="488"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="210"/> + <location filename="../qt-models/divetripmodel.cpp" line="356"/> + <location filename="../qt-models/divetripmodel.cpp" line="396"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="491"/> - <location filename="../qt-models/divetripmodel.cpp" line="549"/> + <location filename="../qt-models/divetripmodel.cpp" line="212"/> + <location filename="../qt-models/divetripmodel.cpp" line="358"/> + <location filename="../qt-models/divetripmodel.cpp" line="398"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="494"/> - <location filename="../qt-models/divetripmodel.cpp" line="552"/> + <location filename="../qt-models/divetripmodel.cpp" line="214"/> + <location filename="../qt-models/divetripmodel.cpp" line="360"/> + <location filename="../qt-models/divetripmodel.cpp" line="400"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="497"/> + <location filename="../qt-models/divetripmodel.cpp" line="362"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="500"/> - <location filename="../qt-models/divetripmodel.cpp" line="558"/> + <location filename="../qt-models/divetripmodel.cpp" line="218"/> + <location filename="../qt-models/divetripmodel.cpp" line="364"/> + <location filename="../qt-models/divetripmodel.cpp" line="404"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> + <location filename="../qt-models/divetripmodel.cpp" line="368"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> - <location filename="../qt-models/divetripmodel.cpp" line="567"/> + <location filename="../qt-models/divetripmodel.cpp" line="224"/> + <location filename="../qt-models/divetripmodel.cpp" line="370"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> - <location filename="../qt-models/divetripmodel.cpp" line="570"/> + <location filename="../qt-models/divetripmodel.cpp" line="226"/> + <location filename="../qt-models/divetripmodel.cpp" line="372"/> + <location filename="../qt-models/divetripmodel.cpp" line="412"/> <source>Cylinder</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> - <location filename="../qt-models/divetripmodel.cpp" line="573"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="374"/> + <location filename="../qt-models/divetripmodel.cpp" line="414"/> <source>Gas</source> <translation>Gass</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> + <location filename="../qt-models/divetripmodel.cpp" line="376"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> - <location filename="../qt-models/divetripmodel.cpp" line="581"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="378"/> + <location filename="../qt-models/divetripmodel.cpp" line="420"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> - <location filename="../qt-models/divetripmodel.cpp" line="584"/> + <location filename="../qt-models/divetripmodel.cpp" line="380"/> + <location filename="../qt-models/divetripmodel.cpp" line="422"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> - <location filename="../qt-models/divetripmodel.cpp" line="587"/> + <location filename="../qt-models/divetripmodel.cpp" line="238"/> + <location filename="../qt-models/divetripmodel.cpp" line="382"/> + <location filename="../qt-models/divetripmodel.cpp" line="424"/> <source>Tags</source> <translation>Emner</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <location filename="../qt-models/divetripmodel.cpp" line="384"/> <source>Media</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="533"/> + <location filename="../qt-models/divetripmodel.cpp" line="242"/> + <location filename="../qt-models/divetripmodel.cpp" line="386"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="536"/> - <location filename="../qt-models/divetripmodel.cpp" line="593"/> + <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="388"/> + <location filename="../qt-models/divetripmodel.cpp" line="428"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="539"/> - <location filename="../qt-models/divetripmodel.cpp" line="596"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="390"/> + <location filename="../qt-models/divetripmodel.cpp" line="430"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="216"/> + <location filename="../qt-models/divetripmodel.cpp" line="402"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="69"/> + <source>(%1 shown)</source> + <translation>(%1 vist)</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="216"/> + <location filename="../qt-models/divetripmodel.cpp" line="402"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="555"/> + <location filename="../qt-models/divetripmodel.cpp" line="216"/> + <location filename="../qt-models/divetripmodel.cpp" line="402"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="561"/> + <location filename="../qt-models/divetripmodel.cpp" line="220"/> + <location filename="../qt-models/divetripmodel.cpp" line="406"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="564"/> + <location filename="../qt-models/divetripmodel.cpp" line="222"/> + <location filename="../qt-models/divetripmodel.cpp" line="408"/> <source>Weight(%1)</source> <translation>Vekt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="564"/> + <location filename="../qt-models/divetripmodel.cpp" line="222"/> + <location filename="../qt-models/divetripmodel.cpp" line="408"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="564"/> + <location filename="../qt-models/divetripmodel.cpp" line="222"/> + <location filename="../qt-models/divetripmodel.cpp" line="408"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> + <location filename="../qt-models/divetripmodel.cpp" line="232"/> + <location filename="../qt-models/divetripmodel.cpp" line="418"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="578"/> + <location filename="../qt-models/divetripmodel.cpp" line="232"/> + <location filename="../qt-models/divetripmodel.cpp" line="418"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="590"/> + <location filename="../qt-models/divetripmodel.cpp" line="236"/> + <source>Max. CNS</source> + <translation>Maks CNS</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="426"/> <source>Media before/during/after dive</source> <translation type="unfinished"/> </message> @@ -3524,97 +4096,97 @@ p, li { white-space: pre-wrap; } <translation>klarte ikke å lage zipfil for opplasting: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="238"/> <source>internal error</source> <translation>intern feil</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="246"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Konvertering av dykk %1 til divelogs.de-format feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="274"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>kunne ikke skrive zip-fil: %s zip-feil %d system-feil %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="713"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="519"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="710"/> <source>Done</source> <translation>Ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="556"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="553"/> <source>Uploading dive list...</source> <translation>Laster opp liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="588"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="585"/> <source>Downloading dive list...</source> <translation>Laster ned liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="629"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="626"/> <source>Downloading %1 dives...</source> <translation>Laster ned %1 dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="663"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="660"/> <source>Download finished - %1</source> <translation>Nedlasting er ferdig - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="674"/> <source>Problem with download</source> <translation>Kunne ikke laste ned</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="678"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="675"/> <source>The archive could not be opened: </source> <translation>Arkivet kunne ikke åpnes: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> <source>Corrupted download</source> <translation>Nedlastingen er skadet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="688"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="685"/> <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="714"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="711"/> <source>Upload finished</source> <translation>Opplasting er ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="724"/> <source>Upload failed</source> <translation>Opplasting feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="727"/> <source>Upload successful</source> <translation>Ferdig å laste opp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="730"/> <source>Login failed</source> <translation>Innlogging feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/> <source>Cannot parse response</source> <translation>Kan ikke lese svar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="747"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="744"/> <source>Error: %1</source> <translation>Feil: %1</translation> </message> @@ -3622,73 +4194,73 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="92"/> <source>Download</source> <translation>Last ned</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="96"/> <source>Choose Bluetooth download mode</source> <translation>Velg nedlastingsmåte for Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="184"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="187"/> <source>Connecting to dive computer</source> <translation>Kobler til dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="282"/> <source>Error</source> <translation>Feil</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="331"/> <source>Find Uemis dive computer</source> <translation>Finn Uemis dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="253"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="331"/> <source>Find Garmin dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="358"/> <source>Cancel download</source> <translation>Avbryt nedlasting</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="362"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="438"/> <source>Choose file for dive computer download logfile</source> <translation>Velg loggfil for nedlasting fra dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="363"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="439"/> <source>Log files</source> <translation>Loggfiler</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="388"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="464"/> <source>Choose file for dive computer binary dump file</source> <translation>Velg binær dumpfil for nedlasting fra dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="389"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="465"/> <source>Dump files</source> <translation>Dump-filer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="493"/> <source>Retry download</source> <translation>Prøv nedlasting på nytt</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="452"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="453"/> <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> @@ -3697,98 +4269,120 @@ p, li { white-space: pre-wrap; } <name>DownloadFromDiveComputer</name> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="317"/> <source>Download from dive computer</source> <translation>Last ned fra dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="52"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="121"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="329"/> <source>Device or mount point</source> <translation>Enhet eller disk</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"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="132"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="100"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="107"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="114"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="128"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="326"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="327"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="328"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="330"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="73"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="52"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="318"/> <source>Force download of all dives</source> <translation>Tvungen nedlasting av alle dykk</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="80"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="69"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="320"/> <source>Always prefer downloaded dives</source> <translation>Foretrekk alltid nedlastede dykk</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="142"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="332"/> <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="../desktop-widgets/downloadfromdivecomputer.ui" line="76"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="321"/> <source>Save libdivecomputer logfile</source> <translation>Lagre loggfil fra libdivecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="333"/> <source>Save libdivecomputer dumpfile</source> <translation>Lagre dumpfil fra libdivecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="90"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="322"/> <source>Choose Bluetooth download mode</source> <translation>Velg nedlastingsmåte for Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="97"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="324"/> <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="../desktop-widgets/downloadfromdivecomputer.ui" line="135"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="331"/> <source>Vendor</source> <translation>Leverandør</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="59"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="319"/> <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="187"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="206"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="211"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="275"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="296"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="360"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="334"/> <source>Download</source> <translation>Last ned</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="233"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="265"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="336"/> <source>Downloaded dives</source> <translation>Nedlastede dykk</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="243"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="275"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="337"/> <source>Select all</source> <translation>Velg alle</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="250"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="282"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="338"/> <source>Unselect all</source> <translation>Velg vekk alle</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="323"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="339"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="330"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="291"/> + <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="340"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -3803,68 +4397,81 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth er ikke skrudd på</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="58"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/> <source> Vendor name: </source> <translation>Leverandør:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> <source>USB device</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/> <source> Dive Computer:</source> <translation>Dykkecomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="130"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/> <source> Connection:</source> <translation>Forbindelse:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="207"/> + <source> Previously used dive computers: </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="279"/> <source>Retry</source> <translation>Prøv igjen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="201"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="291"/> <source>Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="305"/> <source>Rescan</source> <translation>Skann på nytt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="223"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="314"/> <source> Downloaded dives</source> <translation>Nedlastede dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="315"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="351"/> <source>Accept</source> <translation>OK</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="371"/> <source>Select All</source> <translation>Velg alle</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="380"/> <source>Unselect All</source> <translation>Velg ingen</translation> </message> </context> <context> + <name>DownloadThread</name> + <message> + <location filename="../core/downloadfromdcthread.cpp" line="99"/> + <source>No new dives downloaded from dive computer</source> + <translation>Ingen dykk lastet ned fra dykkecomputer</translation> + </message> +</context> +<context> <name>ExtraDataModel</name> <message> <location filename="../qt-models/divecomputerextradatamodel.cpp" line="11"/> @@ -3934,17 +4541,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="517"/> <source>Select All</source> <translation>Velg alle</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="518"/> <source>Unselect All</source> <translation>Velg ingen</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="519"/> <source>Invert Selection</source> <translation>Inverter valg</translation> </message> @@ -3953,26 +4560,31 @@ p, li { white-space: pre-wrap; } <name>FilterWidget</name> <message> <location filename="../desktop-widgets/listfilter.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="82"/> <source>Form</source> <translation>Skjema</translation> </message> <message> <location filename="../desktop-widgets/listfilter.ui" line="40"/> + <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="83"/> <source>Text label</source> <translation>Tekstetikett</translation> </message> <message> <location filename="../desktop-widgets/listfilter.ui" line="50"/> + <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="84"/> <source>Filter this list</source> <translation>Filtrer denne lista</translation> </message> <message> <location filename="../desktop-widgets/listfilter.ui" line="57"/> + <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="86"/> <source>Negate filter</source> <translation>Negativt filter</translation> </message> <message> <location filename="../desktop-widgets/listfilter.ui" line="60"/> + <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="88"/> <source>¬</source> <translation>¬</translation> </message> @@ -3981,16 +4593,19 @@ p, li { white-space: pre-wrap; } <name>FilterWidget2</name> <message> <location filename="../desktop-widgets/filterwidget.ui" line="73"/> + <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="118"/> <source>Reset filters</source> <translation>Nullstill filtere</translation> </message> <message> <location filename="../desktop-widgets/filterwidget.ui" line="87"/> + <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="121"/> <source>Show/hide filters</source> <translation>Vis/skjul filtere</translation> </message> <message> <location filename="../desktop-widgets/filterwidget.ui" line="101"/> + <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="124"/> <source>Close and reset filters</source> <translation>Lukk og nullstill filtere</translation> </message> @@ -3999,27 +4614,32 @@ p, li { white-space: pre-wrap; } <name>FindMovedImagesDialog</name> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/> + <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="154"/> <source>Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/> + <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="155"/> <source>Found media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/> + <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="157"/> <source>Match only media files in selected dive(s)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/> + <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="159"/> <source>Scanning:</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/> <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/> + <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="161"/> <source>Select folder and scan</source> <translation type="unfinished"/> </message> @@ -4057,12 +4677,12 @@ p, li { white-space: pre-wrap; } <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2225"/> <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="2238"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2230"/> <source>Firmware update failed!</source> <translation>Kunne ikke oppdatere firmware!</translation> </message> @@ -4099,22 +4719,22 @@ p, li { white-space: pre-wrap; } <translation>GPS-posisjoner</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="28"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="30"/> <source>Date: </source> <translation>Dato:</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/> + <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="52"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="54"/> <source>Latitude: </source> <translation>Latitude: </translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="63"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="65"/> <source>Longitude: </source> <translation>Longitude: </translation> </message> @@ -4122,7 +4742,7 @@ p, li { white-space: pre-wrap; } <context> <name>GpsLocation</name> <message> - <location filename="../core/gpslocation.cpp" line="139"/> + <location filename="../core/gpslocation.cpp" line="131"/> <source>Unknown GPS location (no GPS source)</source> <translation>Ukjent GPS-lokasjon (ingen GPS-kilde)</translation> </message> @@ -4143,7 +4763,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="555"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="548"/> <source>Location</source> <translation>Sted</translation> </message> @@ -4151,32 +4771,32 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="490"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="491"/> <source> (same GPS fix)</source> <translation>(samme GPS-lokasjon)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source> (~%1 away</source> <translation> (~%1 borte</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="497"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n dykk her)</numerusform><numerusform>, %n dykk her)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(ingen eksisterende GPS-data, legg til GPS-data fra dette dykket)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> <source>(no GPS data)</source> <translation>(ingen GPS-data)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="506"/> <source>Pick site: </source> <translation>Velg sted:</translation> </message> @@ -4184,7 +4804,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="420"/> + <location filename="../qt-models/filtermodels.cpp" line="547"/> <source>No location set</source> <translation>Ingen sted er satt</translation> </message> @@ -4193,69 +4813,72 @@ p, li { white-space: pre-wrap; } <name>LocationInformation</name> <message> <location filename="../desktop-widgets/locationInformation.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="189"/> <source>GroupBox</source> <translation>GruppeBoks</translation> </message> <message> <location filename="../desktop-widgets/locationInformation.ui" line="29"/> + <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="191"/> <source>Name</source> <translation>Navn</translation> </message> <message> <location filename="../desktop-widgets/locationInformation.ui" line="36"/> + <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="192"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> <location filename="../desktop-widgets/locationInformation.ui" line="43"/> + <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="193"/> <source>Notes</source> <translation>Notater</translation> </message> <message> <location filename="../desktop-widgets/locationInformation.ui" line="53"/> + <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="194"/> <source>Coordinates</source> <translation>Koordinater</translation> </message> <message> <location filename="../desktop-widgets/locationInformation.ui" line="73"/> + <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="196"/> <source>Reverse geo lookup</source> <translation>Geo-oppslag av dykkested</translation> </message> <message> <location filename="../desktop-widgets/locationInformation.ui" line="76"/> + <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="198"/> <source>...</source> <translation>...</translation> </message> <message> <location filename="../desktop-widgets/locationInformation.ui" line="97"/> + <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="199"/> <source>Dive sites on same coordinates</source> <translation>Dykkesteder med samme koordinater</translation> </message> <message> <location filename="../desktop-widgets/locationInformation.ui" line="138"/> + <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="200"/> <source>Tags</source> <translation>Emner</translation> </message> <message> <location filename="../desktop-widgets/locationInformation.ui" line="152"/> + <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="202"/> <source>Country</source> <translation>Land</translation> </message> <message> <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="204"/> <source>Update location on map</source> <translation>Oppdater posisjon på kart</translation> </message> </context> <context> - <name>LocationInformationModel</name> - <message> - <location filename="../qt-models/divelocationmodel.cpp" line="68"/> - <source>Create dive site with this name</source> - <translation>Opprett dykkested med dette navnet</translation> - </message> -</context> -<context> <name>LocationInformationWidget</name> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="26"/> @@ -4269,29 +4892,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="268"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="259"/> <source>Dive site management</source> <translation>Dykkestedsdatabase</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="56"/> <source>Merge into current site</source> <translation>Slå sammen med gjeldende dykkested</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="75"/> <source>Merging dive sites</source> <translation>Slå sammen steder</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="76"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>Du er i ferd med å slå sammen steder, og du kan ikke angre Er du sikker på at du vil fortsette?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="275"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="271"/> <source>You are editing a dive site</source> <translation>Du redigerer et dykkested</translation> </message> @@ -4308,203 +4931,218 @@ Er du sikker på at du vil fortsette?</translation> <name>MainTab</name> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> - <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="542"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="583"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="444"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="495"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="536"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="511"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="512"/> <source>Notes</source> <translation>Notater</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="491"/> <source>Form</source> <translation>Skjema</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="87"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="493"/> <source>Date</source> <translation>Dato</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="97"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="494"/> <source>Time</source> <translation>Tid</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="312"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="288"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="495"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="313"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="289"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="496"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="582"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="498"/> <source>Location</source> <translation>Sted</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="222"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="501"/> <source>Edit dive site</source> <translation>Rediger dykkested</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="225"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="503"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="260"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="257"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="504"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="270"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="267"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="505"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="316"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="313"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="506"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="329"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="326"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="507"/> <source>Visibility</source> <translation>Sikt</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="336"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="333"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="395"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="392"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="509"/> <source>Tags</source> <translation>Emner</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="405"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="402"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="510"/> <source>Dive mode</source> <translation>Dykkemodus</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="499"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="496"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="513"/> <source>Equipment</source> <translation>Utstyr</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="164"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="497"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="80"/> + <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="492"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="62"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="63"/> <source>Extra Info</source> <translation>Ekstra info</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="57"/> <source>Information</source> <translation>Informasjon</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="59"/> <source>Statistics</source> <translation>Statistikk</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/> <source>Media</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Apply changes</source> <translation>Bruk endringene</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="88"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="89"/> <source>Discard changes</source> <translation>Forkast endringene</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="104"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Cylinders</source> <translation>Flasker</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add cylinder</source> <translation>Legg til flaske</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="108"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="109"/> <source>Weights</source> <translation>Vekter</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="109"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Add weight system</source> <translation>Legg til vektsystem</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="285"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="310"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="286"/> <source>Water temp. [%1]</source> <translation>Vanntemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="329"/> <source>This trip is being edited.</source> <translation>Denne turen redigeres.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="360"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="336"/> <source>Multiple dives are being edited.</source> <translation>Flere dykk redigeres.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="362"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="338"/> <source>This dive is being edited.</source> <translation>Dette dykket redigeres.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="490"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="443"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> <source>Trip notes</source> <translation>Turnotater</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="525"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="478"/> <source>Trip location</source> <translation>Tursted</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="748"/> - <source>New dive site</source> - <translation>Nytt dykkested</translation> - </message> - <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1044"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="982"/> <source>Discard the changes?</source> <translation>Slette endringer?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1045"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="983"/> <source>You are about to discard your changes.</source> <translation>Du er i ferd med å droppe endringene dine.</translation> </message> @@ -4513,438 +5151,512 @@ Er du sikker på at du vil fortsette?</translation> <name>MainWindow</name> <message> <location filename="../desktop-widgets/mainwindow.ui" line="61"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="614"/> <source>&File</source> <translation>&Fil</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="82"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="615"/> <source>&Log</source> <translation>&Logg</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="98"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="616"/> <source>&View</source> <translation>&Vis</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="114"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="617"/> <source>&Help</source> <translation>&Hjelp</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="123"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="618"/> <source>&Import</source> <translation>&Importer</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="131"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="619"/> <source>&Edit</source> <translation>R&ediger</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="136"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="620"/> <source>Share on</source> <translation>Del på</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="150"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="529"/> <source>&New logbook</source> <translation>&Ny loggbok</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="153"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="531"/> <source>New</source> <translation>Ny</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="161"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="533"/> <source>&Open logbook</source> <translation>Åpne l&oggbok</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="164"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="567"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="535"/> <source>Open</source> <translation>Åpne</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="172"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="537"/> <source>&Save</source> <translation>Lagre</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="175"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="539"/> <source>Save</source> <translation>Lagre</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="183"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="541"/> <source>Sa&ve as</source> <translation>Lagre som</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="186"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="543"/> <source>Save as</source> <translation>Lagre som</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="194"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="545"/> <source>&Close</source> <translation>Lukk</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="197"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="547"/> <source>Close</source> <translation>Lukk</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="205"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="549"/> <source>&Print</source> <translation>Skriv ut</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="213"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="550"/> <source>P&references</source> <translation>Valg</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="224"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="551"/> <source>&Quit</source> <translation>Avslutt</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="235"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="552"/> <source>Import from &dive computer</source> <translation>Importer fra &dykkecomputer</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="243"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="553"/> <source>Edit device &names</source> <translation>Rediger device&navn</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="248"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="554"/> <source>&Add dive</source> <translation>Legg til dykk</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="256"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="555"/> <source>&Copy dive components</source> <translation>Kopier dykkekomponenter</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="264"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="556"/> <source>&Paste dive components</source> <translation>Lim inn dykkekomponenter</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="272"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="557"/> <source>&Renumber</source> <translation>Nummere&r på nytt</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="283"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="558"/> <source>Auto &group</source> <translation>Auto&grupper</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="288"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="559"/> <source>&Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="296"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="560"/> <source>&Dive list</source> <translation>&Dykkeliste</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="304"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="561"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="312"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="562"/> <source>&Info</source> <translation>&Info</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="320"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="563"/> <source>&All</source> <translation>&Alle</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="328"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="564"/> <source>P&revious DC</source> <translation>Fo&rrige computer</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="336"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="565"/> <source>&Next DC</source> <translation>&Neste computer</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="344"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="566"/> <source>&About Subsurface</source> <translation>Om Subsurf&ace</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="352"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="567"/> <source>User &manual</source> <translation>Bruker&manual</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="360"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="568"/> <source>&Map</source> <translation>Kart</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="368"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="569"/> <source>P&lan dive</source> <translation>P&lanlegg dykk</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="376"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="570"/> <source>&Import log files</source> <translation>&Importer loggfiler</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="379"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="572"/> <source>Import divelog files from other applications</source> <translation>Importer dykkelogg fra andre programmer</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="387"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="574"/> <source>Import &from divelogs.de</source> <translation>Importer &fra divelogs.de</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="395"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="575"/> <source>&Full screen</source> <translation>&Fullskjerm</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="398"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="577"/> <source>Toggle full screen</source> <translation>Fullskjerm av/på</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="406"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="579"/> <source>&Check for updates</source> <translation>Se etter oppdateringer</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="411"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="580"/> <source>&Export</source> <translation>&Eksport</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="414"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="582"/> <source>Export dive logs</source> <translation>Eksporter dykkelogger</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="422"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="584"/> <source>Configure &dive computer</source> <translation>Konfigurer &dykkecomputer</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="433"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="585"/> <source>Edit &dive in planner</source> <translation>Rediger &dykk i planlegger</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="445"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="586"/> <source>Toggle pO₂ graph</source> <translation>Skru av/på pO₂-graf</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="457"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="587"/> <source>Toggle pN₂ graph</source> <translation>Skru av/på pN₂-graf</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="469"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="588"/> <source>Toggle pHe graph</source> <translation>Skru pHe-graf av/på</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="481"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="589"/> <source>Toggle DC reported ceiling</source> <translation>Skru av/på dekograf fra computer</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="493"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="590"/> <source>Toggle calculated ceiling</source> <translation>Skru av/på dekograf</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="505"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="591"/> <source>Toggle calculating all tissues</source> <translation>Skru av/på utregning av vev</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="517"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="592"/> <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="529"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="593"/> <source>Toggle heart rate</source> <translation>Skru av/på hjertefrekvens</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="541"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="594"/> <source>Toggle MOD</source> <translation>Skru av/på MOD</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="553"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="595"/> <source>Toggle EAD, END, EADD</source> <translation>Skru av/på EAD, END, EADD</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="565"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="596"/> <source>Toggle NDL, TTS</source> <translation>Skru av/på NDL, TTS</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="577"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="597"/> <source>Toggle SAC rate</source> <translation>Skru av/på SAC</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="589"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="598"/> <source>Toggle ruler</source> <translation>Skru av/på linjal</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="601"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="599"/> <source>Scale graph</source> <translation>Skaler graf</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="613"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="600"/> <source>Toggle media</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="674"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="607"/> <source>&Find moved media files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="625"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="601"/> <source>Toggle gas bar</source> <translation>Skru gass-bar av/på</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="633"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="602"/> <source>&Filter divelist</source> <translation>&Filtrer dykkeliste</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="648"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="603"/> <source>Toggle tissue heat-map</source> <translation>Slå heap-map av/på</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="604"/> <source>User &survey</source> <translation>Brukerunder&søkelse</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="658"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="261"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="605"/> <source>&Undo</source> <translation>Angre</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="666"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="262"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="606"/> <source>&Redo</source> <translation>Gjør om</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="679"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="608"/> <source>Open c&loud storage</source> <translation>Åpne skylager</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="684"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="609"/> <source>Save to clo&ud storage</source> <translation>Lagre til skylager</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="689"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="610"/> <source>&Manage dive sites</source> <translation>Dykkestedsdatabase</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="694"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="611"/> <source>Dive Site &Edit</source> <translation>R&ediger dykkested</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="699"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="612"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="707"/> + <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="613"/> <source>Cloud storage online</source> <translation>Skylagring er på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="389"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="425"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="421"/> <source>Connect to</source> <translation>Koble til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="419"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="415"/> <source>Disconnect from</source> <translation>Koble fra</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="603"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="606"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1570"/> <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="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="567"/> <source>Open file</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="568"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1984"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1949"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="594"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="667"/> + <location filename="../desktop-widgets/divelistview.cpp" line="665"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> <location filename="../desktop-widgets/mainwindow.cpp" line="718"/> <location filename="../desktop-widgets/mainwindow.cpp" line="863"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="981"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1845"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="972"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1810"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="595"/> + <location filename="../desktop-widgets/divelistview.cpp" line="666"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Prøver å slå sammen dykk med %1min intervall mellom</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="282"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="278"/> <source>Template backup created</source> <translation>Sikkerhertskopi av templat opprettet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="279"/> <source>The following backup printing templates were created: %1 @@ -4967,19 +5679,19 @@ templatene være skrivebeskyttet og bør ikke redigeres direkte, siden programmet kan overskrive dem.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="667"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Lagre eller avbryt redigeringen av dykk før du går online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>Du har ulagrede endringer. Ønsker du å lagre dem til skyen? Hvis du svarer nei vil skylagring kun bli synkronisert neste gang du velger "Åpne skylagring" eller "Lagre til skyen"</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="695"/> <source>Failure taking cloud storage online</source> <translation>Kunne ikke skru på skylagring</translation> </message> @@ -4994,187 +5706,187 @@ Hvis du svarer nei vil skylagring kun bli synkronisert neste gang du velger &quo <translation>Lagre eller avbryt redigeringa før du legger til et nytt dykk.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="923"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="915"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="981"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="972"/> <source>Trying to replan a dive that'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="1845"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1810"/> <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="1097"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1084"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> <source>Dive log files</source> <translation>Dykkeloggfiler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1340"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1618"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <source>Subsurface files</source> <translation>Subsurface-filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1341"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1332"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1342"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1376"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1335"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1345"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1336"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1379"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1346"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1338"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1381"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1348"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1339"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1382"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1349"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1340"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1341"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1342"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>MkVI files</source> <translation>MkVI-filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1395"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1396"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1397"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1345"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1375"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> <source>All files</source> <translation>Alle filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> <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="1409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> <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="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1414"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="684"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1415"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> <source>Changes will be lost if you don't save them.</source> <translation>Endringer vil gå tapt hvis du ikke lagrer.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1617"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1598"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1686"/> <source>[local cache for] %1</source> <translation>[lokal cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> <source>[cloud storage for] %1</source> <translation>[skylager for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1798"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1754"/> <source>Opening datafile from older version</source> <translation>Åpner datafil fra eldre versjon</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1799"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1755"/> <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="1810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1779"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1984"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1949"/> <source>Contacting cloud service...</source> <translation>Kontakter skylager...</translation> </message> @@ -5229,9 +5941,17 @@ QML-modulene QtPositioning og QtLocation mangler muligens!</translation> </message> </context> <context> + <name>MergeDives</name> + <message> + <location filename="../desktop-widgets/command_divelist.cpp" line="804"/> + <source>merge dive</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="592"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter viser %1 (av %2) dykk</translation> </message> @@ -5381,137 +6101,167 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <name>PreferencesDefaults</name> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="329"/> <source>Form</source> <translation>Skjema</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="20"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="330"/> <source>Lists and tables</source> <translation>Lister og tabeller</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="29"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="331"/> <source>Font</source> <translation>Skrifttype</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="39"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="332"/> <source>Font size</source> <translation>Skriftstørrelse</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="52"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="333"/> <source>Dives</source> <translation>Dykk</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="67"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="334"/> <source>Default dive log file</source> <translation>Standard loggfil</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="335"/> <source>&No default file</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="336"/> <source>&Local default file</source> <translation>&Lokal forhåndsvalgt fil</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="90"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="337"/> <source>Clo&ud storage default file</source> <translation>Forhåndsvalgt fil for skylager</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="99"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="338"/> <source>Local dive log file</source> <translation>Lokal dykkelogg</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="111"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="339"/> <source>Use default</source> <translation>Bruk standard</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="340"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="349"/> <source>...</source> <translation>...</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="130"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="341"/> <source>Display invalid</source> <translation>Vis ugyldige</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="147"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="343"/> <source>Default cylinder</source> <translation>Standardflaske</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="162"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="344"/> <source>Use default cylinder</source> <translation>Bruk standardflaske</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="179"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="345"/> <source>Animations</source> <translation>Animasjoner</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="188"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="346"/> <source>Speed</source> <translation>Hastighet</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="347"/> <source>Video thumbnails</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="348"/> <source>ffmpeg executable</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="350"/> <source>Extract at position</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="351"/> <source>Extract video thumbnails</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/> - <source>Clear all settings</source> - <translation>Slett alle valg</translation> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="353"/> + <source>Clear settings</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="294"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="354"/> + <source>Reset remembered dive computers</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="300"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="301"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="355"/> <source>Reset all settings to their default value</source> <translation>Tilbakestill valg til standardverdier</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="12"/> <source>General</source> <translation>Generelt</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/> <source>Open default log file</source> <translation>Åpne standardloggfil</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="24"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/> <source>Subsurface files</source> <translation>Subsurface-filer</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="50"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="51"/> <source>Select ffmpeg executable</source> <translation type="unfinished"/> </message> @@ -5520,17 +6270,21 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <name>PreferencesGeoreference</name> <message> <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_georeference.h" line="105"/> <source>Form</source> <translation>Skjema</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="20"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_georeference.h" line="106"/> <source>Dive site layout</source> <translation>Dykkested-layout</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="42"/> <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="59"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_georeference.h" line="107"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_georeference.h" line="108"/> <source>/</source> <translation>/</translation> </message> @@ -5544,66 +6298,79 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <name>PreferencesGraph</name> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="337"/> <source>Form</source> <translation>Skjema</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="338"/> <source>Gas pressure display setup</source> <translation>Valg for vising av gasstrykk</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="131"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="348"/> <source>CCR options:</source> <translation>CCR-valg:</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="239"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="361"/> <source>Ceiling display setup</source> <translation>Valg for visning av deko-tak</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="368"/> <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="268"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="364"/> <source>Algorithm for calculated ceiling:</source> <translation>Algoritme for utregnet deko-tak</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="298"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="367"/> <source>+</source> <translation>+</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="245"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="362"/> <source>GFHigh</source> <translation>GF høy</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="341"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="371"/> <source>GFLow</source> <translation>GF lav</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="175"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="353"/> <source>pSCR options:</source> <translation>pSCR-valg:</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="202"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="356"/> <source>Dilution ratio</source> <translation>Fortynningsratio</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="215"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="358"/> <source>1:</source> <translation>1:</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="339"/> <source>Threshold for pO₂ (minimum, maximum)</source> <translation>Grense for pO₂ (minimum, maksimum)</translation> </message> @@ -5614,97 +6381,122 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="98"/> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="121"/> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="145"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="340"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="341"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="343"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="345"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="347"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="350"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="65"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="342"/> <source>Threshold for pN₂ (maximum only)</source> <translation>Grense for pN₂ (kun maksimum)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="88"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="344"/> <source>Threshold for pHe (maximum only)</source> <translation>Grense for pHe (kun maksimum)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="111"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="346"/> <source>pO₂ in calculating MOD (maximum only )</source> <translation>pO₂ ved utregning av MOD (kun maksimum)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="138"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="349"/> <source>Dive planner default setpoint</source> <translation>Standard setpoint i dykkeplanlegger</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="161"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="351"/> <source>Show O₂ sensor values when viewing pO₂</source> <translation>Vis sensorverdier for O₂ når pO₂ vises</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="168"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="352"/> <source>Show CCR setpoints when viewing pO₂</source> <translation>Vis settpunkter for CCR når pO₂ vises</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="182"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="354"/> <source>pSCR metabolic rate O₂</source> <translation>pSCR metabolisk rate for O₂</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="222"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="359"/> <source>Show equivalent OC pO₂ with pSCR pO₂</source> <translation>Vis ekvivalent OC pO₂ med pSCR pO₂</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="229"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="360"/> <source>Show warnings for isobaric counterdiffusion</source> <translation>Vis advarsler for isobarisk counterdiffusion</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="288"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="366"/> <source>Conservatism level</source> <translation>Konservatisme</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="375"/> <source>Recalculate thumbnails if older than media file</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="363"/> <source>B&ühlmann</source> <translation>B&ühlmann</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="192"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="355"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="275"/> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="328"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="365"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="370"/> <source>%</source> <translation>%</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="369"/> <source>&VPM-B</source> <translation>&VPM-B</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="354"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="372"/> <source>Misc</source> <translation>Ymse</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="373"/> <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="367"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="374"/> <source>Show mean depth in Profile</source> <translation>Vis snittdybde i profil</translation> </message> @@ -5718,57 +6510,69 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <name>PreferencesLanguage</name> <message> <location filename="../desktop-widgets/preferences/preferences_language.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="178"/> <source>Form</source> <translation>Skjema</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_language.ui" line="26"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="179"/> <source>UI language</source> <translation>Språk i brukergrensesnitt</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_language.ui" line="32"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="180"/> <source>Use system default</source> <translation>Bruk standardverdier</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_language.ui" line="55"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="181"/> <source>Filter</source> <translation>Filter</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_language.ui" line="74"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="182"/> <source>Date format</source> <translation>Datoformat</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_language.ui" line="113"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="189"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>Foretrukket datoformat. Ofte brukte felter er</p><p>d (dag i måned)</p><p>ddd (fortkortet dagsnavn)</p><p>M (månedsnummer)</p><p>MMM (forkortet månedsnavn)</p><p>yy/yyyy (år med 2/4 sifre)</p></body></html></translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_language.ui" line="80"/> <location filename="../desktop-widgets/preferences/preferences_language.ui" line="138"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="183"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="192"/> <source>Use UI language default</source> <translation>Bruk standard språk</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_language.ui" line="90"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="185"/> <source>This is used in places where there is less space to show the full date</source> <translation>Dette brukes på steder der det er for liten plass til å vise full dato</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_language.ui" line="93"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="187"/> <source>Short format</source> <translation>Kort format</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_language.ui" line="132"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="191"/> <source>Time format</source> <translation>Tidsformat</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_language.ui" line="151"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="194"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>Foretrukket tidsformat</p><p>Ofte brukte formater er</p><p>h (timer i 12-timersformat)</p><p>H (timer i 24-timersformat)</p><p>mm (minutter med 2 tall)</p><p>ss (sekunder med 2 tall)</p><p>t/tt (a/p eller am/pm)</p></body></html></translation> </message> @@ -5819,68 +6623,82 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <name>PreferencesNetwork</name> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="233"/> <source>Form</source> <translation>Skjema</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="20"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="234"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="32"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="235"/> <source>Port</source> <translation>Port</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="39"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="236"/> <source>Host</source> <translation>Tjener</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="46"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="237"/> <source>Proxy type</source> <translation>Proxytype</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="56"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="238"/> <source>Username</source> <translation>Brukernavn</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="108"/> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="172"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="239"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="246"/> <source>Password</source> <translation>Passord</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="134"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="240"/> <source>Requires authentication</source> <translation>Krever autentisering</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="241"/> <source>Subsurface cloud storage</source> <translation>Skylager for Subsurface</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="165"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="245"/> <source>Email address</source> <translation>Epostadresse</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="179"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="247"/> <source>Verification PIN</source> <translation>Bekreftelses-PIN</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="186"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="248"/> <source>New password</source> <translation>Nytt passord</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="221"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="255"/> <source>Save Password locally?</source> <translation>Lagre passord lokalt?</translation> </message> @@ -5945,186 +6763,223 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <name>PreferencesUnits</name> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="346"/> <source>Form</source> <translation>Skjema</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="20"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="347"/> <source>Unit system</source> <translation>Enhetssystem</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="26"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="348"/> <source>System</source> <translation>System</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="33"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="349"/> <source>&Metric</source> <translation>&Metrisk</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="40"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="350"/> <source>Imperial</source> <translation>Britiske mål</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="47"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="351"/> <source>Personali&ze</source> <translation>Personifiser</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="57"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="352"/> <source>Individual settings</source> <translation>Individuelle valg</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="69"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="353"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="76"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="354"/> <source>meter</source> <translation>meter</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="86"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="355"/> <source>feet</source> <translation>fot</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="96"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="356"/> <source>Pressure</source> <translation>Trykk</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="103"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="357"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="113"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="358"/> <source>psi</source> <translation>psi</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="123"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="359"/> <source>Volume</source> <translation>Volum</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="130"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="360"/> <source>&liter</source> <translation>&liter</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="361"/> <source>cuft</source> <translation>ft³</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="150"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="362"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="157"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="363"/> <source>celsius</source> <translation>celsius</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="167"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="364"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="177"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="365"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="184"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="366"/> <source>kg</source> <translation>kg</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="194"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="367"/> <source>lbs</source> <translation>pund</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="207"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="368"/> <source>Time units</source> <translation>Tidsenheter</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="213"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="369"/> <source>Ascent/descent speed denominator</source> <translation>Tidsenhet for opp- og nedstigning</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="220"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="370"/> <source>Minutes</source> <translation>Minutter</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="227"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="371"/> <source>Seconds</source> <translation>Sekunder</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="237"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="372"/> <source>Duration units</source> <translation>Enheter for varighet</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="243"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="373"/> <source>Show hours in duration</source> <translation>Vis timer i varighet</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="250"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="374"/> <source>hh:mm (always)</source> <translation>hh:mm (alltid)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="257"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="375"/> <source>mm (always)</source> <translation>mm (alltid)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="264"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="376"/> <source>mm (for dives shorter than 1 hour), hh:mm (otherwise)</source> <translation>mm (for dykk kortere enn 1 time), hh:mm (ellers)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="377"/> <source>Dive list table</source> <translation>Liste over dyk</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="378"/> <source>Show units in dive list table</source> <translation>Vis enheter i liste over dyk</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="379"/> <source>GPS coordinates</source> <translation>GPS-koordinater</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="380"/> <source>Location Display</source> <translation>Stedsvisning</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="381"/> <source>traditional (dms)</source> <translation>tradisjonell (dms)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> + <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="382"/> <source>decimal</source> <translation>desimal</translation> </message> @@ -6156,56 +7011,67 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <name>PrintOptions</name> <message> <location filename="../desktop-widgets/printoptions.ui" line="29"/> + <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="168"/> <source>Print type</source> <translation>Utskriftstype</translation> </message> <message> <location filename="../desktop-widgets/printoptions.ui" line="41"/> + <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="169"/> <source>&Dive list print</source> <translation>Utskrift av liste over &dykk</translation> </message> <message> <location filename="../desktop-widgets/printoptions.ui" line="57"/> + <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="170"/> <source>&Statistics print</source> <translation>Utskrift av &statistikk</translation> </message> <message> <location filename="../desktop-widgets/printoptions.ui" line="67"/> + <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="171"/> <source>Print options</source> <translation>Utskriftsvalg</translation> </message> <message> <location filename="../desktop-widgets/printoptions.ui" line="79"/> + <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="172"/> <source>Print only selected dives</source> <translation>Skriv ut valgte dykk</translation> </message> <message> <location filename="../desktop-widgets/printoptions.ui" line="92"/> + <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="173"/> <source>Print in color</source> <translation>Fargeutskrift</translation> </message> <message> <location filename="../desktop-widgets/printoptions.ui" line="102"/> + <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="174"/> <source>Template</source> <translation>Mal</translation> </message> <message> <location filename="../desktop-widgets/printoptions.ui" line="127"/> + <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="175"/> <source>Edit</source> <translation>Rediger</translation> </message> <message> <location filename="../desktop-widgets/printoptions.ui" line="134"/> + <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="176"/> <source>Delete</source> <translation>Slett</translation> </message> <message> <location filename="../desktop-widgets/printoptions.ui" line="141"/> + <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="177"/> <source>Export</source> <translation>Eksport</translation> </message> <message> <location filename="../desktop-widgets/printoptions.ui" line="148"/> + <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="178"/> <source>Import</source> <translation>Import</translation> </message> @@ -6265,133 +7131,133 @@ Eksporter denne templaten til en annen fil.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="804"/> + <location filename="../profile-widget/profilewidget2.cpp" line="814"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="800"/> + <location filename="../profile-widget/profilewidget2.cpp" line="810"/> <source>Unknown dive computer</source> <translation>Ukjent computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="828"/> + <location filename="../profile-widget/profilewidget2.cpp" line="840"/> <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="1439"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> <source>Add gas change</source> <translation>Legg til gassbytte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1438"/> <source>Make first dive computer</source> <translation>Velg som første dykkecomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="796"/> + <location filename="../profile-widget/profilewidget2.cpp" line="806"/> <source>Planned dive</source> <translation>Planlagt dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="798"/> + <location filename="../profile-widget/profilewidget2.cpp" line="808"/> <source>Manually added dive</source> <translation>Dykk lagt til manuelt</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1440"/> <source>Delete this dive computer</source> <translation>Slett denne computeren</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1442"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1455"/> <source> (cyl. %1)</source> <translation>(flaske %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> <source>Add setpoint change</source> <translation>Legg til endring av setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1450"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <source>Add bookmark</source> <translation>Legg til bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1452"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1462"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> <source>Change divemode</source> <translation>Endre dykkemodus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1499"/> <source>Edit the profile</source> <translation>Rediger profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1490"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1503"/> <source>Remove event</source> <translation>Fjern hendelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1495"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> <source>Hide similar events</source> <translation>Skjul lignende hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1540"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1546"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1553"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Juster trykket på syl. %1 (interpolert som %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1568"/> <source>Unhide all events</source> <translation>Vis alle hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1603"/> <source>Hide events</source> <translation>Skjul hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1590"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1603"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hendelser?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1638"/> <source>Remove the selected event?</source> <translation>Fjern den valgte hendelsen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1626"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1639"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1792"/> <source>Edit name of bookmark</source> <translation>Rediger navn på bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1793"/> <source>Custom name:</source> <translation>Tilpasset navn:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1783"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1798"/> <source>Name is too long!</source> <translation>Navnet er for langt</translation> </message> @@ -6399,146 +7265,146 @@ Eksporter denne templaten til en annen fil.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="205"/> <source>Starting...</source> <translation>Starter...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="259"/> <source>Open local dive data file</source> <translation>Åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="264"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="267"/> <source>Opening local data file failed</source> <translation>Kunne ikke åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="296"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="297"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dykk hentet fra lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="393"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="395"/> <source>working in no-cloud mode</source> <translation>jobber i ikke-sky-modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="397"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/> <source>Error parsing local storage, giving up</source> <translation>Klarte ikke å lese fra lokalt lagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="408"/> <source>no cloud credentials</source> <translation>ingen påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="483"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="409"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="485"/> <source>Please enter valid cloud credentials.</source> <translation>Legg in påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Epost og passord for skylager kan bare bestå av bokstaver, tall og '.', '-', '_', og '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Invalid format for email address</source> <translation>Feil format på epostadresse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="496"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Prøver å åpne skylagring med nye påloggingsdetaljer</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> <source>Testing cloud credentials</source> <translation>Tester påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> <source>No response from cloud server to validate the credentials</source> <translation>Skytjener svarte ikke ved validering av påloggingsdetaljer</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="541"/> <source>Incorrect cloud credentials</source> <translation>Feil bruker/passord for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="545"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="547"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Får ikke koblet til skylagring - konto er ikke verifisert</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="574"/> <source>Cloud credentials are invalid</source> <translation>Påloggingsdetaljer for skyen er ugyldige</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="586"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="588"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kunne ikke åpne skylagring: Feil ved opprettelse av https-forbindelse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="600"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="602"/> <source>Cannot open cloud storage: %1</source> <translation>Kan ikke åpne skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="613"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Cannot connect to cloud storage</source> <translation>Kan ikke koble til skylagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="620"/> <source>Cloud credentials valid, loading dives...</source> <translation>Gyldig bruker/passord, henter dykk</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="628"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="630"/> <source>Cloud storage error: %1</source> <translation>Feil i skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="674"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="676"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Henter dykk fra lokalt lager ('ikke-sky-modus")</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Fikk ikke koblet til skylagring, skrur tilbake til lokal modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="745"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="747"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Tilkobling til skylagring OK. Ingen dykk i lista.</translation> </message> <message> + <location filename="../mobile-widgets/qmlmanager.cpp" line="921"/> <location filename="../mobile-widgets/qmlmanager.cpp" line="922"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="923"/> <source>h</source> <translation>t</translation> </message> <message> + <location filename="../mobile-widgets/qmlmanager.cpp" line="921"/> <location filename="../mobile-widgets/qmlmanager.cpp" line="922"/> <location filename="../mobile-widgets/qmlmanager.cpp" line="923"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="924"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="922"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="921"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1350"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1347"/> <source>Unknown GPS location</source> <translation>Ukjent GPS-posisjon</translation> </message> @@ -6546,7 +7412,7 @@ Eksporter denne templaten til en annen fil.</translation> <context> <name>QMLPrefs</name> <message> - <location filename="../mobile-widgets/qmlprefs.cpp" line="133"/> + <location filename="../mobile-widgets/qmlprefs.cpp" line="138"/> <source>Starting...</source> <translation>Starter...</translation> </message> @@ -6554,34 +7420,53 @@ Eksporter denne templaten til en annen fil.</translation> <context> <name>ReadSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2155"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2127"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2151"/> <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="2132"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2141"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2152"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2137"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2148"/> <source>Failed!</source> <translation>Feil!</translation> </message> </context> <context> + <name>RemoveAutogenTrips</name> + <message> + <location filename="../desktop-widgets/command_divelist.cpp" line="688"/> + <source>remove autogenerated trips</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>RemoveDivesFromTrip</name> + <message numerus="yes"> + <location filename="../desktop-widgets/command_divelist.cpp" line="680"/> + <source>remove %n dive(s) from trip</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> +</context> +<context> <name>RenumberDialog</name> <message> <location filename="../desktop-widgets/renumber.ui" line="17"/> + <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="88"/> <source>Renumber</source> <translation>Oppdater nummerering</translation> </message> <message> <location filename="../desktop-widgets/renumber.ui" line="43"/> + <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="89"/> <source>Renumbering all dives</source> <translation>Renummererer alle dykk</translation> </message> <message> <location filename="../desktop-widgets/renumber.ui" line="61"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="149"/> + <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="90"/> <source>New starting number</source> <translation>Nytt startnummer</translation> </message> @@ -6602,9 +7487,17 @@ Eksporter denne templaten til en annen fil.</translation> </message> </context> <context> + <name>RenumberDives</name> + <message numerus="yes"> + <location filename="../desktop-widgets/command_divelist.cpp" line="640"/> + <source>renumber %n dive(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> +</context> +<context> <name>ResetSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2258"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2248"/> <source>Reset settings failed!</source> <translation>Kunne ikke nullstille innstillinger!</translation> </message> @@ -6613,6 +7506,7 @@ Eksporter denne templaten til en annen fil.</translation> <name>SearchBar</name> <message> <location filename="../desktop-widgets/searchbar.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_searchbar.h" line="120"/> <source>Form</source> <translation>Skjema</translation> </message> @@ -6621,16 +7515,19 @@ Eksporter denne templaten til en annen fil.</translation> <name>SetpointDialog</name> <message> <location filename="../desktop-widgets/setpoint.ui" line="17"/> + <location filename="../subsurface/desktop-widgets/ui_setpoint.h" line="82"/> <source>Add setpoint change</source> <translation>Legg til endring av setpoint</translation> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="43"/> + <location filename="../subsurface/desktop-widgets/ui_setpoint.h" line="83"/> <source>New setpoint (0 for OC)</source> <translation>Nytt setpoint (0 for OC)</translation> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="61"/> + <location filename="../subsurface/desktop-widgets/ui_setpoint.h" line="84"/> <source>bar</source> <translation>bar</translation> </message> @@ -6668,7 +7565,7 @@ Eksporter denne templaten til en annen fil.</translation> <translation>Ingen skymodus</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="34"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="33"/> <source>Cloud status</source> <translation>Skystatus</translation> </message> @@ -6678,41 +7575,41 @@ Eksporter denne templaten til en annen fil.</translation> <translation>Epost</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="48"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="47"/> <source>Not applicable</source> <translation>Ikke relevant</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="56"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> <source>Change</source> <translation>Endre</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="63"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="88"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="84"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="96"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> <source>Blue</source> <translation>Blå</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="111"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="162"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="214"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="109"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="163"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="218"/> <source>regular text</source> <translation>vanlig tekst</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="126"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="177"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="229"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="125"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="179"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="234"/> <source>Highlight</source> <translation>Høydepunkter</translation> </message> @@ -6722,42 +7619,107 @@ Eksporter denne templaten til en annen fil.</translation> <translation>Rosa</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="199"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="202"/> <source>Dark</source> <translation>Mørkt</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> - <source>Subsurface GPS data webservice</source> - <translation>Webtjeneste for Subsurface GPS-data</translation> + <location filename="../mobile-widgets/qml/Settings.qml" line="255"/> + <source>Scaling</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="268"/> + <source>smaller</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="276"/> + <source>regular</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="284"/> + <source>larger</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="306"/> + <source>GPS location service</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="316"/> <source>Distance threshold (meters)</source> <translation>Terskelverdi for avstand (meter)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="286"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="332"/> <source>Time threshold (minutes)</source> <translation>Terskelverdi for tid (minutter)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="313"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="361"/> <source>Default Cylinder</source> <translation>Standardflaske</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="322"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="370"/> <source>Cylinder:</source> <translation>Flaske:</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="347"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="395"/> + <source>Dive computers</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="404"/> + <source>Forget remembered dive computers</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="410"/> + <source>Forget</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="432"/> + <source>Units</source> + <translation>Enheter</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="442"/> + <source>Use Imperial Units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="458"/> + <source>Use Metric Units</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="486"/> + <source>Filter preferences</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="495"/> + <source>Include notes in full text filtering</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="510"/> + <source>Match filter case sensitive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="537"/> <source>Developer</source> <translation>Utvikler</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="356"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="547"/> <source>Display Developer menu</source> <translation>Vis utviklermeny</translation> </message> @@ -6766,31 +7728,37 @@ Eksporter denne templaten til en annen fil.</translation> <name>ShiftImageTimesDialog</name> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/> + <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="194"/> <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="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="195"/> <source>Shift times of image(s) by</source> <translation>Flytt tidspunkter fra bilder med</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="95"/> + <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="196"/> <source>h:mm</source> <translation>h:mm</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/> + <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="197"/> <source>Earlier</source> <translation>Tidligere</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="112"/> + <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="198"/> <source>Later</source> <translation>Senere</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/> + <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="199"/> <source>Warning! Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> @@ -6798,107 +7766,129 @@ Not all media files have timestamps in the range between </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/> + <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="202"/> <source>Load media files even if the time does not match the dive time</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/> + <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="204"/> <source>To compute the offset between the clocks of your dive computer and your camera use your camera to take a picture of your dive compuer displaying the current time. Download that image to your computer and press this button.</source> <translation>For å regne ut forskjelleg mellom klokkene på dykkecomputeren din og kameraet ditt, bruk kameraet for å ta et bilde av computeren mens den viser klokka. Last ned dette bildet til datamaskina di og trykk denne knappen.</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="196"/> + <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="206"/> <source>Determine camera time offset</source> <translation>Finn ut tidsforskjell til kamera</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="199"/> + <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="208"/> <source>Select image of divecomputer showing time</source> <translation>Velg bilde av dykkecomputeren som viser klokka</translation> </message> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="221"/> + <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="210"/> <source>Which date and time are displayed on the image?</source> <translation>Hvilket dato og tid vises på bildet?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="306"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="295"/> <source>Open image file</source> <translation>Åpne bilder</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="308"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/> <source>Image files</source> <translation>Bildefiler</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="385"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="378"/> <source>Selected dive date/time</source> <translation>Valgte dykkedato/-tid</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="387"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="380"/> <source>First selected dive date/time</source> <translation>Første valgte dykkedato/-tid</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="381"/> <source>Last selected dive date/time</source> <translation>Siste valgte dykkedato/-tid</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="383"/> <source> Files with inappropriate date/time</source> <translation> Filer med upassende dykkedato/-tid</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="400"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="393"/> <source>No Exif date/time found</source> <translation>Ingen Exif-dato/-tid funnet</translation> </message> </context> <context> + <name>ShiftTime</name> + <message numerus="yes"> + <location filename="../desktop-widgets/command_divelist.cpp" line="597"/> + <source>shift time of %n dives</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> +</context> +<context> <name>ShiftTimesDialog</name> <message> <location filename="../desktop-widgets/shifttimes.ui" line="23"/> + <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="136"/> <source>Shift selected dive times</source> <translation>Flytt tid for valgte dykk</translation> </message> <message> <location filename="../desktop-widgets/shifttimes.ui" line="49"/> + <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="137"/> <source>Shift times of selected dives by</source> <translation>Flytt valgte tidspunkter med</translation> </message> <message> <location filename="../desktop-widgets/shifttimes.ui" line="72"/> + <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="138"/> <source>Shifted time:</source> <translation>Forskjøvet tid:</translation> </message> <message> <location filename="../desktop-widgets/shifttimes.ui" line="79"/> + <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="139"/> <source>Current time:</source> <translation>Nåværende tid:</translation> </message> <message> <location filename="../desktop-widgets/shifttimes.ui" line="86"/> <location filename="../desktop-widgets/shifttimes.ui" line="93"/> + <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="140"/> + <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="141"/> <source>0:0</source> <translation>0:0</translation> </message> <message> <location filename="../desktop-widgets/shifttimes.ui" line="126"/> + <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="142"/> <source>h:mm</source> <translation>h:mm</translation> </message> <message> <location filename="../desktop-widgets/shifttimes.ui" line="136"/> + <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="143"/> <source>Earlier</source> <translation>Tidligere</translation> </message> <message> <location filename="../desktop-widgets/shifttimes.ui" line="143"/> + <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="144"/> <source>Later</source> <translation>Senere</translation> </message> @@ -7124,6 +8114,14 @@ Filer med upassende dykkedato/-tid</translation> </message> </context> <context> + <name>SplitDives</name> + <message> + <location filename="../desktop-widgets/command_divelist.cpp" line="748"/> + <source>split dive</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>StartPage</name> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="37"/> @@ -7140,26 +8138,31 @@ Filer med upassende dykkedato/-tid</translation> <name>SubsurfaceAbout</name> <message> <location filename="../desktop-widgets/about.ui" line="23"/> + <location filename="../subsurface/desktop-widgets/ui_about.h" line="118"/> <source>About Subsurface</source> <translation>Om Subsurface</translation> </message> <message> <location filename="../desktop-widgets/about.ui" line="83"/> + <location filename="../subsurface/desktop-widgets/ui_about.h" line="121"/> <source>&License</source> <translation>&Lisens</translation> </message> <message> <location filename="../desktop-widgets/about.ui" line="90"/> + <location filename="../subsurface/desktop-widgets/ui_about.h" line="122"/> <source>Credits</source> <translation>Bidragsytere</translation> </message> <message> <location filename="../desktop-widgets/about.ui" line="97"/> + <location filename="../subsurface/desktop-widgets/ui_about.h" line="123"/> <source>&Website</source> <translation>&Webside</translation> </message> <message> <location filename="../desktop-widgets/about.ui" line="104"/> + <location filename="../subsurface/desktop-widgets/ui_about.h" line="124"/> <source>&Close</source> <translation>Lukk</translation> </message> @@ -7172,7 +8175,7 @@ Filer med upassende dykkedato/-tid</translation> <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="560"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="553"/> <source>Suits</source> <translation type="unfinished"/> </message> @@ -7180,7 +8183,7 @@ Filer med upassende dykkedato/-tid</translation> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="272"/> + <location filename="../qt-models/filtermodels.cpp" line="335"/> <source>No suit set</source> <translation>Ingen drakt er satt</translation> </message> @@ -7189,6 +8192,7 @@ Filer med upassende dykkedato/-tid</translation> <name>TabDiveExtraInfo</name> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveExtraInfo.h" line="49"/> <source>Extra Info</source> <translation>Ekstra info</translation> </message> @@ -7197,76 +8201,91 @@ Filer med upassende dykkedato/-tid</translation> <name>TabDiveInformation</name> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="297"/> <source>Information</source> <translation>Informasjon</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="59"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="298"/> <source>Date</source> <translation>Dato</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="78"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="300"/> <source>Interval</source> <translation>Overflateintervall</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="97"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="302"/> <source>Gases used</source> <translation>Brukte gasser</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="116"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="304"/> <source>Gas consumed</source> <translation>Gassforbruk</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="135"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="306"/> <source>SAC</source> <translation>SAC</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="154"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="308"/> <source>CNS</source> <translation>CNS</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="173"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="310"/> <source>OTU</source> <translation>OTU</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="192"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="312"/> <source>Max. depth</source> <translation>Maksdybde</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="211"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="314"/> <source>Avg. depth</source> <translation>Snittdybde</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="230"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="316"/> <source>Air pressure</source> <translation>Lufttrykk</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="249"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="318"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="268"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="320"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="287"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="322"/> <source>Dive time</source> <translation>Varighet</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="306"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="324"/> <source>Water type</source> <translation>Vanntype</translation> </message> @@ -7277,13 +8296,13 @@ Filer med upassende dykkedato/-tid</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="84"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/> <source>h</source> <translation>t</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="84"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/> <source>min</source> <translation>min</translation> </message> @@ -7293,7 +8312,7 @@ Filer med upassende dykkedato/-tid</translation> <translation>sek</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="84"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/> <source>d</source> <translation>d</translation> </message> @@ -7302,11 +8321,13 @@ Filer med upassende dykkedato/-tid</translation> <name>TabDivePhotos</name> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_TabDivePhotos.h" line="78"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="29"/> + <location filename="../subsurface/desktop-widgets/ui_TabDivePhotos.h" line="79"/> <source>Zoom level</source> <translation>Zoomnivå</translation> </message> @@ -7355,41 +8376,49 @@ Filer med upassende dykkedato/-tid</translation> <name>TabDiveStatistics</name> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="194"/> <source>Statistics</source> <translation>Statistikk</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="73"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="195"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="128"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="200"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="97"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="197"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="109"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="198"/> <source>Total time</source> <translation>Totaltid</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="140"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="201"/> <source>Dives</source> <translation>Dykk</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="85"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="196"/> <source>SAC</source> <translation>SAC</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="159"/> + <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="203"/> <source>Gas consumption</source> <translation>Gassforbruk</translation> </message> @@ -7449,38 +8478,38 @@ Filer med upassende dykkedato/-tid</translation> <translation>Snittlengde for de valgte dykkene</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="62"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="66"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="70"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="64"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="68"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="72"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="84"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="90"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="93"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="84"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="90"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="93"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="84"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="90"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="93"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="124"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="126"/> <source>These gases could be mixed from Air and using: </source> @@ -7489,17 +8518,17 @@ fra luft og bruker: </translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="126"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="128"/> <source>He</source> <translation>He</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="130"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="132"/> <source>and</source> <translation>og</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="132"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="134"/> <source>O₂</source> <translation>O₂</translation> </message> @@ -7509,6 +8538,8 @@ fra luft og bruker: <message> <location filename="../desktop-widgets/tableview.ui" line="14"/> <location filename="../desktop-widgets/tableview.ui" line="17"/> + <location filename="../subsurface/desktop-widgets/ui_tableview.h" line="49"/> + <location filename="../subsurface/desktop-widgets/ui_tableview.h" line="50"/> <source>GroupBox</source> <translation>GruppeBoks</translation> </message> @@ -7516,7 +8547,7 @@ fra luft og bruker: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="544"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="537"/> <source>Tags</source> <translation>Emner</translation> </message> @@ -7524,7 +8555,7 @@ fra luft og bruker: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="296"/> + <location filename="../qt-models/filtermodels.cpp" line="359"/> <source>Empty tags</source> <translation>Ingen emneord</translation> </message> @@ -7551,106 +8582,127 @@ fra luft og bruker: <name>TemplateEdit</name> <message> <location filename="../desktop-widgets/templateedit.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="454"/> <source>Edit template</source> <translation>Rediger mal</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="37"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="455"/> <source>Preview</source> <translation>Forhåndsvisning</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="94"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="473"/> <source>Style</source> <translation>Stil</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="104"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="457"/> <source>Font</source> <translation>Skrifttype</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="112"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="458"/> <source>Arial</source> <translation>Arial</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="117"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="459"/> <source>Impact</source> <translation>Impact</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="122"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="460"/> <source>Georgia</source> <translation>Georgia</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="127"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="461"/> <source>Courier</source> <translation>Courier</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="132"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="462"/> <source>Verdana</source> <translation>Verdana</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="144"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="464"/> <source>Font size</source> <translation>Skriftstørrelse</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="165"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="465"/> <source>Color palette</source> <translation>Fargepalett</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="173"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="466"/> <source>Default</source> <translation>Standardvalg</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="178"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="467"/> <source>Almond</source> <translation>Almond</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="183"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="468"/> <source>Shades of blue</source> <translation>Blånyanser</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="188"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="469"/> <source>Custom</source> <translation>Tilpasset</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="200"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="471"/> <source>Line spacing</source> <translation>Linjehøyde</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="227"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="472"/> <source>Border width</source> <translation>Bredde på marg</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="271"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="474"/> <source>Template</source> <translation>Mal</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="294"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="493"/> <source>Colors</source> <translation>Farger</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="310"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="475"/> <source>Background</source> <translation>Bakgrun</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="323"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="476"/> <source>color1</source> <translation>farge1</translation> </message> @@ -7661,56 +8713,72 @@ fra luft og bruker: <location filename="../desktop-widgets/templateedit.ui" line="453"/> <location filename="../desktop-widgets/templateedit.ui" line="493"/> <location filename="../desktop-widgets/templateedit.ui" line="533"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="477"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="480"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="483"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="486"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="489"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="492"/> <source>Edit</source> <translation>Rediger</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="350"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="478"/> <source>Table cells 1</source> <translation>Tabell-celler 1</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="363"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="479"/> <source>color2</source> <translation>farge2</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="390"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="481"/> <source>Table cells 2</source> <translation>Tabell-celler 2</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="403"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="482"/> <source>color3</source> <translation>farge3</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="430"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="484"/> <source>Text 1</source> <translation>Tekst 1</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="443"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="485"/> <source>color4</source> <translation>farge4</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="470"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="487"/> <source>Text 2</source> <translation>Tekst 2</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="483"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="488"/> <source>color5</source> <translation>farge5</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="510"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="490"/> <source>Borders</source> <translation>Kanter</translation> </message> <message> <location filename="../desktop-widgets/templateedit.ui" line="523"/> + <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="491"/> <source>color6</source> <translation>farge6</translation> </message> @@ -7723,7 +8791,7 @@ fra luft og bruker: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="684"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="677"/> <source>%1click to visit %2</source> <translation>%1klikk for å besøke %2</translation> </message> @@ -7745,150 +8813,16 @@ fra luft og bruker: </message> </context> <context> - <name>TripItem</name> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="74"/> - <source>(%1 shown)</source> - <translation>(%1 vist)</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> - <source>#</source> - <translation>#</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> - <source>Date</source> - <translation>Dato</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> - <source>Rating</source> - <translation>Vurdering</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> - <source>Depth(%1)</source> - <translation>Dybde(%1)</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> - <source>m</source> - <translation>m</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="259"/> - <source>Duration</source> - <translation>Varighet</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="262"/> - <source>Temp.(%1%2)</source> - <translation>Temp.(%1%2)</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="271"/> - <source>Cylinder</source> - <translation>Flaske</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="285"/> - <source>Max. CNS</source> - <translation>Maks CNS</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="288"/> - <source>Tags</source> - <translation>Emner</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="291"/> - <source>Media before/during/after dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="297"/> - <source>Buddy</source> - <translation>Buddy</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="390"/> - <source>h</source> - <translation>t</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="390"/> - <source>min</source> - <translation>min</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="265"/> - <source>Weight(%1)</source> - <translation>Vekt(%1)</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="265"/> - <location filename="../qt-models/divetripmodel.cpp" line="434"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="265"/> - <location filename="../qt-models/divetripmodel.cpp" line="434"/> - <source>lbs</source> - <translation>pund</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="268"/> - <source>Suit</source> - <translation>Drakt</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="274"/> - <source>Gas</source> - <translation>Gass</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <source>SAC(%1)</source> - <translation>SAC(%1)</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="279"/> - <location filename="../qt-models/divetripmodel.cpp" line="424"/> - <source>/min</source> - <translation>/min</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="282"/> - <source>OTU</source> - <translation>OTU</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="294"/> - <source>Country</source> - <translation>Land</translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="300"/> - <source>Location</source> - <translation>Sted</translation> - </message> -</context> -<context> <name>URLDialog</name> <message> <location filename="../desktop-widgets/urldialog.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_urldialog.h" line="57"/> <source>Dialog</source> <translation>Dialogboks</translation> </message> <message> <location filename="../desktop-widgets/urldialog.ui" line="52"/> + <location filename="../subsurface/desktop-widgets/ui_urldialog.h" line="58"/> <source>Enter URL for media files</source> <translation type="unfinished"/> </message> @@ -7986,71 +8920,85 @@ Hvis du ikke vil dette, trykk Avslå.</translation> <name>UserSurvey</name> <message> <location filename="../desktop-widgets/usersurvey.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="192"/> <source>User survey</source> <translation>Brukerundersøkelse</translation> </message> <message> <location filename="../desktop-widgets/usersurvey.ui" line="168"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="205"/> <source>Subsurface user survey</source> <translation>Brukerundersøkelse for Subsurface</translation> </message> <message> <location filename="../desktop-widgets/usersurvey.ui" line="20"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="193"/> <source><html><head/><body><p>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.</p></body></html></source> <translation><html><head/><body><p>Vi ønsker å lære mer om brukerne være, valgene deres og bruksmønster. Fyll gjerne ut dette skjemaet og sen til Subsurface-teamet.</p></body></html></translation> </message> <message> <location filename="../desktop-widgets/usersurvey.ui" line="47"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="195"/> <source>Technical diver</source> <translation>Teknisk dykker</translation> </message> <message> <location filename="../desktop-widgets/usersurvey.ui" line="54"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="196"/> <source>Recreational diver</source> <translation>Sportsdykker</translation> </message> <message> <location filename="../desktop-widgets/usersurvey.ui" line="61"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="197"/> <source>Dive planner</source> <translation>Dykkeplanlegger</translation> </message> <message> <location filename="../desktop-widgets/usersurvey.ui" line="82"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="199"/> <source>Supported dive computer</source> <translation>Støttede dykkecomputere</translation> </message> <message> <location filename="../desktop-widgets/usersurvey.ui" line="89"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="200"/> <source>Other software/sources</source> <translation>Annen programvare/kilder</translation> </message> <message> <location filename="../desktop-widgets/usersurvey.ui" line="96"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="201"/> <source>Manually entering dives</source> <translation>Legge inn dykk manuelt</translation> </message> <message> <location filename="../desktop-widgets/usersurvey.ui" line="103"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="202"/> <source>Android/iPhone companion app</source> <translation>Android/iPhone støtte-app</translation> </message> <message> <location filename="../desktop-widgets/usersurvey.ui" line="117"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="203"/> <source>Any suggestions? (in English)</source> <translation>Noen forslag? (på engelsk)</translation> </message> <message> <location filename="../desktop-widgets/usersurvey.ui" line="127"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="204"/> <source>The following information about your system will also be submitted.</source> <translation>Den følgende informasjonen om maskina di vil også bli sendt.</translation> </message> <message> <location filename="../desktop-widgets/usersurvey.ui" line="40"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="194"/> <source>What kind of diver are you?</source> <translation>Hva slags dykker er du?</translation> </message> <message> <location filename="../desktop-widgets/usersurvey.ui" line="75"/> + <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="198"/> <source>Where are you importing data from?</source> <translation>Hvor importerer du dykkedata fra?</translation> </message> @@ -8167,51 +9115,59 @@ Language: %1</source> <name>WebServices</name> <message> <location filename="../desktop-widgets/webservices.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="129"/> <source>Web service connection</source> <translation>Forbindelse til webtjeneste</translation> </message> <message> <location filename="../desktop-widgets/webservices.ui" line="25"/> + <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="130"/> <source>Status:</source> <translation>Status:</translation> </message> <message> <location filename="../desktop-widgets/webservices.ui" line="32"/> + <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="131"/> <source>Enter your ID here</source> <translation>Skriv ID-en din her</translation> </message> <message> <location filename="../desktop-widgets/webservices.ui" line="44"/> + <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="132"/> <source>Download</source> <translation>Last ned</translation> </message> <message> <location filename="../desktop-widgets/webservices.ui" line="68"/> + <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="133"/> <source>User ID</source> <translation>Bruker-ID</translation> </message> <message> <location filename="../desktop-widgets/webservices.ui" line="85"/> + <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="135"/> <source>Save user ID locally?</source> <translation>Lagre bruker-ID lokalt?</translation> </message> <message> <location filename="../desktop-widgets/webservices.ui" line="92"/> + <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="136"/> <source>Password</source> <translation>Passord</translation> </message> <message> <location filename="../desktop-widgets/webservices.ui" line="106"/> + <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="137"/> <source>Upload</source> <translation>Last opp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="326"/> <source>Operation timed out</source> <translation>Handlingen fikk tidsavbrudd</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="347"/> <source>Transferring data...</source> <translation>Overfører data...</translation> </message> @@ -8235,26 +9191,17 @@ Language: %1</source> </message> </context> <context> - <name>WinBluetoothDeviceDiscoveryAgent</name> - <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="583"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="614"/> - <source>No error</source> - <translation>Ingen feil</translation> - </message> -</context> -<context> <name>WriteSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2179"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2204"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2175"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2198"/> <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="2181"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2192"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2201"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2187"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2195"/> <source>Failed!</source> <translation>Feil!</translation> </message> @@ -8362,7 +9309,7 @@ Snitt</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="829"/> + <location filename="../core/libdivecomputer.c" line="800"/> <source>Error parsing the header</source> <translation>Kunne ikke lese header</translation> </message> @@ -8373,40 +9320,40 @@ Snitt</translation> <location filename="../core/cochran.c" line="305"/> <location filename="../core/cochran.c" line="311"/> <location filename="../core/cochran.c" line="381"/> - <location filename="../core/libdivecomputer.c" line="258"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>deco stop</source> <translation>dekostopp</translation> </message> <message> <location filename="../core/cochran.c" line="332"/> <location filename="../core/cochran.c" line="386"/> - <location filename="../core/import-csv.c" line="683"/> - <location filename="../core/libdivecomputer.c" line="260"/> + <location filename="../core/import-csv.c" line="675"/> + <location filename="../core/libdivecomputer.c" line="245"/> <source>ascent</source> <translation>oppstigning</translation> </message> <message> <location filename="../core/cochran.c" line="338"/> - <location filename="../core/import-csv.c" line="661"/> + <location filename="../core/import-csv.c" line="653"/> <source>battery</source> <translation>batteri</translation> </message> <message> <location filename="../core/cochran.c" line="344"/> - <location filename="../core/libdivecomputer.c" line="276"/> + <location filename="../core/libdivecomputer.c" line="261"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../core/cochran.c" line="349"/> - <location filename="../core/libdivecomputer.c" line="275"/> + <location filename="../core/libdivecomputer.c" line="260"/> <source>maxdepth</source> <translation>maksdybde</translation> </message> <message> <location filename="../core/cochran.c" line="354"/> <location filename="../core/cochran.c" line="400"/> - <location filename="../core/libdivecomputer.c" line="277"/> + <location filename="../core/libdivecomputer.c" line="262"/> <source>pO₂</source> <translation>pO₂</translation> </message> @@ -8414,9 +9361,9 @@ Snitt</translation> <location filename="../core/cochran.c" line="361"/> <location filename="../core/cochran.c" line="410"/> <location filename="../core/cochran.c" line="417"/> - <location filename="../core/import-csv.c" line="764"/> - <location filename="../core/libdivecomputer.c" line="268"/> - <location filename="../core/libdivecomputer.c" line="282"/> + <location filename="../core/import-csv.c" line="756"/> + <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/libdivecomputer.c" line="267"/> <location filename="../core/plannernotes.c" line="50"/> <source>gaschange</source> <translation>gassbytte</translation> @@ -8424,281 +9371,281 @@ Snitt</translation> <message> <location filename="../core/cochran.c" line="366"/> <location filename="../core/cochran.c" line="405"/> - <location filename="../core/libdivecomputer.c" line="259"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../core/cochran.c" line="375"/> <location filename="../core/cochran.c" line="422"/> - <location filename="../core/libdivecomputer.c" line="261"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>ceiling</source> <translation>tak</translation> </message> <message> <location filename="../core/cochran.c" line="391"/> - <location filename="../core/libdivecomputer.c" line="263"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>transmitter</source> <translation>sender</translation> </message> <message> - <location filename="../core/datatrak.c" line="259"/> + <location filename="../core/datatrak.c" line="261"/> <source>clear</source> <translation>klart</translation> </message> <message> - <location filename="../core/datatrak.c" line="262"/> + <location filename="../core/datatrak.c" line="264"/> <source>misty</source> <translation>lett tåke</translation> </message> <message> - <location filename="../core/datatrak.c" line="265"/> + <location filename="../core/datatrak.c" line="267"/> <source>fog</source> <translation>tåke</translation> </message> <message> - <location filename="../core/datatrak.c" line="268"/> + <location filename="../core/datatrak.c" line="270"/> <source>rain</source> <translation>regn</translation> </message> <message> - <location filename="../core/datatrak.c" line="271"/> + <location filename="../core/datatrak.c" line="273"/> <source>storm</source> <translation>storm</translation> </message> <message> - <location filename="../core/datatrak.c" line="274"/> + <location filename="../core/datatrak.c" line="276"/> <source>snow</source> <translation>sn</translation> </message> <message> - <location filename="../core/datatrak.c" line="294"/> + <location filename="../core/datatrak.c" line="296"/> <source>No suit</source> <translation>Ingen drakt</translation> </message> <message> - <location filename="../core/datatrak.c" line="297"/> + <location filename="../core/datatrak.c" line="299"/> <source>Shorty</source> <translation>Shorty</translation> </message> <message> - <location filename="../core/datatrak.c" line="300"/> + <location filename="../core/datatrak.c" line="302"/> <source>Combi</source> <translation>Kombi</translation> </message> <message> - <location filename="../core/datatrak.c" line="303"/> + <location filename="../core/datatrak.c" line="305"/> <source>Wet suit</source> <translation>Våtdrakt</translation> </message> <message> - <location filename="../core/datatrak.c" line="306"/> + <location filename="../core/datatrak.c" line="308"/> <source>Semidry suit</source> <translation>Semidry</translation> </message> <message> - <location filename="../core/datatrak.c" line="309"/> + <location filename="../core/datatrak.c" line="311"/> <source>Dry suit</source> <translation>Tørrdrakt</translation> </message> <message> - <location filename="../core/datatrak.c" line="369"/> + <location filename="../core/datatrak.c" line="371"/> <source>no stop</source> <translation>ingen stop</translation> </message> <message> - <location filename="../core/datatrak.c" line="371"/> - <location filename="../core/dive.c" line="32"/> + <location filename="../core/datatrak.c" line="373"/> + <location filename="../core/dive.c" line="31"/> <source>deco</source> <translation>deko</translation> </message> <message> - <location filename="../core/datatrak.c" line="373"/> + <location filename="../core/datatrak.c" line="375"/> <source>single ascent</source> <translation>enkel oppstigning</translation> </message> <message> - <location filename="../core/datatrak.c" line="375"/> + <location filename="../core/datatrak.c" line="377"/> <source>multiple ascent</source> <translation>flere oppstigninger</translation> </message> <message> - <location filename="../core/dive.c" line="30"/> + <location filename="../core/dive.c" line="29"/> <source>fresh</source> <translation>ferskvann</translation> </message> <message> - <location filename="../core/datatrak.c" line="377"/> + <location filename="../core/datatrak.c" line="379"/> <source>fresh water</source> <translation>ferskvann</translation> </message> <message> - <location filename="../core/datatrak.c" line="379"/> + <location filename="../core/datatrak.c" line="381"/> <source>salt water</source> <translation>saltvan</translation> </message> <message> - <location filename="../core/datatrak.c" line="404"/> + <location filename="../core/datatrak.c" line="406"/> <source>sight seeing</source> <translation>sightseeing</translation> </message> <message> - <location filename="../core/datatrak.c" line="406"/> + <location filename="../core/datatrak.c" line="408"/> <source>club dive</source> <translation>klubbdyk</translation> </message> <message> - <location filename="../core/datatrak.c" line="408"/> - <location filename="../core/dive.c" line="31"/> + <location filename="../core/datatrak.c" line="410"/> + <location filename="../core/dive.c" line="30"/> <source>instructor</source> <translation>instruktør</translation> </message> <message> - <location filename="../core/datatrak.c" line="410"/> + <location filename="../core/datatrak.c" line="412"/> <source>instruction</source> <translation>instruksjon</translation> </message> <message> - <location filename="../core/datatrak.c" line="412"/> - <location filename="../core/dive.c" line="30"/> + <location filename="../core/datatrak.c" line="414"/> + <location filename="../core/dive.c" line="29"/> <source>night</source> <translation>nattdykk</translation> </message> <message> - <location filename="../core/datatrak.c" line="414"/> - <location filename="../core/dive.c" line="28"/> + <location filename="../core/datatrak.c" line="416"/> + <location filename="../core/dive.c" line="27"/> <source>cave</source> <translation>grotte</translation> </message> <message> - <location filename="../core/datatrak.c" line="416"/> - <location filename="../core/dive.c" line="27"/> + <location filename="../core/datatrak.c" line="418"/> + <location filename="../core/dive.c" line="26"/> <source>ice</source> <translation>isdykk</translation> </message> <message> - <location filename="../core/datatrak.c" line="418"/> + <location filename="../core/datatrak.c" line="420"/> <source>search</source> <translation>søk</translation> </message> <message> - <location filename="../core/datatrak.c" line="427"/> - <location filename="../core/dive.c" line="28"/> + <location filename="../core/datatrak.c" line="429"/> + <location filename="../core/dive.c" line="27"/> <source>wreck</source> <translation>vrakdykk</translation> </message> <message> - <location filename="../core/datatrak.c" line="429"/> - <location filename="../core/dive.c" line="29"/> + <location filename="../core/datatrak.c" line="431"/> + <location filename="../core/dive.c" line="28"/> <source>river</source> <translation>elv</translation> </message> <message> - <location filename="../core/datatrak.c" line="431"/> - <location filename="../core/dive.c" line="26"/> + <location filename="../core/datatrak.c" line="433"/> + <location filename="../core/dive.c" line="25"/> <source>drift</source> <translation>strømdykk</translation> </message> <message> - <location filename="../core/datatrak.c" line="433"/> - <location filename="../core/dive.c" line="31"/> + <location filename="../core/datatrak.c" line="435"/> + <location filename="../core/dive.c" line="30"/> <source>photo</source> <translation>foto</translation> </message> <message> - <location filename="../core/datatrak.c" line="435"/> + <location filename="../core/datatrak.c" line="437"/> <source>other</source> <translation>annet</translation> </message> <message> - <location filename="../core/datatrak.c" line="446"/> + <location filename="../core/datatrak.c" line="448"/> <source>Other activities</source> <translation>Andre aktiviteter</translation> </message> <message> - <location filename="../core/datatrak.c" line="470"/> + <location filename="../core/datatrak.c" line="472"/> <source>Datatrak/Wlog notes</source> <translation>Datatrak/Wlog-notater</translation> </message> <message> - <location filename="../core/datatrak.c" line="514"/> + <location filename="../core/datatrak.c" line="516"/> <source>[Warning] Manual dive # %d </source> <translation>[Advarsel] Manuelt dykk # %d </translation> </message> <message> - <location filename="../core/datatrak.c" line="540"/> + <location filename="../core/datatrak.c" line="542"/> <source>[Error] Out of memory for dive %d. Abort parsing.</source> <translation>[Feil] Tomt for minne for dykk %d. Avslutter innlesing.</translation> </message> <message> - <location filename="../core/datatrak.c" line="587"/> + <location filename="../core/datatrak.c" line="589"/> <source>[Error] File is not a DataTrak file. Aborted</source> <translation>[Feil] Loggen er ikke en DataTrak-fil. Avbryter.</translation> </message> <message> - <location filename="../core/datatrak.c" line="600"/> + <location filename="../core/datatrak.c" line="602"/> <source>Error: no dive</source> <translation>Feil: Ikke noe dykk</translation> </message> <message> - <location filename="../core/dive.c" line="26"/> + <location filename="../core/dive.c" line="25"/> <source>boat</source> <translation>båt</translation> </message> <message> - <location filename="../core/dive.c" line="26"/> + <location filename="../core/dive.c" line="25"/> <source>shore</source> <translation>landdykk</translation> </message> <message> - <location filename="../core/dive.c" line="27"/> + <location filename="../core/dive.c" line="26"/> <source>deep</source> <translation>dypdykk</translation> </message> <message> - <location filename="../core/dive.c" line="27"/> + <location filename="../core/dive.c" line="26"/> <source>cavern</source> <translation>hule</translation> </message> <message> - <location filename="../core/dive.c" line="28"/> + <location filename="../core/dive.c" line="27"/> <source>altitude</source> <translation>høydedykk</translation> </message> <message> - <location filename="../core/dive.c" line="29"/> + <location filename="../core/dive.c" line="28"/> <source>pool</source> <translation>basseng</translation> </message> <message> - <location filename="../core/dive.c" line="29"/> + <location filename="../core/dive.c" line="28"/> <source>lake</source> <translation>innsjø</translation> </message> <message> - <location filename="../core/dive.c" line="30"/> + <location filename="../core/dive.c" line="29"/> <source>student</source> <translation>elev</translation> </message> <message> - <location filename="../core/dive.c" line="31"/> + <location filename="../core/dive.c" line="30"/> <source>video</source> <translation>video</translation> </message> <message> - <location filename="../core/dive.c" line="36"/> + <location filename="../core/dive.c" line="35"/> <source>OC-gas</source> <translation>OC-gass</translation> </message> <message> - <location filename="../core/dive.c" line="36"/> + <location filename="../core/dive.c" line="35"/> <source>diluent</source> <translation>diluent</translation> </message> <message> - <location filename="../core/dive.c" line="36"/> + <location filename="../core/dive.c" line="35"/> <location filename="../core/equipment.c" line="90"/> <location filename="../core/planner.c" line="1145"/> <location filename="../core/planner.c" line="1148"/> @@ -8706,108 +9653,110 @@ Snitt</translation> <translation>oksygen</translation> </message> <message> - <location filename="../core/dive.c" line="36"/> + <location filename="../core/dive.c" line="35"/> <source>not used</source> <translation>Ikke i bruk</translation> </message> <message> - <location filename="../core/dive.c" line="41"/> + <location filename="../core/dive.c" line="40"/> <source>Open circuit</source> <translation>Åpent system</translation> </message> <message> - <location filename="../core/dive.c" line="294"/> + <location filename="../core/dive.c" line="293"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="299"/> + <location filename="../core/dive.c" line="298"/> <location filename="../core/plannernotes.c" line="68"/> <location filename="../core/plannernotes.c" line="69"/> <location filename="../core/plannernotes.c" line="70"/> - <location filename="../core/qthelper.cpp" line="629"/> - <location filename="../core/qthelper.cpp" line="821"/> - <location filename="../core/qthelper.cpp" line="1304"/> + <location filename="../core/qthelper.cpp" line="622"/> + <location filename="../core/qthelper.cpp" line="814"/> + <location filename="../core/qthelper.cpp" line="1272"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="303"/> - <location filename="../core/qthelper.cpp" line="632"/> - <location filename="../core/qthelper.cpp" line="823"/> - <location filename="../core/qthelper.cpp" line="1303"/> + <location filename="../core/dive.c" line="302"/> + <location filename="../core/qthelper.cpp" line="625"/> + <location filename="../core/qthelper.cpp" line="816"/> + <location filename="../core/qthelper.cpp" line="1271"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="340"/> + <location filename="../core/dive.c" line="339"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="345"/> - <location filename="../core/qthelper.cpp" line="1327"/> + <location filename="../core/dive.c" line="344"/> + <location filename="../core/qthelper.cpp" line="1295"/> <source>cuft</source> <translation>ft³</translation> </message> <message> - <location filename="../core/dive.c" line="386"/> - <location filename="../core/qthelper.cpp" line="545"/> - <location filename="../core/qthelper.cpp" line="560"/> - <location filename="../core/qthelper.cpp" line="739"/> - <location filename="../core/qthelper.cpp" line="1279"/> + <location filename="../core/dive.c" line="385"/> + <location filename="../core/qthelper.cpp" line="538"/> + <location filename="../core/qthelper.cpp" line="553"/> + <location filename="../core/qthelper.cpp" line="732"/> + <location filename="../core/qthelper.cpp" line="1247"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="391"/> - <location filename="../core/qthelper.cpp" line="548"/> - <location filename="../core/qthelper.cpp" line="562"/> - <location filename="../core/qthelper.cpp" line="741"/> - <location filename="../core/qthelper.cpp" line="1278"/> + <location filename="../core/dive.c" line="390"/> + <location filename="../core/qthelper.cpp" line="541"/> + <location filename="../core/qthelper.cpp" line="555"/> + <location filename="../core/qthelper.cpp" line="734"/> + <location filename="../core/qthelper.cpp" line="1246"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="414"/> + <location filename="../core/dive.c" line="413"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="416"/> + <location filename="../core/dive.c" line="415"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="421"/> + <location filename="../core/dive.c" line="420"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="423"/> + <location filename="../core/dive.c" line="422"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="442"/> - <location filename="../core/qthelper.cpp" line="571"/> - <location filename="../core/qthelper.cpp" line="581"/> - <location filename="../core/qthelper.cpp" line="796"/> - <location filename="../core/qthelper.cpp" line="1255"/> + <location filename="../core/dive.c" line="441"/> + <location filename="../core/qthelper.cpp" line="564"/> + <location filename="../core/qthelper.cpp" line="574"/> + <location filename="../core/qthelper.cpp" line="789"/> + <location filename="../core/qthelper.cpp" line="1223"/> + <location filename="../qt-models/divetripmodel.cpp" line="135"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../core/dive.c" line="446"/> - <location filename="../core/qthelper.cpp" line="569"/> - <location filename="../core/qthelper.cpp" line="579"/> - <location filename="../core/qthelper.cpp" line="794"/> - <location filename="../core/qthelper.cpp" line="1254"/> + <location filename="../core/dive.c" line="445"/> + <location filename="../core/qthelper.cpp" line="562"/> + <location filename="../core/qthelper.cpp" line="572"/> + <location filename="../core/qthelper.cpp" line="787"/> + <location filename="../core/qthelper.cpp" line="1222"/> + <location filename="../qt-models/divetripmodel.cpp" line="133"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="667"/> + <location filename="../core/divelist.c" line="684"/> <location filename="../core/equipment.c" line="86"/> <location filename="../core/planner.c" line="1141"/> <location filename="../core/planner.c" line="1144"/> @@ -8852,9 +9801,9 @@ Snitt</translation> <message> <location filename="../core/file.c" line="323"/> <location filename="../core/import-csv.c" line="116"/> - <location filename="../core/import-csv.c" line="361"/> - <location filename="../core/import-csv.c" line="502"/> - <location filename="../core/import-csv.c" line="840"/> + <location filename="../core/import-csv.c" line="353"/> + <location filename="../core/import-csv.c" line="494"/> + <location filename="../core/import-csv.c" line="832"/> <location filename="../core/ostctools.c" line="50"/> <source>Failed to read '%s'</source> <translation>Kunne ikke åpne '%s'</translation> @@ -8871,48 +9820,48 @@ Snitt</translation> <translation>Tom fil '%s'</translation> </message> <message> - <location filename="../core/import-csv.c" line="600"/> + <location filename="../core/import-csv.c" line="592"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Posiden-import feilet: klarte ikke å lese '%s'</translation> </message> <message> - <location filename="../core/import-csv.c" line="636"/> + <location filename="../core/import-csv.c" line="628"/> <source>Mouth piece position OC</source> <translation>Munnstykkeposisjon OC</translation> </message> <message> - <location filename="../core/import-csv.c" line="640"/> + <location filename="../core/import-csv.c" line="632"/> <source>Mouth piece position CC</source> <translation>Munnstykkeposisjon CC</translation> </message> <message> - <location filename="../core/import-csv.c" line="644"/> + <location filename="../core/import-csv.c" line="636"/> <source>Mouth piece position unknown</source> <translation>Munnstykkeposisjon ukjent</translation> </message> <message> - <location filename="../core/import-csv.c" line="648"/> + <location filename="../core/import-csv.c" line="640"/> <source>Mouth piece position not connected</source> <translation>Munnstykkeposisjon ikke tilkoblet</translation> </message> <message> - <location filename="../core/import-csv.c" line="655"/> + <location filename="../core/import-csv.c" line="647"/> <source>Power off</source> <translation>Skru av</translation> </message> <message> - <location filename="../core/import-csv.c" line="705"/> + <location filename="../core/import-csv.c" line="697"/> <source>O₂ calibration failed</source> <translation>O₂-kalibrering feilet</translation> </message> <message> - <location filename="../core/import-csv.c" line="707"/> - <location filename="../core/import-csv.c" line="716"/> + <location filename="../core/import-csv.c" line="699"/> + <location filename="../core/import-csv.c" line="708"/> <source>O₂ calibration</source> <translation>O₂-kalibrering</translation> </message> <message> - <location filename="../core/import-csv.c" line="235"/> + <location filename="../core/import-csv.c" line="227"/> <source>No dive profile found from '%s'</source> <translation>Ingen dykkeprofil funnet i '%s'</translation> </message> @@ -9038,213 +9987,213 @@ Snitt</translation> <translation>Synkroniserer datafil</translation> </message> <message> - <location filename="../core/import-divinglog.c" line="314"/> - <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/import-divinglog.c" line="315"/> + <location filename="../core/libdivecomputer.c" line="229"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/> <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="257"/> + <location filename="../core/libdivecomputer.c" line="242"/> <source>none</source> <translation>ingen</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="262"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>workload</source> <translation>arbeidsbelastning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="264"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>violation</source> <translation>brudd</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>bookmark</source> <translation>bokmerke</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="266"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>surface</source> <translation>overflate</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="267"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>safety stop</source> <translation>sikkerhetsstopp</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="269"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>safety stop (voluntary)</source> <translation>sikkerhetsstopp (frivillig)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="270"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>safety stop (mandatory)</source> <translation>sikkerhetsstopp (obligatorisk)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="271"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>deepstop</source> <translation>dypstopp</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="272"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>ceiling (safety stop)</source> <translation>tak (sikkerhetsstopp)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="273"/> + <location filename="../core/libdivecomputer.c" line="258"/> <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/libdivecomputer.c" line="274"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>divetime</source> <translation>dykketid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="278"/> + <location filename="../core/libdivecomputer.c" line="263"/> <source>airtime</source> <translation>lufttid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="279"/> + <location filename="../core/libdivecomputer.c" line="264"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="280"/> + <location filename="../core/libdivecomputer.c" line="265"/> <source>heading</source> <translation>retning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="281"/> + <location filename="../core/libdivecomputer.c" line="266"/> <source>tissue level warning</source> <translation>Advarsel: nivå i vev</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="291"/> + <location filename="../core/libdivecomputer.c" line="276"/> <source>invalid event number</source> <translation>ugyldig hendelsesnummer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="631"/> + <location filename="../core/libdivecomputer.c" line="612"/> <source>Error parsing the datetime</source> <translation>Feil ved lesing av dato</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="649"/> + <location filename="../core/libdivecomputer.c" line="630"/> <source>Dive %d: %s</source> <translation>Dykk %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="655"/> + <location filename="../core/libdivecomputer.c" line="636"/> <source>Error parsing the divetime</source> <translation>Feil ved lesing av dykketid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="646"/> <source>Error parsing the maxdepth</source> <translation>Feil ved lesing av maksdybde</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="684"/> + <location filename="../core/libdivecomputer.c" line="660"/> <source>Error parsing temperature</source> <translation>Klarte ikke å lese temperatur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="704"/> + <location filename="../core/libdivecomputer.c" line="679"/> <source>Error parsing the gas mix count</source> <translation>Feil ved lesing av gassmiksantall</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="716"/> + <location filename="../core/libdivecomputer.c" line="690"/> <source>Error obtaining water salinity</source> <translation>Feil ved lesing av salthetsgrad</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="725"/> + <location filename="../core/libdivecomputer.c" line="699"/> <source>Error obtaining surface pressure</source> <translation>Klarte ikke å hente overflatetrykk</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="750"/> + <location filename="../core/libdivecomputer.c" line="722"/> <source>Error obtaining dive mode</source> <translation>Kunne ikke hente dykkemodus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="773"/> + <location filename="../core/libdivecomputer.c" line="744"/> <source>Error parsing the gas mix</source> <translation>Feil ved lesing av gassmiks</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="799"/> + <location filename="../core/libdivecomputer.c" line="770"/> <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="805"/> + <location filename="../core/libdivecomputer.c" line="776"/> <source>Error registering the data</source> <translation>Feil ved registrering av data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="836"/> + <location filename="../core/libdivecomputer.c" line="807"/> <source>Error parsing the samples</source> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="843"/> + <location filename="../core/libdivecomputer.c" line="814"/> <source>Already downloaded dive at %s</source> <translation>Ferdig å laste ned dykk på %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1093"/> + <location filename="../core/libdivecomputer.c" line="1063"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1112"/> + <location filename="../core/libdivecomputer.c" line="1082"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1178"/> + <location filename="../core/libdivecomputer.c" line="1148"/> <source>Error registering the event handler.</source> <translation>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1183"/> + <location filename="../core/libdivecomputer.c" line="1153"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1204"/> + <location filename="../core/libdivecomputer.c" line="1174"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1394"/> + <location filename="../core/libdivecomputer.c" line="1361"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1403"/> + <location filename="../core/libdivecomputer.c" line="1370"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1414"/> + <location filename="../core/libdivecomputer.c" line="1381"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> <translation>Kunne ikke åpne enhet %s %s (%s). I de fleste tilfeller er det nyttig for utviklerne om du sender dem loggfilene. Du kan kopiere dem til utklippstavlen i "Om"-dialogen.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1416"/> + <location filename="../core/libdivecomputer.c" line="1383"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9253,33 +10202,33 @@ I de fleste tilfeller vil en logg fra libdivecomputer være nyttig for å feilsà Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1428"/> + <location filename="../core/libdivecomputer.c" line="1391"/> <source>No new dives downloaded from dive computer</source> <translation>Ingen dykk lastet ned fra dykkecomputer</translation> </message> <message> <location filename="../core/load-git.c" line="169"/> - <location filename="../core/parse-xml.c" line="1172"/> + <location filename="../core/parse-xml.c" line="1205"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>Flere GPS-posisjoner for dette steder; også %s </translation> </message> <message> - <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse.c" line="472"/> + <location filename="../core/load-git.c" line="196"/> + <location filename="../core/parse.c" line="446"/> <source>additional name for site: %s </source> <translation>ytterligere navn for sted: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1672"/> + <location filename="../core/load-git.c" line="1668"/> <source>Load dives from local cache</source> <translation>Last inn dykk fra lokal cache</translation> </message> <message> - <location filename="../core/load-git.c" line="1676"/> + <location filename="../core/load-git.c" line="1672"/> <source>Successfully opened dive data</source> <translation>Åpnet dykkelogg</translation> </message> @@ -9295,19 +10244,19 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>Feil - %s - leser dykk %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="392"/> + <location filename="../core/parse-xml.c" line="399"/> <source>Strange percentage reading %s </source> <translation>Rar lesing av prosent %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1636"/> + <location filename="../core/parse-xml.c" line="1661"/> <source>Failed to parse '%s'</source> <translation>Kunne ikke lese '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2222"/> + <location filename="../core/parse-xml.c" line="2251"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åpne stilark %s</translation> </message> @@ -9339,7 +10288,7 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. </message> <message> <location filename="../core/planner.c" line="306"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="208"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="204"/> <source>SP change</source> <translation>Endring av SP</translation> </message> @@ -9888,89 +10837,89 @@ EADD: %d%s / %.1fg/ℓ <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="65"/> + <location filename="../core/qthelper.cpp" line="62"/> <source>%1km</source> <translation>%1km</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="67"/> + <location filename="../core/qthelper.cpp" line="64"/> <source>%1m</source> <translation>%1m</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="71"/> + <location filename="../core/qthelper.cpp" line="68"/> <source>%1mi</source> <translation>%1mi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="73"/> + <location filename="../core/qthelper.cpp" line="70"/> <source>%1yd</source> <translation>%1yd</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="89"/> - <location filename="../core/qthelper.cpp" line="224"/> + <location filename="../core/qthelper.cpp" line="88"/> + <location filename="../core/qthelper.cpp" line="223"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="89"/> - <location filename="../core/qthelper.cpp" line="225"/> + <location filename="../core/qthelper.cpp" line="88"/> + <location filename="../core/qthelper.cpp" line="224"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="90"/> - <location filename="../core/qthelper.cpp" line="226"/> + <location filename="../core/qthelper.cpp" line="89"/> + <location filename="../core/qthelper.cpp" line="225"/> <source>E</source> <translation>Ø</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="90"/> - <location filename="../core/qthelper.cpp" line="227"/> + <location filename="../core/qthelper.cpp" line="89"/> + <location filename="../core/qthelper.cpp" line="226"/> <source>W</source> <translation>V</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="590"/> - <location filename="../core/qthelper.cpp" line="767"/> + <location filename="../core/qthelper.cpp" line="583"/> + <location filename="../core/qthelper.cpp" line="760"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="593"/> - <location filename="../core/qthelper.cpp" line="769"/> + <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="762"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="844"/> - <location filename="../core/qthelper.cpp" line="1231"/> + <location filename="../core/qthelper.cpp" line="837"/> + <location filename="../core/qthelper.cpp" line="1199"/> <source>AIR</source> <translation>Luft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="846"/> + <location filename="../core/qthelper.cpp" line="839"/> <source>EAN</source> <translation>EAN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="921"/> + <location filename="../core/qthelper.cpp" line="914"/> <source>more than %1 days</source> <translation>mer enn %1 dager</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="984"/> + <location filename="../core/qthelper.cpp" line="977"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1231"/> + <location filename="../core/qthelper.cpp" line="1199"/> <source>OXYGEN</source> <translation>Oksygen</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1326"/> + <location filename="../core/qthelper.cpp" line="1294"/> <source>l</source> <translation>l</translation> </message> @@ -10256,87 +11205,87 @@ EADD: %d%s / %.1fg/ℓ <translation>Dykkestatus</translation> </message> <message> - <location filename="../core/statistics.c" line="141"/> + <location filename="../core/statistics.c" line="136"/> <source>All (by type stats)</source> <translation>Alle (av type-stats)</translation> </message> <message> - <location filename="../core/dive.c" line="42"/> + <location filename="../core/dive.c" line="41"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../core/dive.c" line="43"/> + <location filename="../core/dive.c" line="42"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../core/dive.c" line="44"/> + <location filename="../core/dive.c" line="43"/> <source>Freedive</source> <translation>Fridykk</translation> </message> <message> - <location filename="../core/statistics.c" line="194"/> + <location filename="../core/statistics.c" line="186"/> <source>All (by trip stats)</source> <translation>Alle (ved turstatistikk)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="115"/> + <location filename="../core/subsurfacestartup.c" line="118"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="115"/> + <location filename="../core/subsurfacestartup.c" line="118"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="115"/> + <location filename="../core/subsurfacestartup.c" line="118"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="115"/> + <location filename="../core/subsurfacestartup.c" line="118"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="115"/> + <location filename="../core/subsurfacestartup.c" line="118"/> <source>May</source> <translation>mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="115"/> + <location filename="../core/subsurfacestartup.c" line="118"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="116"/> + <location filename="../core/subsurfacestartup.c" line="119"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="116"/> + <location filename="../core/subsurfacestartup.c" line="119"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="116"/> + <location filename="../core/subsurfacestartup.c" line="119"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="116"/> + <location filename="../core/subsurfacestartup.c" line="119"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="116"/> + <location filename="../core/subsurfacestartup.c" line="119"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="116"/> + <location filename="../core/subsurfacestartup.c" line="119"/> <source>Dec</source> <translation>des</translation> </message> @@ -10372,77 +11321,77 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Ingen dykk å laste ned</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="508"/> + <location filename="../core/uemis-downloader.c" line="507"/> <source>%s %s</source> <translation>%s %s</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="528"/> + <location filename="../core/uemis-downloader.c" line="527"/> <source>data</source> <translation>data</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="556"/> + <location filename="../core/uemis-downloader.c" line="555"/> <source>dive log #</source> <translation>dykkelogg #</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="558"/> + <location filename="../core/uemis-downloader.c" line="557"/> <source>dive spot #</source> <translation>dykkested #</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="560"/> + <location filename="../core/uemis-downloader.c" line="559"/> <source>details for #</source> <translation>detaljer for # </translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="790"/> + <location filename="../core/uemis-downloader.c" line="789"/> <source>wetsuit</source> <translation>våtdrakt</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="790"/> + <location filename="../core/uemis-downloader.c" line="789"/> <source>semidry</source> <translation>semidry</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="790"/> + <location filename="../core/uemis-downloader.c" line="789"/> <source>drysuit</source> <translation>tørrdrakt</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="791"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>shorty</source> <translation>shorty</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="791"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>vest</source> <translation>vest</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="791"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>long john</source> <translation>ermeløs våtdrakt</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="791"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>jacket</source> <translation>overdel</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="791"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>full suit</source> <translation>hel drakt</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="791"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>2 pcs full suit</source> <translation>todelt drakt</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="792"/> + <location filename="../core/uemis-downloader.c" line="791"/> <source>membrane</source> <translation>skalldrakt</translation> </message> @@ -10462,92 +11411,92 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Start nedlasting</translation> </message> <message> - <location filename="../core/uemis.c" line="201"/> + <location filename="../core/uemis.c" line="200"/> <source>Safety stop violation</source> <translation>Brudd på sikkerhetsstopp</translation> </message> <message> - <location filename="../core/uemis.c" line="203"/> + <location filename="../core/uemis.c" line="202"/> <source>Speed alarm</source> <translation>Alarm: oppstigningshastighet</translation> </message> <message> - <location filename="../core/uemis.c" line="206"/> + <location filename="../core/uemis.c" line="205"/> <source>Speed warning</source> <translation>Advarsel: oppstigningshastighet</translation> </message> <message> - <location filename="../core/uemis.c" line="208"/> + <location filename="../core/uemis.c" line="207"/> <source>pO₂ green warning</source> <translation>pO₂ grønn advarsel</translation> </message> <message> - <location filename="../core/uemis.c" line="211"/> + <location filename="../core/uemis.c" line="210"/> <source>pO₂ ascend warning</source> <translation>pO₂ oppstigningsadvarsel</translation> </message> <message> - <location filename="../core/uemis.c" line="213"/> + <location filename="../core/uemis.c" line="212"/> <source>pO₂ ascend alarm</source> <translation>pO₂ oppstigningsalarm</translation> </message> <message> - <location filename="../core/uemis.c" line="217"/> + <location filename="../core/uemis.c" line="216"/> <source>Tank pressure info</source> <translation>Info: tanktrykk</translation> </message> <message> - <location filename="../core/uemis.c" line="219"/> + <location filename="../core/uemis.c" line="218"/> <source>RGT warning</source> <translation>Advarsel: gjenværende gasstid</translation> </message> <message> - <location filename="../core/uemis.c" line="221"/> + <location filename="../core/uemis.c" line="220"/> <source>RGT alert</source> <translation>Alarm: gjenværende gasstid</translation> </message> <message> - <location filename="../core/uemis.c" line="223"/> + <location filename="../core/uemis.c" line="222"/> <source>Tank change suggested</source> <translation>Tankbytte foreslått</translation> </message> <message> - <location filename="../core/uemis.c" line="225"/> + <location filename="../core/uemis.c" line="224"/> <source>Depth limit exceeded</source> <translation>Maksdybde overskredet</translation> </message> <message> - <location filename="../core/uemis.c" line="227"/> + <location filename="../core/uemis.c" line="226"/> <source>Max deco time warning</source> <translation>Advarsel: maks dekotid</translation> </message> <message> - <location filename="../core/uemis.c" line="229"/> + <location filename="../core/uemis.c" line="228"/> <source>Dive time info</source> <translation>Info: dykketid</translation> </message> <message> - <location filename="../core/uemis.c" line="231"/> + <location filename="../core/uemis.c" line="230"/> <source>Dive time alert</source> <translation>Alarm: dykketid</translation> </message> <message> - <location filename="../core/uemis.c" line="233"/> + <location filename="../core/uemis.c" line="232"/> <source>Marker</source> <translation>Markering</translation> </message> <message> - <location filename="../core/uemis.c" line="235"/> + <location filename="../core/uemis.c" line="234"/> <source>No tank data</source> <translation>Ingen tankinformasjon</translation> </message> <message> - <location filename="../core/uemis.c" line="237"/> + <location filename="../core/uemis.c" line="236"/> <source>Low battery warning</source> <translation>Advarsel: dårlig batteri</translation> </message> <message> - <location filename="../core/uemis.c" line="239"/> + <location filename="../core/uemis.c" line="238"/> <source>Low battery alert</source> <translation>Alarm: dårlig batteri</translation> </message> @@ -10568,33 +11517,35 @@ Er Uemis Zurich plugget i ordentlig?</translation> </message> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/divelogexportlogic.cpp" line="94"/> <location filename="../core/plannernotes.c" line="58"/> <location filename="../core/plannernotes.c" line="501"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="137"/> <location filename="../core/worldmap-save.c" line="46"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <location filename="../qt-models/divetripmodel.cpp" line="107"/> <source>min</source> <translation>min</translation> </message> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> + <location filename="../core/divelogexportlogic.cpp" line="94"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="137"/> <location filename="../desktop-widgets/templatelayout.h" line="110"/> + <location filename="../qt-models/divetripmodel.cpp" line="107"/> <source>h</source> <translation>t</translation> </message> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> - <location filename="../core/divelogexportlogic.cpp" line="92"/> + <location filename="../core/divelogexportlogic.cpp" line="94"/> <location filename="../core/qthelper.h" line="76"/> <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../core/divelogexportlogic.cpp" line="152"/> + <location filename="../core/divelogexportlogic.cpp" line="154"/> <source>Cannot find a folder called 'theme' in the standard locations</source> <translation type="unfinished"/> </message> @@ -10704,62 +11655,62 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>planlagt stopp over tak</translation> </message> <message> - <location filename="../core/taxonomy.c" line="8"/> + <location filename="../core/taxonomy.c" line="9"/> <source>None</source> <translation>Ingen</translation> </message> <message> - <location filename="../core/taxonomy.c" line="9"/> + <location filename="../core/taxonomy.c" line="10"/> <source>Ocean</source> <translation>Hav</translation> </message> <message> - <location filename="../core/taxonomy.c" line="10"/> + <location filename="../core/taxonomy.c" line="11"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../core/taxonomy.c" line="11"/> + <location filename="../core/taxonomy.c" line="12"/> <source>State</source> <translation>Stat</translation> </message> <message> - <location filename="../core/taxonomy.c" line="12"/> + <location filename="../core/taxonomy.c" line="13"/> <source>County</source> <translation>Fylke</translation> </message> <message> - <location filename="../core/taxonomy.c" line="13"/> + <location filename="../core/taxonomy.c" line="14"/> <source>Town</source> <translation>Tettsted</translation> </message> <message> - <location filename="../core/taxonomy.c" line="14"/> + <location filename="../core/taxonomy.c" line="15"/> <source>City</source> <translation>By</translation> </message> <message> - <location filename="../core/save-git.c" line="943"/> + <location filename="../core/save-git.c" line="934"/> <source>Start saving data</source> <translation>Lagrer data</translation> </message> <message> - <location filename="../core/save-git.c" line="952"/> + <location filename="../core/save-git.c" line="943"/> <source>Start saving dives</source> <translation>Lagrer dykk</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="976"/> <source>Done creating local cache</source> <translation>Opprettet lokal cache</translation> </message> <message> - <location filename="../core/save-git.c" line="1236"/> + <location filename="../core/save-git.c" line="1227"/> <source>Preparing to save data</source> <translation>Forbereder lagring av data</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1666"/> <source>modechange</source> <translation>modusendring</translation> </message> @@ -10774,7 +11725,7 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Fjern dette punktet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="633"/> <source>Don't save an empty log to the cloud</source> <translation>Ikke lagre en tom logg til skyen</translation> </message> @@ -10794,25 +11745,30 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Maksimum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="401"/> <source>Invalid response from server</source> <translation>Ugyldig svar fra tjener</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="409"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Forventet XML-tag 'DiveDateReader', men fikk '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="455"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Fant ikke XML-tag 'DiveDates' som forventet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="462"/> <source>Malformed XML response. Line %1: %2</source> <translation>Feil formattert XML-svar. Linje %1: %2</translation> </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="124"/> + <source>/min</source> + <translation>/min</translation> + </message> </context> <context> <name>main</name> @@ -10822,102 +11778,102 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="192"/> + <location filename="../mobile-widgets/qml/main.qml" line="206"/> <source>Dive list</source> <translation>Liste over dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="219"/> + <location filename="../mobile-widgets/qml/main.qml" line="233"/> <source>Dive management</source> <translation>Administrasjon av dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="281"/> + <location filename="../mobile-widgets/qml/main.qml" line="295"/> <source>Disable auto cloud sync</source> <translation>Skru av automatisk synk mot skylagring</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="281"/> + <location filename="../mobile-widgets/qml/main.qml" line="295"/> <source>Enable auto cloud sync</source> <translation>Skru på automatisk skysynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="328"/> + <location filename="../mobile-widgets/qml/main.qml" line="343"/> <source>Disable location service</source> <translation>Skru av lokasjonstjeneste</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="350"/> + <location filename="../mobile-widgets/qml/main.qml" line="365"/> <source>Settings</source> <translation>Valg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="224"/> + <location filename="../mobile-widgets/qml/main.qml" line="238"/> <source>Add dive manually</source> <translation>Legg til dykk manuelt</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="238"/> + <location filename="../mobile-widgets/qml/main.qml" line="252"/> <source>Download from DC</source> <translation>Lastet ned fra DC</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="259"/> + <location filename="../mobile-widgets/qml/main.qml" line="273"/> <source>Manual sync with cloud</source> <translation>Manuell skysynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="286"/> + <location filename="../mobile-widgets/qml/main.qml" line="301"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Ved å skru av automatisk skysynkronisering vil all data bli lagret lokalt. Dette kan være nyttig ved begrenset eller ingen nettverkstilgang. Velg "Manuell synk med skyen" hvis du har nettverkstilgang og ønsker å synke til skyen.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="297"/> + <location filename="../mobile-widgets/qml/main.qml" line="312"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="385"/> + <location filename="../mobile-widgets/qml/main.qml" line="400"/> <source>Help</source> <translation>Hjelp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="264"/> <source>Apply GPS fixes</source> <translation>Legg til GPS-fiks</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="304"/> + <location filename="../mobile-widgets/qml/main.qml" line="319"/> <source>Show GPS fixes</source> <translation>Vis GPS-posisjoner</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="317"/> + <location filename="../mobile-widgets/qml/main.qml" line="332"/> <source>Clear GPS cache</source> <translation>Slett GPS-cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="363"/> + <location filename="../mobile-widgets/qml/main.qml" line="378"/> <source>Developer</source> <translation>Utvikler</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="366"/> + <location filename="../mobile-widgets/qml/main.qml" line="381"/> <source>App log</source> <translation>Applikasjonslogg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="374"/> + <location filename="../mobile-widgets/qml/main.qml" line="389"/> <source>Theme information</source> <translation>Temainformasjon</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="339"/> + <location filename="../mobile-widgets/qml/main.qml" line="354"/> <source>About</source> <translation>Om</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="328"/> + <location filename="../mobile-widgets/qml/main.qml" line="343"/> <source>Run location service</source> <translation>Kjør posisjonstjeneste</translation> </message> @@ -10933,21 +11889,25 @@ Er Uemis Zurich plugget i ordentlig?</translation> <name>plannerDetails</name> <message> <location filename="../desktop-widgets/plannerDetails.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_plannerDetails.h" line="92"/> <source>Form</source> <translation>Skjema</translation> </message> <message> <location filename="../desktop-widgets/plannerDetails.ui" line="43"/> + <location filename="../subsurface/desktop-widgets/ui_plannerDetails.h" line="93"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Detaljer for dykkeplan</span></p></body></html></translation> </message> <message> <location filename="../desktop-widgets/plannerDetails.ui" line="59"/> + <location filename="../subsurface/desktop-widgets/ui_plannerDetails.h" line="94"/> <source>Print</source> <translation>Skriv ut</translation> </message> <message> <location filename="../desktop-widgets/plannerDetails.ui" line="92"/> + <location filename="../subsurface/desktop-widgets/ui_plannerDetails.h" line="95"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -10964,21 +11924,25 @@ p, li { white-space: pre-wrap; } <name>plannerSettingsWidget</name> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="14"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="560"/> <source>Form</source> <translation>Skjema</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="74"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="561"/> <source>Rates</source> <translation>Hastigheter</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="95"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="562"/> <source>Ascent</source> <translation>Oppstigning</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="104"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="563"/> <source>below 75% avg. depth</source> <translation>under 75% snittdybde</translation> </message> @@ -10988,56 +11952,71 @@ p, li { white-space: pre-wrap; } <location filename="../desktop-widgets/plannerSettings.ui" line="145"/> <location filename="../desktop-widgets/plannerSettings.ui" line="162"/> <location filename="../desktop-widgets/plannerSettings.ui" line="206"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="564"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="566"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="568"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="570"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="573"/> <source>m/min</source> <translation>m/min</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="121"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="565"/> <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="../subsurface/desktop-widgets/ui_plannerSettings.h" line="567"/> <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="../subsurface/desktop-widgets/ui_plannerSettings.h" line="569"/> <source>6m to surface</source> <translation>6m til overflaten</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="175"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="571"/> <source>Descent</source> <translation>Nedstigning</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="187"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="572"/> <source>surface to the bottom</source> <translation>overflate til bunn</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="240"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="574"/> <source>Planning</source> <translation>Planlegging</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="585"/> <source>Min. switch duration O₂% below 100%</source> <translation>Min. tid for bytte O₂% under 100%</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="595"/> <source>VPM-B deco</source> <translation>VPM-B deko</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="596"/> <source>Bühlmann deco</source> <translation>Bühlmann deko</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="597"/> <source>Reserve gas</source> <translation>Reservegass</translation> </message> @@ -11045,199 +12024,243 @@ p, li { white-space: pre-wrap; } <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="575"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="606"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="608"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="583"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="594"/> <source>%</source> <translation>%</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="578"/> <source>Postpone gas change if a stop is not required</source> <translation>Forsinke gassbytte hvis et stopp ikke er påkrevd</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="580"/> <source>Only switch at required stops</source> <translation>Bytt bare ved påkrevede stopp</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="586"/> <source>Plan backgas breaks</source> <translation>Planlegg stopp med bakgass</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="587"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="643"/> <source>min</source> <translation>min</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="389"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="589"/> <source>Last stop at 6m</source> <translation>Siste stopp ved 6m</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="396"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="591"/> <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="399"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="593"/> <source>Recreational mode</source> <translation>Rekreasjonsmodus</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="584"/> <source>Drop to first depth</source> <translation>Dropp til første dybde</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="598"/> <source>Safety stop</source> <translation>Sikkerhetsstopp</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="599"/> <source>Conservatism level</source> <translation>Konservatisme</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="600"/> <source>+</source> <translation>+</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="602"/> <source>Dive mode</source> <translation>Dykkemodus</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="603"/> <source>Gas options</source> <translation>Gassvalg</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="604"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="607"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="612"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="631"/> <source>Compute variations of plan (performance cost)</source> <translation>Regn ut variasjoner i planen (kan gå treigt)</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="633"/> <source>Display plan variations</source> <translation>Vis variasjoner i planen</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="635"/> <source>SAC factor</source> <translation>SAC-faktor</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="637"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation>Brukt til utregning av minimum gass. Ta hensyn til to dykkere med mulig økt SAC etter OOG.</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="639"/> <source>Problem solving time</source> <translation>Problemløsningstid</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="641"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation>Brukt for å regne ut mimimum gass. Ekstra tid ved maks dybde etter OOG.</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="610"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>Brukes for å regne ut best miks. Velg best miks-dybde i 'Tilgjengelige gasser'-tabellen ved å legge inn gassdybde, deretter "B" (beste trimix-miks) eller "BN" (beste nitrox-miks)</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="582"/> <source>GFLow</source> <translation>GF lav</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="581"/> <source>GFHigh</source> <translation>GF høy</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="613"/> <source>Bottom SAC</source> <translation>SAC på bunn</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="614"/> <source>Bottom pO₂</source> <translation>pO₂ på bunn</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="615"/> <source>Best mix END</source> <translation>Best miks END</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="616"/> <source>Notes</source> <translation>Notater</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="623"/> <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="718"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="625"/> <source>Display runtime</source> <translation>Vis løpetid</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="627"/> <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="731"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="629"/> <source>Display segment duration</source> <translation>Vis lengde på segment</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="619"/> <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="708"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="621"/> <source>Display transitions in deco</source> <translation>Vis overganger i deko</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="617"/> <source>Verbatim dive plan</source> <translation>Utdypende dykkeplan</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="634"/> <source>Deco pO₂</source> <translation>pO₂ for deko</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> + <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="605"/> <source>Deco SAC</source> <translation>SAC under deko</translation> </message> |