diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-10-09 21:56:45 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-10-09 22:01:12 -0700 |
| commit | a3435e87dfe1e9653020aaedca89ba2727ec37ab (patch) | |
| tree | a869284ed963d639f0089762b81e9e716534064d /translations/subsurface_nb_NO.ts | |
| parent | 6578588ad98afc31dbde386c623a1f576f5229bb (diff) | |
| download | subsurface-a3435e87dfe1e9653020aaedca89ba2727ec37ab.tar.gz | |
latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_nb_NO.ts')
| -rw-r--r-- | translations/subsurface_nb_NO.ts | 1375 |
1 files changed, 764 insertions, 611 deletions
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 20c3d8904..4f0f66f05 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -31,6 +31,14 @@ </message> </context> <context> + <name>BackButton</name> + <message> + <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/> + <source>Navigate Back</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>BtDeviceSelectionDialog</name> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="14"/> @@ -39,37 +47,37 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="36"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Oppdagede enheter</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Lagre</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> <source>Quit</source> <translation>Avslutt</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Scan</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Fjern</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="30"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Detaljer for lokal bluetooth-enhet</translation> </message> @@ -80,213 +88,213 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Adresse:</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth er påskrudd</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Skru av/på</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="31"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Velg enhet:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="36"/> <source>Name:</source> <translation>Navn:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="57"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> <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="135"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> <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="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> <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="168"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> <source>Remote devices list was cleared.</source> <translation>Enhetsliste ble slettet.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="184"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="189"/> <source>Scanning for remote devices...</source> <translation>Leter etter enheter...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> <source>Scanning finished successfully.</source> <translation>Scanning ferdig.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> <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="210"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>turned on</source> <translation>skrudd på</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="210"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>turned off</source> <translation>skrudd av</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="226"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="347"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="367"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="230"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> <source>PAIRED</source> <translation>PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="233"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="357"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORIZED_PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="240"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [Tilstand: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="257"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> <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="266"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> <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="271"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="294"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> <source>The local device was changed.</source> <translation>Den lokale enheten ble endret.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="314"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> <source>Pair</source> <translation>Par</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="315"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> <source>Remove pairing</source> <translation>Fjern paring</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="331"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> <source>Trying to pair device %1</source> <translation>Prøver å pare %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="335"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> <source>Trying to unpair device %1</source> <translation>Prøver å fjerne paring for %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="348"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> <source>Device %1 was unpaired.</source> <translation>Fjernet paring for %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was paired.</source> <translation>%1 er paret.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> <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="386"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> <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="398"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> <source>Local device error: %1.</source> <translation>Enhetsfeil: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="399"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> <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="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> <source>Unknown error</source> <translation>Ukjent feil</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> <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="413"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> <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="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>An unknown error has occurred.</source> <translation>En ukjent feil inntraff.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> <source>Device discovery error: %1.</source> <translation>Feil ved søk etter enhet: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="453"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> <source>Not available</source> <translation>Ikke tilgjengelig</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="460"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> <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="510"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> <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> @@ -338,15 +346,35 @@ <translation>Epost</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="72"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="71"/> <source>Password</source> <translation>Passord</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="91"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="89"/> <source>PIN</source> <translation>PIN</translation> </message> + <message> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <source>Register</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <source>Cancel</source> + <translation>Avbryt</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <source>Sign-in or Register</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <source>No cloud mode</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ColumnNameProvider</name> @@ -524,42 +552,42 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../core/configuredivecomputer.cpp" line="220"/> + <location filename="../core/configuredivecomputer.cpp" line="221"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Kunne ikke lagre backupfila %1. Feilmelding: %2</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="236"/> + <location filename="../core/configuredivecomputer.cpp" line="237"/> <source>Could not open backup file: %1</source> <translation>Kunne ikke åpne backupfila: %1</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="584"/> + <location filename="../core/configuredivecomputer.cpp" line="585"/> <source>Dive computer details read successfully</source> <translation>Informasjon ble lest fra computer</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="593"/> + <location filename="../core/configuredivecomputer.cpp" line="594"/> <source>Setting successfully written to device</source> <translation>Lagret til computer</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="602"/> + <location filename="../core/configuredivecomputer.cpp" line="603"/> <source>Device firmware successfully updated</source> <translation>Firmware på computer er oppdatert</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="611"/> + <location filename="../core/configuredivecomputer.cpp" line="612"/> <source>Device settings successfully reset</source> <translation>Innstillinger på computer er resatt</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="627"/> + <location filename="../core/configuredivecomputer.cpp" line="628"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="656"/> + <location filename="../core/configuredivecomputer.cpp" line="659"/> <source>Could not a establish connection to the dive computer.</source> <translation>Klarte ikke å koble til computeren.</translation> </message> @@ -1894,17 +1922,22 @@ <translation>Detaljer for dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="78"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> <source>Delete dive</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <source>Cancel edit</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> <source>Show on map</source> <translation>Vis på kart</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="163"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> <source>Multiple Buddies</source> <translation>Flere buddies</translation> </message> @@ -2155,7 +2188,7 @@ GPS-posisjon:</translation> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="306"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> <source>No dives in dive list</source> <translation>Ingen dykk i lista</translation> </message> @@ -2163,102 +2196,102 @@ GPS-posisjon:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="850"/> + <location filename="../desktop-widgets/divelistview.cpp" line="847"/> <source>Expand all</source> <translation>Fold ut turer</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="852"/> + <location filename="../desktop-widgets/divelistview.cpp" line="849"/> <source>Collapse all</source> <translation>Fold sammen turer</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="856"/> + <location filename="../desktop-widgets/divelistview.cpp" line="853"/> <source>Collapse others</source> <translation>Slå sammen andre</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="860"/> + <location filename="../desktop-widgets/divelistview.cpp" line="857"/> <source>Remove dive(s) from trip</source> <translation>Fjern dykk fra tur</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Create new trip above</source> <translation>Lag ny tur</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="875"/> + <location filename="../desktop-widgets/divelistview.cpp" line="872"/> <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="877"/> + <location filename="../desktop-widgets/divelistview.cpp" line="874"/> <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="881"/> + <location filename="../desktop-widgets/divelistview.cpp" line="878"/> <source>Merge trip with trip above</source> <translation>Slå samme tur med turen over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip below</source> <translation>Slå sammen tur med turen under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Delete dive(s)</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="888"/> + <location filename="../desktop-widgets/divelistview.cpp" line="885"/> <source>Mark dive(s) invalid</source> <translation>Marker dykk som ugyldige</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="889"/> <source>Merge selected dives</source> <translation>Slå sammen valgte dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="891"/> <source>Renumber dive(s)</source> <translation>Renummerer dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Shift dive times</source> <translation>Flytt på dykketider</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="896"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Split selected dives</source> <translation>Del opp valgte dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Load image(s) from file(s)</source> <translation>Hent bilde(r) fra fil(er)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="898"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image from web</source> <translation>Hent bilde fra web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="924"/> + <location filename="../desktop-widgets/divelistview.cpp" line="921"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="980"/> + <location filename="../desktop-widgets/divelistview.cpp" line="977"/> <source>%1 does not appear to be an image</source> <translation>%1 er ikke et bilde</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="922"/> + <location filename="../desktop-widgets/divelistview.cpp" line="919"/> <source>Open image files</source> <translation>Åpne bilder</translation> </message> @@ -2266,12 +2299,12 @@ GPS-posisjon:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="329"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> <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="330"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> <source>Create a new dive site with this name</source> <translation>Opprett dykkested med dette navnet</translation> </message> @@ -2926,32 +2959,32 @@ GPS-posisjon:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="153"/> + <location filename="../qt-models/diveplannermodel.cpp" line="155"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="344"/> + <location filename="../qt-models/diveplannermodel.cpp" line="346"/> <source>Final depth</source> <translation>Siste dybde</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="348"/> <source>Run time</source> <translation>Løpetid</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="350"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="352"/> <source>Used gas</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="354"/> <source>CC setpoint</source> <translation>CC settpunkt</translation> </message> @@ -3156,137 +3189,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="422"/> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> + <location filename="../qt-models/divetripmodel.cpp" line="450"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="425"/> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> + <location filename="../qt-models/divetripmodel.cpp" line="453"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="428"/> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> + <location filename="../qt-models/divetripmodel.cpp" line="456"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="431"/> + <location filename="../qt-models/divetripmodel.cpp" line="459"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="434"/> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> + <location filename="../qt-models/divetripmodel.cpp" line="462"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="440"/> + <location filename="../qt-models/divetripmodel.cpp" line="468"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="443"/> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="471"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="437"/> + <location filename="../qt-models/divetripmodel.cpp" line="465"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="446"/> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> + <location filename="../qt-models/divetripmodel.cpp" line="474"/> + <location filename="../qt-models/divetripmodel.cpp" line="526"/> <source>Cylinder</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="449"/> - <location filename="../qt-models/divetripmodel.cpp" line="498"/> + <location filename="../qt-models/divetripmodel.cpp" line="477"/> + <location filename="../qt-models/divetripmodel.cpp" line="529"/> <source>Gas</source> <translation>Gass</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="452"/> + <location filename="../qt-models/divetripmodel.cpp" line="480"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="455"/> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> + <location filename="../qt-models/divetripmodel.cpp" line="483"/> + <location filename="../qt-models/divetripmodel.cpp" line="537"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="458"/> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="486"/> + <location filename="../qt-models/divetripmodel.cpp" line="540"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="461"/> + <location filename="../qt-models/divetripmodel.cpp" line="489"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="464"/> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <source>Country</source> + <translation>Land</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="495"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Weight(%1)</source> <translation>Vekt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> + <location filename="../qt-models/divetripmodel.cpp" line="534"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> + <location filename="../qt-models/divetripmodel.cpp" line="534"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="543"/> <source>Photos before/during/after dive</source> <translation>Bilder før/under/etter dykk</translation> </message> @@ -3294,112 +3332,112 @@ p, li { white-space: pre-wrap; } <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="166"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>no dives were selected</source> <translation>ingen dykk valgt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="176"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>kunne ikke finne stilark for eksport til divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="186"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="187"/> <source>failed to create zip file for upload: %s</source> <translation>klarte ikke å lage zipfil for opplasting: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="250"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/> <source>internal error</source> <translation>intern feil</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="258"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="259"/> <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="286"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="287"/> <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="757"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Done</source> <translation>Ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> <source>Uploading dive list...</source> <translation>Laster opp liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> <source>Downloading dive list...</source> <translation>Laster ned liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> <source>Downloading %1 dives...</source> <translation>Laster ned %1 dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> <source>Download finished - %1</source> <translation>Nedlasting er ferdig - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>Problem with download</source> <translation>Kunne ikke laste ned</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> <source>The archive could not be opened: </source> <translation>Arkivet kunne ikke åpnes: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>Corrupted download</source> <translation>Nedlastingen er skadet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> <source>The archive could not be opened: %1</source> <translation>Arkivet kunne ikke åpnes: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> <source>Upload finished</source> <translation>Opplasting er ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> <source>Upload failed</source> <translation>Opplasting feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> <source>Upload successful</source> <translation>Ferdig å laste opp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> <source>Login failed</source> <translation>Innlogging feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> <source>Cannot parse response</source> <translation>Kan ikke lese svar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> <source>Error: %1</source> <translation>Feil: %1</translation> </message> @@ -3417,52 +3455,58 @@ p, li { white-space: pre-wrap; } <translation>Velg nedlastingsmåte for Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="187"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <source>Connecting to dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> <source>Error</source> <translation>Feil</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="235"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> <source>Find Uemis dive computer</source> <translation>Finn Uemis dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="260"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> <source>Cancel download</source> <translation>Avbryt nedlasting</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <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="369"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> <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="395"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> <source>Retry download</source> <translation>Prøv nedlasting på nytt</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="344"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Log files (*.log)</source> <translation>Loggfiler (*.log)</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="357"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="358"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Lagring av dump fra libdivecomputer vil IKKE laste ned dykk til dykkeloggen.</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="370"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> <source>Dump files (*.bin)</source> <translation>Dumpfiler (*.bin)</translation> </message> @@ -3539,27 +3583,27 @@ p, li { white-space: pre-wrap; } <translation>Last ned</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="233"/> <source>Downloaded dives</source> <translation>Nedlastede dykk</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="236"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="243"/> <source>Select all</source> <translation>Velg alle</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="243"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="250"/> <source>Unselect all</source> <translation>Velg vekk alle</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Cancel</source> <translation>Avbryt</translation> @@ -3651,12 +3695,12 @@ p, li { white-space: pre-wrap; } <translation>Koble til Facebook text placeholder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="257"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Bruk "Del på"-menyen for å koble Subsurface fra Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Logg inn for å koble til Facebook. Dette gjør at Subsurface kan poste dykk på veggen din</translation> </message> @@ -3664,28 +3708,24 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/> - <source>Photo upload sucessfull</source> - <translation>Lastet opp bilde</translation> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <source>Facebook logged in successfully</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="218"/> - <source>Your dive profile was updated to Facebook.</source> - <translation>Dykkeprofilen din ble oppdatert på Facebook.</translation> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <source>Error, unknown user id, cannot login.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="222"/> - <source>Photo upload failed</source> - <translation>Fotoopplasting feilet</translation> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <source>Dive uploaded successfully to Facebook</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="223"/> - <source>Your dive profile was not updated to Facebook, - please send the following to the developer. -</source> - <translation>Dykkeprofilen din ble ikke oppdatert på Facebook, -send gjerne følgende til utvikleren. -</translation> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3746,9 +3786,17 @@ send gjerne følgende til utvikleren. </message> </context> <context> + <name>ForwardButton</name> + <message> + <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="50"/> + <source>Navigate Forward</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="393"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="396"/> <source>Back</source> <translation>Tilbake</translation> </message> @@ -3898,6 +3946,11 @@ send gjerne følgende til utvikleren. <source>Tags</source> <translation>Emner</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <source>Country</source> + <translation>Land</translation> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3921,7 +3974,7 @@ send gjerne følgende til utvikleren. </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="216"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> <source>Dive site management</source> <translation>Dykkestedsdatabase</translation> </message> @@ -3943,7 +3996,7 @@ send gjerne følgende til utvikleren. Er du sikker på at du vil fortsette?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="223"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> <source>You are editing a dive site</source> <translation>Du redigerer et dykkested</translation> </message> @@ -4166,17 +4219,17 @@ Er du sikker på at du vil fortsette?</translation> <translation>Tursted</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="711"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> <source>New dive site</source> <translation>Nytt dykkested</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>Discard the changes?</source> <translation>Slette endringer?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> <source>You are about to discard your changes.</source> <translation>Du er i ferd med å droppe endringene dine.</translation> </message> @@ -4235,7 +4288,7 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="512"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> <source>Open</source> <translation>Åpne</translation> </message> @@ -4531,13 +4584,13 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="226"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> <source>&Undo</source> <translation>Angre</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> <source>&Redo</source> <translation>Gjør om</translation> </message> @@ -4577,166 +4630,166 @@ Er du sikker på at du vil fortsette?</translation> <translation>Skru skylagring på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="326"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> <source>Connect to</source> <translation>Koble til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> <source>Disconnect from</source> <translation>Koble fra</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="503"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="548"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1576"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> <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="509"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> <source>Open file</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="513"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2009"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="622"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> <source>Traverse image directories</source> <translation>Gå gjennom bildekataloger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="625"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> <source>Scanning images...(this can take a while)</source> <translation>Går gjennom bilder... (dette kan ta en stund)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="587"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="659"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="805"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="914"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="999"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1005"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1880"/> + <location filename="../desktop-widgets/divelistview.cpp" line="584"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="588"/> + <location filename="../desktop-widgets/divelistview.cpp" line="585"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="684"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Lagre eller avbryt redigeringen før du lukker fila.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="805"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Lagre eller avbryt redigeringa før du legger til et nytt dykk.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="914"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> <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="999"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1880"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <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="1005"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Prøver å redigere et dykk som ikke er lagt til manuelt.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1052"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> <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="1278"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> <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="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1284"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> <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="1603"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1604"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1701"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>[local cache for] %1</source> <translation>[lokal cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1703"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> <source>[cloud storage for] %1</source> <translation>[skylager for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> <source>Opening datafile from older version</source> <translation>Åpner datafil fra eldre versjon</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1820"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> <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="1831"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1832"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Loggfiler (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran-filer (*.can *.CAN);;CSV-filer (*.csv *.CSV);;DiveLog.de-filer (*.dld *.DLD);;JDiveLog-filer (*.jlb *.JLB);;Liquivision-filer (*.lvd *.LVD);;MkVI-filer (*.txt *.TXT);;Suunto-filer (*.sde *.db *.SDE *.DB);;Divesoft-filer (*.dlf *.DLF);;UDDF/UDCF-filer (*.uddf *.udcf *.UDDF *.UDCF);;XML-filer (*.xml *.XML);;APD log-filer (*.apd *.APD);;Datatrak/WLog-filer (*.log *.LOG);;OSTCtools-filer (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Alle filer (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2009"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Contacting cloud service...</source> <translation>Kontakter skylager...</translation> </message> @@ -4773,6 +4826,15 @@ Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på </message> </context> <context> + <name>MapWidgetError</name> + <message> + <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <source>MapWidget.qml failed to load! +The QML modules QtPositioning and QtLocation could be missing!</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>MultiFilter</name> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="644"/> @@ -4843,89 +4905,89 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="340"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> <source>Open circuit</source> <translation>Åpent system</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="340"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="340"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="428"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="429"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> <source>Last stop at 20ft</source> <translation>Siste stopp ved 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> <source>50% avg. depth to 20ft</source> <translation>50% av snittdybde til 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>20ft to surface</source> <translation>20ft til overflaten</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>Last stop at 6m</source> <translation>Siste stopp ved 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> <source>50% avg. depth to 6m</source> <translation>50% av snittdybde til 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>6m to surface</source> <translation>6m til overflaten</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> <source>cuft/min</source> <translation>ft³/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="450"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="451"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="460"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> <source>psi</source> <translation>psi</translation> </message> @@ -5120,47 +5182,42 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <translation>Valg for visning av deko-tak</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="217"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="283"/> <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="197"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="217"/> <source>Algorithm for calculated ceiling:</source> <translation>Algoritme for utregnet deko-tak</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="257"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="234"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/> <source>GFHigh</source> <translation>GF høy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="334"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="327"/> <source>GFLow</source> <translation>GF lav</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> - <source>GFLow at max. depth</source> - <translation>GF low ved maks dybde</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="320"/> <source>pSCR options:</source> <translation>pSCR-valg:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="277"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="224"/> <source>Dilution ratio</source> <translation>Fortynningsratio</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="197"/> <source>1:</source> <translation>1:</translation> </message> @@ -5200,7 +5257,7 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <translation>Standard setpoint i dykkeplanlegger</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="247"/> <source>Conservatism level</source> <translation>Konservatisme</translation> </message> @@ -5210,38 +5267,38 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <translation>B&ühlmann</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="290"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="254"/> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="234"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="267"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/> <source>Metabolic rate O₂</source> <translation>Metabolisk rate O₂</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/> <source>&VPM-B</source> <translation>&VPM-B</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="347"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="340"/> <source>Misc</source> <translation>Ymse</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="346"/> <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="360"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/> <source>Show mean depth in Profile</source> <translation>Vis snittdybde i profil</translation> </message> @@ -5881,6 +5938,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <name>QMLManager</name> <message> <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> <source>Starting...</source> <translation>Starter...</translation> </message> @@ -5895,131 +5953,131 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> <source>working in no-cloud mode</source> <translation>jobber i ikke-sky-modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="240"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="249"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> <source>no cloud credentials</source> <translation>ingen påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="250"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="321"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> <source>Please enter valid cloud credentials.</source> <translation>Legg in påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="289"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> <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="295"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="335"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> <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="356"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Testing cloud credentials</source> <translation>Tester påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> <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="378"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="384"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> <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="416"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>Cloud credentials are invalid</source> <translation>Påloggingsdetaljer for skyen er ugyldige</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="429"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> <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="442"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> <source>Cannot open cloud storage: %1</source> <translation>Kan ikke åpne skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="454"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> <source>Cannot connect to cloud storage</source> <translation>Kan ikke koble til skylagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="478"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> <source>Cloud storage error: %1</source> <translation>Feil i skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="578"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> <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="603"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> <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="773"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="774"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="774"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="775"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1162"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> <source>Unknown GPS location</source> <translation>Ukjent GPS-posisjon</translation> </message> @@ -6158,22 +6216,22 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Maksimum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="637"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="638"/> <source>Invalid response from server</source> <translation>Ugyldig svar fra tjener</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="645"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="646"/> <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="691"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="692"/> <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="698"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="699"/> <source>Malformed XML response. Line %1: %2</source> <translation>Feil formattert XML-svar. Linje %1: %2</translation> </message> @@ -6263,71 +6321,121 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Valg</translation> </message> <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> + <source>Undefined</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <source>Incorrect username/password combination</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <source>Credentials need to be verified</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <source>Credentials verified</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <source>No cloud mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="30"/> + <source>Cloud status</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../mobile-widgets/qml/Settings.qml" line="38"/> + <source>Email</source> + <translation>Epost</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="44"/> + <source>Not applicable</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="52"/> + <source>Change</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="59"/> + <source>Status</source> + <translation>Status</translation> + </message> + <message> + <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="46"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="92"/> <source>Blue</source> <translation>Blå</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="61"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="113"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="166"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="107"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="159"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="212"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="76"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="128"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="181"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="122"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="174"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="227"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="99"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="145"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="151"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="197"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="215"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="261"/> <source>Subsurface GPS data webservice</source> <translation>Webtjeneste for Subsurface GPS-data</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="224"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="270"/> <source>Distance threshold (meters)</source> <translation>Terskelverdi for avstand (meter)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="240"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="286"/> <source>Time threshold (minutes)</source> <translation>Terskelverdi for tid (minutter)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="267"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="313"/> <source>Dive computer</source> <translation>Dykkecomputer</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="276"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="322"/> <source>Save detailed log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="299"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="345"/> <source>Developer</source> <translation>Utvikler</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="308"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="354"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -6541,54 +6649,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="307"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <source>Small</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <source>Medium</source> + <translation>Medium</translation> + </message> + <message> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> <source>Dive date: %1 </source> <translation>Dato: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="310"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> <source>Duration: %1 </source> <translation>Varighet: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="311"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>t</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="312"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="315"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive location: %1 </source> <translation>Sted: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="318"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="321"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> <source>Divemaster: %1 </source> <translation>Dykkeleder: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="324"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source> %1</source> <translation> @@ -6603,82 +6721,92 @@ Files with inappropriate date/time</source> <translation>Dialogboks</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="25"/> - <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> - <translation>Teksten til høyre vil bli postet som beskrivelsen til bildet på Facebook. Albumnavn er obligatorisk (dykkeprofilen vil bli postet til albumet).</translation> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/> + <source>Small</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/> + <source>Medium</source> + <translation>Medium</translation> + </message> + <message> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/> + <source>Big</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/> + <source>The text to the right will be posted as the description with your dive profile graph to Facebook. The album name is required (the profile graph will be posted to that album).</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="38"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="57"/> <source>Album</source> <translation>Album</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="45"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="64"/> <source>The profile picture will be posted in this album (required)</source> <translation>Dykkeprofilen vil bli postet i dette albumet (obligatorisk)</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="52"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="71"/> <source>Include</source> <translation>Inkluder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="59"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="78"/> <source>Date and time</source> <translation>Dato og tid</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="66"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="85"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="73"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="92"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="80"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="99"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="87"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="106"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="94"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="113"/> <source>Notes</source> <translation>Notater</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="107"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="126"/> <source>Facebook post preview</source> <translation>Forhåndsvisning av Facebookpost</translation> </message> + <message> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/> + <source>Image Size</source> + <translation type="unfinished"/> + </message> </context> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> - <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials. -</source> - <translation>Legg inn påloggingsdetaljer for å bruke Subsurface-mobile med skylagring</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/> - <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here. - -</source> - <translation>Hvis dette er første gang du bruker skylagring med Subsurface, legg inn din epostadresse (med små bokstaver) og passord (bokstaver og tall). Serveren vil sende en PIN til epostadressen din, denne må du legge inn her. - -</translation> + <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/> - <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source> - <translation>For å bruke Subsurface-modbile kun med lokal data, velg "ingen sky"-ikonet under.</translation> + <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> + <translation type="unfinished"/> </message> </context> <context> @@ -6717,47 +6845,47 @@ Files with inappropriate date/time</source> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="409"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="410"/> <source>Enter User ID and click Download</source> <translation>Skriv inn bruker-ID og trykk Last ned</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="431"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="432"/> <source>Webservice</source> <translation>Nettjeneste</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="517"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="518"/> <source>Connecting...</source> <translation>Kobler til...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="537"/> <source>Download finished</source> <translation>Nedlasting er ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="550"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/> <source>Download error: %1</source> <translation>Feil ved nedlasting: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="561"/> <source>Connection error: </source> <translation>Forbindelsesfeil:</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="563"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="564"/> <source>Invalid user identifier!</source> <translation>Ugyldig bruker-ID!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="566"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="567"/> <source>Cannot parse response!</source> <translation>Kan ikke lese svar!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="569"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="570"/> <source>Download successful</source> <translation>Nedlasting ferdig</translation> </message> @@ -6864,29 +6992,29 @@ Files with inappropriate date/time</source> <translation>Saltholdighet</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="71"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="72"/> <source>/min</source> <translation>/min</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="78"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/> <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="78"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="78"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="84"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/> <source>d</source> <translation type="unfinished"/> </message> @@ -7317,107 +7445,112 @@ fra luft og bruker: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="69"/> + <location filename="../qt-models/divetripmodel.cpp" line="72"/> <source>(%1 shown)</source> <translation>(%1 vist)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="212"/> + <location filename="../qt-models/divetripmodel.cpp" line="225"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="215"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="218"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="221"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="221"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="221"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="224"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="227"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="236"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Cylinder</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>Max. CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="230"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Weight(%1)</source> <translation>Vekt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="230"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="230"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="233"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="239"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Gas</source> <translation>Gass</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="257"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="257"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Photos before/during/after dive</source> <translation>Bilder før/under/etter dykk</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <source>Country</source> + <translation>Land</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Location</source> <translation>Sted</translation> </message> @@ -7735,12 +7868,12 @@ Language: %1</source> <translation>Last opp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="338"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="339"/> <source>Operation timed out</source> <translation>Handlingen fikk tidsavbrudd</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="359"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="360"/> <source>Transferring data...</source> <translation>Overfører data...</translation> </message> @@ -7766,8 +7899,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="533"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="564"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> <source>No error</source> <translation>Ingen feil</translation> </message> @@ -7891,7 +8024,7 @@ Snitt</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="790"/> + <location filename="../core/libdivecomputer.c" line="791"/> <source>Error parsing the header</source> <translation>Kunne ikke lese header</translation> </message> @@ -7899,7 +8032,7 @@ Snitt</translation> <context> <name>gettectFromC</name> <message> - <location filename="../core/profile.c" line="1363"/> + <location filename="../core/profile.c" line="1364"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> @@ -7911,7 +8044,7 @@ Snitt</translation> <location filename="../core/cochran.c" line="304"/> <location filename="../core/cochran.c" line="310"/> <location filename="../core/cochran.c" line="380"/> - <location filename="../core/libdivecomputer.c" line="252"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>deco stop</source> <translation>dekostopp</translation> </message> @@ -7919,7 +8052,7 @@ Snitt</translation> <location filename="../core/cochran.c" line="331"/> <location filename="../core/cochran.c" line="385"/> <location filename="../core/file.c" line="771"/> - <location filename="../core/libdivecomputer.c" line="254"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>ascent</source> <translation>oppstigning</translation> </message> @@ -7931,20 +8064,20 @@ Snitt</translation> </message> <message> <location filename="../core/cochran.c" line="343"/> - <location filename="../core/libdivecomputer.c" line="270"/> + <location filename="../core/libdivecomputer.c" line="271"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="269"/> + <location filename="../core/libdivecomputer.c" line="270"/> <source>maxdepth</source> <translation>maksdybde</translation> </message> <message> <location filename="../core/cochran.c" line="353"/> <location filename="../core/cochran.c" line="399"/> - <location filename="../core/libdivecomputer.c" line="271"/> + <location filename="../core/libdivecomputer.c" line="272"/> <source>pO₂</source> <translation>pO₂</translation> </message> @@ -7953,28 +8086,28 @@ Snitt</translation> <location filename="../core/cochran.c" line="409"/> <location filename="../core/cochran.c" line="416"/> <location filename="../core/file.c" line="852"/> - <location filename="../core/libdivecomputer.c" line="262"/> - <location filename="../core/libdivecomputer.c" line="276"/> + <location filename="../core/libdivecomputer.c" line="263"/> + <location filename="../core/libdivecomputer.c" line="277"/> <source>gaschange</source> <translation>gassbytte</translation> </message> <message> <location filename="../core/cochran.c" line="365"/> <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../core/cochran.c" line="374"/> <location filename="../core/cochran.c" line="421"/> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>ceiling</source> <translation>tak</translation> </message> <message> <location filename="../core/cochran.c" line="390"/> - <location filename="../core/libdivecomputer.c" line="257"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>transmitter</source> <translation>sender</translation> </message> @@ -8236,8 +8369,8 @@ Snitt</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1126"/> - <location filename="../core/planner.c" line="1129"/> + <location filename="../core/planner.c" line="1124"/> + <location filename="../core/planner.c" line="1127"/> <source>oxygen</source> <translation>oksygen</translation> </message> @@ -8327,10 +8460,10 @@ Snitt</translation> <translation>(%s) eller (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="498"/> + <location filename="../core/divelist.c" line="497"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1122"/> - <location filename="../core/planner.c" line="1125"/> + <location filename="../core/planner.c" line="1120"/> + <location filename="../core/planner.c" line="1123"/> <source>air</source> <translation>luft</translation> </message> @@ -8558,213 +8691,218 @@ Snitt</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="238"/> - <location filename="../core/parse-xml.c" line="3456"/> + <location filename="../core/libdivecomputer.c" line="239"/> + <location filename="../core/parse-xml.c" line="3457"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="251"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>none</source> <translation>ingen</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="256"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>workload</source> <translation>arbeidsbelastning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="258"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>violation</source> <translation>brudd</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="259"/> + <location filename="../core/libdivecomputer.c" line="260"/> <source>bookmark</source> <translation>bokmerke</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="260"/> + <location filename="../core/libdivecomputer.c" line="261"/> <source>surface</source> <translation>overflate</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="261"/> + <location filename="../core/libdivecomputer.c" line="262"/> <source>safety stop</source> <translation>sikkerhetsstopp</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="263"/> + <location filename="../core/libdivecomputer.c" line="264"/> <source>safety stop (voluntary)</source> <translation>sikkerhetsstopp (frivillig)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="264"/> + <location filename="../core/libdivecomputer.c" line="265"/> <source>safety stop (mandatory)</source> <translation>sikkerhetsstopp (obligatorisk)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="266"/> <source>deepstop</source> <translation>dypstopp</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="266"/> + <location filename="../core/libdivecomputer.c" line="267"/> <source>ceiling (safety stop)</source> <translation>tak (sikkerhetsstopp)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="267"/> + <location filename="../core/libdivecomputer.c" line="268"/> <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="268"/> + <location filename="../core/libdivecomputer.c" line="269"/> <source>divetime</source> <translation>dykketid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="272"/> + <location filename="../core/libdivecomputer.c" line="273"/> <source>airtime</source> <translation>lufttid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="273"/> + <location filename="../core/libdivecomputer.c" line="274"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="274"/> + <location filename="../core/libdivecomputer.c" line="275"/> <source>heading</source> <translation>retning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="275"/> + <location filename="../core/libdivecomputer.c" line="276"/> <source>tissue level warning</source> <translation>Advarsel: nivå i vev</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="285"/> + <location filename="../core/libdivecomputer.c" line="286"/> <source>invalid event number</source> <translation>ugyldig hendelsesnummer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="606"/> + <location filename="../core/libdivecomputer.c" line="607"/> <source>Error parsing the datetime</source> <translation>Feil ved lesing av dato</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="624"/> + <location filename="../core/libdivecomputer.c" line="625"/> <source>Dive %d: %s</source> <translation>Dykk %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the divetime</source> <translation>Feil ved lesing av dykketid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="640"/> + <location filename="../core/libdivecomputer.c" line="641"/> <source>Error parsing the maxdepth</source> <translation>Feil ved lesing av maksdybde</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="659"/> + <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="679"/> + <location filename="../core/libdivecomputer.c" line="680"/> <source>Error parsing the gas mix count</source> <translation>Feil ved lesing av gassmiksantall</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="691"/> + <location filename="../core/libdivecomputer.c" line="692"/> <source>Error obtaining water salinity</source> <translation>Feil ved lesing av salthetsgrad</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="700"/> + <location filename="../core/libdivecomputer.c" line="701"/> <source>Error obtaining surface pressure</source> <translation>Klarte ikke å hente overflatetrykk</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="725"/> + <location filename="../core/libdivecomputer.c" line="726"/> <source>Error obtaining dive mode</source> <translation>Kunne ikke hente dykkemodus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="745"/> + <location filename="../core/libdivecomputer.c" line="746"/> <source>Error parsing the gas mix</source> <translation>Feil ved lesing av gassmiks</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="770"/> + <location filename="../core/libdivecomputer.c" line="771"/> <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="776"/> + <location filename="../core/libdivecomputer.c" line="777"/> <source>Error registering the data</source> <translation>Feil ved registrering av data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="797"/> + <location filename="../core/libdivecomputer.c" line="798"/> <source>Error parsing the samples</source> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="804"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="938"/> + <location filename="../core/libdivecomputer.c" line="939"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="957"/> + <location filename="../core/libdivecomputer.c" line="958"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1020"/> <source>Error registering the event handler.</source> <translation>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1024"/> + <location filename="../core/libdivecomputer.c" line="1025"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1045"/> + <location filename="../core/libdivecomputer.c" line="1046"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1084"/> + <location filename="../core/libdivecomputer.c" line="1085"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1091"/> + <location filename="../core/libdivecomputer.c" line="1094"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1116"/> + <location filename="../core/libdivecomputer.c" line="1119"/> <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> <translation type="unfinished"/> </message> <message> + <location filename="../core/libdivecomputer.c" line="1128"/> + <source>No new dives downloaded from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1270"/> + <location filename="../core/parse-xml.c" line="1271"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>Flere GPS-posisjoner for dette steder; også %s @@ -8772,7 +8910,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1332"/> + <location filename="../core/parse-xml.c" line="1333"/> <source>additional name for site: %s </source> <translation>ytterligere navn for sted: %s @@ -8807,12 +8945,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2094"/> + <location filename="../core/parse-xml.c" line="2095"/> <source>Failed to parse '%s'</source> <translation>Kunne ikke lese '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3978"/> + <location filename="../core/parse-xml.c" line="3979"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åpne stilark %s</translation> </message> @@ -8828,21 +8966,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="387"/> - <location filename="../core/plannernotes.c" line="393"/> - <location filename="../core/plannernotes.c" line="425"/> - <location filename="../core/plannernotes.c" line="460"/> - <location filename="../core/plannernotes.c" line="472"/> + <location filename="../core/plannernotes.c" line="392"/> + <location filename="../core/plannernotes.c" line="398"/> + <location filename="../core/plannernotes.c" line="431"/> + <location filename="../core/plannernotes.c" line="466"/> + <location filename="../core/plannernotes.c" line="478"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="328"/> + <location filename="../core/plannernotes.c" line="333"/> <source>, effective GF=%d/%d</source> <translation>, effektiv GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="320"/> + <location filename="../core/planner.c" line="318"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>Endring av SP</translation> @@ -8858,93 +8996,93 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="109"/> + <location filename="../core/plannernotes.c" line="108"/> + <source>Runtime: %dmin<br></div></source> + <translation>Kjøretid:%dmin<br></div></translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> <source>depth</source> <translation>dybde</translation> </message> <message> - <location filename="../core/plannernotes.c" line="112"/> + <location filename="../core/plannernotes.c" line="117"/> <source>duration</source> <translation>lengde</translation> </message> <message> - <location filename="../core/plannernotes.c" line="115"/> + <location filename="../core/plannernotes.c" line="120"/> <source>runtime</source> <translation>løpetid</translation> </message> <message> - <location filename="../core/plannernotes.c" line="118"/> + <location filename="../core/plannernotes.c" line="123"/> <source>gas</source> <translation>gass</translation> </message> <message> - <location filename="../core/plannernotes.c" line="165"/> + <location filename="../core/plannernotes.c" line="170"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u i %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="173"/> + <location filename="../core/plannernotes.c" line="178"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u på %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="186"/> + <location filename="../core/plannernotes.c" line="191"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="193"/> + <location filename="../core/plannernotes.c" line="198"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="239"/> + <location filename="../core/plannernotes.c" line="244"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="242"/> - <location filename="../core/plannernotes.c" line="246"/> + <location filename="../core/plannernotes.c" line="247"/> + <location filename="../core/plannernotes.c" line="251"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="255"/> - <location filename="../core/plannernotes.c" line="267"/> + <location filename="../core/plannernotes.c" line="260"/> + <location filename="../core/plannernotes.c" line="272"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="290"/> + <location filename="../core/plannernotes.c" line="295"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Bytt gass til %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="292"/> + <location filename="../core/plannernotes.c" line="297"/> <source>Switch gas to %s</source> <translation>Bytt til gass %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="312"/> + <location filename="../core/plannernotes.c" line="317"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="314"/> + <location filename="../core/plannernotes.c" line="319"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="329"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Dekomodell: VPM-B med nominell konservatisme</translation> </message> <message> - <location filename="../core/plannernotes.c" line="418"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="98"/> <source>Subsurface</source> @@ -8966,87 +9104,92 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>dykkeplan</b> laget på</translation> </message> <message> - <location filename="../core/plannernotes.c" line="104"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Runtime: %dmin VARIATIONS<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="324"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomodell: Bühlmann ZHL-16C med GF Low = %d%% og GF High = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="326"/> + <location filename="../core/plannernotes.c" line="331"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Dekomodell: VPM-B med +%d konservervatisme</translation> </message> <message> - <location filename="../core/plannernotes.c" line="332"/> + <location filename="../core/plannernotes.c" line="337"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomodell: Rekreasjonsmodus basert på Bühlmann ZHL-16B med GF Low = %d%% og GF High = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="340"/> + <location filename="../core/plannernotes.c" line="345"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>ATM-trykk: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="358"/> + <location filename="../core/plannernotes.c" line="363"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gassforbruk (CCR-etapper ekskludert):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="360"/> + <location filename="../core/plannernotes.c" line="365"/> <source>Gas consumption (based on SAC</source> <translation>Gassforbruk (basert på SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="388"/> + <location filename="../core/plannernotes.c" line="393"/> <source>this is more gas than available in the specified cylinder!</source> <translation>dette er mer gass en det som er tilgjengelig i tanken!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="394"/> + <location filename="../core/plannernotes.c" line="399"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>ikke nok i reserve til å dele gass under oppstigning!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="426"/> + <location filename="../core/plannernotes.c" line="421"/> + <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="432"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>påkrevet minimum gass ved oppstigning overstiger flasketrykk</translation> </message> <message> - <location filename="../core/plannernotes.c" line="429"/> + <location filename="../core/plannernotes.c" line="435"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s av <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s i planlagt oppstigning)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="438"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s under planlagt oppstigning) av <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="457"/> + <location filename="../core/plannernotes.c" line="463"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>høy pO₂-verdi %.2f ve %d:%02u med gass %s ved dybde %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="469"/> + <location filename="../core/plannernotes.c" line="475"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>lav pO₂ verdi %.2f ved %d:%02u med gass %s ved dybde %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="873"/> + <location filename="../core/planner.c" line="871"/> <source>Can't find gas %s</source> <translation>Finner ikke gassen %s</translation> </message> <message> - <location filename="../core/planner.c" line="1130"/> + <location filename="../core/planner.c" line="1128"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1316"/> + <location filename="../core/profile.c" line="1317"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9055,251 +9198,251 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1328"/> + <location filename="../core/profile.c" line="1329"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1334"/> + <location filename="../core/profile.c" line="1335"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1337"/> + <location filename="../core/profile.c" line="1338"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1339"/> + <location filename="../core/profile.c" line="1340"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1341"/> + <location filename="../core/profile.c" line="1342"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1343"/> + <location filename="../core/profile.c" line="1344"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1345"/> + <location filename="../core/profile.c" line="1346"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1348"/> + <location filename="../core/profile.c" line="1349"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1382"/> + <location filename="../core/profile.c" line="1383"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1374"/> + <location filename="../core/profile.c" line="1375"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Sikkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1324"/> + <location filename="../core/profile.c" line="1325"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1356"/> + <location filename="../core/profile.c" line="1357"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1360"/> + <location filename="../core/profile.c" line="1361"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1377"/> + <location filename="../core/profile.c" line="1378"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1385"/> + <location filename="../core/profile.c" line="1386"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deko: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1389"/> + <location filename="../core/profile.c" line="1390"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../core/profile.c" line="1391"/> + <location filename="../core/profile.c" line="1392"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1395"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1397"/> + <location filename="../core/profile.c" line="1398"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1405"/> + <location filename="../core/profile.c" line="1406"/> <source>In deco (calc) </source> <translation>I deko (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1408"/> + <location filename="../core/profile.c" line="1409"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1410"/> + <location filename="../core/profile.c" line="1411"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1414"/> + <location filename="../core/profile.c" line="1415"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1416"/> + <location filename="../core/profile.c" line="1417"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1419"/> + <location filename="../core/profile.c" line="1420"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1422"/> + <location filename="../core/profile.c" line="1423"/> <source>Calculated ceiling %.0f%s </source> <translation>Kalkulert tak %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1428"/> + <location filename="../core/profile.c" line="1429"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Vev %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1434"/> + <location filename="../core/profile.c" line="1435"/> <source>heart rate: %d </source> <translation>puls: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1436"/> + <location filename="../core/profile.c" line="1437"/> <source>bearing: %d </source> <translation>retning: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1439"/> + <location filename="../core/profile.c" line="1440"/> <source>mean depth to here %.1f%s </source> <translation>snittdybde hit %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1535"/> + <location filename="../core/profile.c" line="1536"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1539"/> - <location filename="../core/profile.c" line="1543"/> - <location filename="../core/profile.c" line="1547"/> + <location filename="../core/profile.c" line="1540"/> + <location filename="../core/profile.c" line="1544"/> + <location filename="../core/profile.c" line="1548"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1551"/> + <location filename="../core/profile.c" line="1552"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1555"/> + <location filename="../core/profile.c" line="1556"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1559"/> - <location filename="../core/profile.c" line="1563"/> + <location filename="../core/profile.c" line="1560"/> + <location filename="../core/profile.c" line="1564"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1570"/> + <location filename="../core/profile.c" line="1571"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1595"/> + <location filename="../core/profile.c" line="1596"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> @@ -9673,97 +9816,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(ingen dykk)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Sun</source> <translation>søn</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Mon</source> <translation>man</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Tue</source> <translation>tir</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Wed</source> <translation>ons</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Thu</source> <translation>tor</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Fri</source> <translation>fre</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Sat</source> <translation>lør</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="142"/> + <location filename="../core/subsurfacestartup.c" line="143"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="142"/> + <location filename="../core/subsurfacestartup.c" line="143"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="142"/> + <location filename="../core/subsurfacestartup.c" line="143"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="142"/> + <location filename="../core/subsurfacestartup.c" line="143"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="142"/> + <location filename="../core/subsurfacestartup.c" line="143"/> <source>May</source> <translation>mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="142"/> + <location filename="../core/subsurfacestartup.c" line="143"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="144"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="144"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="144"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="144"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="144"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="144"/> <source>Dec</source> <translation>des</translation> </message> @@ -10104,37 +10247,37 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>planlagt stopp over tak</translation> </message> <message> - <location filename="../core/taxonomy.c" line="7"/> + <location filename="../core/taxonomy.c" line="8"/> <source>None</source> <translation>Ingen</translation> </message> <message> - <location filename="../core/taxonomy.c" line="8"/> + <location filename="../core/taxonomy.c" line="9"/> <source>Ocean</source> <translation>Hav</translation> </message> <message> - <location filename="../core/taxonomy.c" line="9"/> + <location filename="../core/taxonomy.c" line="10"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../core/taxonomy.c" line="10"/> + <location filename="../core/taxonomy.c" line="11"/> <source>State</source> <translation>Stat</translation> </message> <message> - <location filename="../core/taxonomy.c" line="11"/> + <location filename="../core/taxonomy.c" line="12"/> <source>County</source> <translation>Fylke</translation> </message> <message> - <location filename="../core/taxonomy.c" line="12"/> + <location filename="../core/taxonomy.c" line="13"/> <source>Town</source> <translation>Tettsted</translation> </message> <message> - <location filename="../core/taxonomy.c" line="13"/> + <location filename="../core/taxonomy.c" line="14"/> <source>City</source> <translation>By</translation> </message> @@ -10182,12 +10325,12 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="233"/> + <location filename="../mobile-widgets/qml/main.qml" line="234"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="249"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Settings</source> <translation>Valg</translation> </message> @@ -10197,87 +10340,87 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Legg til dykk manuelt</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="145"/> + <location filename="../mobile-widgets/qml/main.qml" line="146"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="154"/> + <location filename="../mobile-widgets/qml/main.qml" line="155"/> <source>Apply GPS Fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="161"/> + <location filename="../mobile-widgets/qml/main.qml" line="162"/> <source>Manual sync with cloud</source> <translation>Manuell skysynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="180"/> + <location filename="../mobile-widgets/qml/main.qml" line="181"/> <source>Offline mode</source> <translation>Frakoblet modus</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="180"/> + <location filename="../mobile-widgets/qml/main.qml" line="181"/> <source>Enable auto cloud sync</source> <translation>Skru på automatisk skysynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="185"/> + <location filename="../mobile-widgets/qml/main.qml" line="186"/> <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 type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="194"/> + <location filename="../mobile-widgets/qml/main.qml" line="195"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="276"/> <source>Help</source> <translation>Hjelp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="199"/> + <location filename="../mobile-widgets/qml/main.qml" line="200"/> <source>Upload GPS data</source> <translation>Last opp GPS-data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="207"/> + <location filename="../mobile-widgets/qml/main.qml" line="208"/> <source>Download GPS data</source> <translation>Last ned GPS-data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="215"/> + <location filename="../mobile-widgets/qml/main.qml" line="216"/> <source>Show GPS fixes</source> <translation>Vis GPS-posisjoner</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="225"/> + <location filename="../mobile-widgets/qml/main.qml" line="226"/> <source>Clear GPS cache</source> <translation>Slett GPS-cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="257"/> + <location filename="../mobile-widgets/qml/main.qml" line="258"/> <source>Developer</source> <translation>Utvikler</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="260"/> + <location filename="../mobile-widgets/qml/main.qml" line="261"/> <source>App log</source> <translation>Applikasjonslogg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="267"/> + <location filename="../mobile-widgets/qml/main.qml" line="268"/> <source>Theme information</source> <translation>Temainformasjon</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="241"/> + <location filename="../mobile-widgets/qml/main.qml" line="242"/> <source>About</source> <translation>Om</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="233"/> + <location filename="../mobile-widgets/qml/main.qml" line="234"/> <source>Run location service</source> <translation>Kjør posisjonstjeneste</translation> </message> @@ -10424,7 +10567,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="780"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> <source>min</source> <translation>min</translation> </message> @@ -10485,22 +10628,32 @@ p, li { white-space: pre-wrap; } <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <source>Compute variations of plan (performance cost)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <source>Display plan variations</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>SAC factor</source> <translation>SAC-faktor</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="748"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <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="770"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> <source>Problem solving time</source> <translation>Problemløsningstid</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="777"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <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> @@ -10540,42 +10693,42 @@ p, li { white-space: pre-wrap; } <translation>Notater</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <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="694"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> <source>Display runtime</source> <translation>Vis løpetid</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="704"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> <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="707"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> <source>Display segment duration</source> <translation>Vis lengde på segment</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="714"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <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="717"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> <source>Display transitions in deco</source> <translation>Vis overganger i deko</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> <source>Verbatim dive plan</source> <translation>Utdypende dykkeplan</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> <source>Deco pO₂</source> <translation>pO₂ for deko</translation> </message> |