diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-02-09 09:29:54 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-02-09 09:29:54 -0800 |
| commit | 3e877ac8312a71a0a3c9c060123c9b94db744ad7 (patch) | |
| tree | 48498408bfeb28cbae236ea5f7030024d8339a9a /translations/subsurface_nb_NO.ts | |
| parent | 859098a37e48c1ecbbad4161e3fdfde3365f74b6 (diff) | |
| download | subsurface-3e877ac8312a71a0a3c9c060123c9b94db744ad7.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 | 1618 |
1 files changed, 828 insertions, 790 deletions
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index db9fc538d..29bdbc7b8 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -23,11 +23,8 @@ <source>Version: %1 © Subsurface developer team -2011-2017</source> - <translation>Versjon: %1 - -© Subsurface developer team -2011-2017</translation> +2011-2018</source> + <translation type="unfinished"/> </message> </context> <context> @@ -322,12 +319,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="540"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="547"/> <source>Person: </source> <translation>Person: </translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="541"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="548"/> <source>Searches for buddies and divemasters</source> <translation>Søk etter buddyer og dykkeledere</translation> </message> @@ -407,172 +404,172 @@ <context> <name>ColumnNameProvider</name> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Dive #</source> <translation>Dykk #</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Cyl. size</source> <translation>Tankstr.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Start pressure</source> <translation>Starttrykk</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>End pressure</source> <translation>Sluttrykk</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Max. depth</source> <translation>Maksdybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Avg. depth</source> <translation>Snittdybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Notes</source> <translation>Notater</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Tags</source> <translation>Emner</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>O₂</source> <translation>O₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>He</source> <translation>He</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>Sample time</source> <translation>Datapunkt: tid</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>Sample depth</source> <translation>Datapunkt: dybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>Sample temperature</source> <translation>Datapunkt: temperatur</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>Sample pO₂</source> <translation>Datapunkt: pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>Sample CNS</source> <translation>Datapunkt: CNS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>Sample NDL</source> <translation>Datapunkt: NDL</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> <source>Sample TTS</source> <translation>Datapunkt: TTS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> <source>Sample stopdepth</source> <translation>Datapunkt: stoppdybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> <source>Sample pressure</source> <translation>Datapunkt: trykk</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="51"/> <source>Sample sensor1 pO₂</source> <translation>Sample sensor1 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="51"/> <source>Sample sensor2 pO₂</source> <translation>Sample sensor2 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="51"/> <source>Sample sensor3 pO₂</source> <translation>Sample sensor3 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="51"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="52"/> <source>Sample setpoint</source> <translation>Sample settpunkt</translation> </message> @@ -1945,12 +1942,12 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="46"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> <source>Dive details</source> <translation>Detaljer for dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="140"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> <source>Delete dive</source> <translation>Slett dykk</translation> </message> @@ -1960,7 +1957,7 @@ <translation>Avbryt redigering</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="163"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="165"/> <source>Show on map</source> <translation>Vis på kart</translation> </message> @@ -1968,54 +1965,54 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="109"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="111"/> <source>Dive %1</source> <translation>Dykk %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="113"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="115"/> <source>Date:</source> <translation>Dato:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="125"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/> <source>Location:</source> <translation>Sted:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="141"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="142"/> <source>Coordinates:</source> <translation>Koordinater:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="154"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> <source>Use current GPS location:</source> <translation>Bruk nåværende GPS-posisjon:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="170"/> <source>Depth:</source> <translation>Dybde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="183"/> <source>Duration:</source> <translation>Lengde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="196"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/> <source>Air Temp:</source> <translation>Lufttemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="209"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/> <source>Water Temp:</source> <translation>Vanntemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="223"/> <source>Suit:</source> <translation>Drakt:</translation> </message> @@ -2025,47 +2022,47 @@ GPS-posisjon:</translation> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="248"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="247"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="261"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Weight:</source> <translation>Vekt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="275"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="273"/> <source>Cylinder:</source> <translation>Flaske:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="288"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="286"/> <source>Gas mix:</source> <translation>Gassmiks:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="302"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="300"/> <source>Start Pressure:</source> <translation>Starttrykk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="315"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="313"/> <source>End Pressure:</source> <translation>Sluttrykk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="328"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="341"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="339"/> <source>Visibility:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="355"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="353"/> <source>Notes:</source> <translation>Notater:</translation> </message> @@ -2141,23 +2138,38 @@ GPS-posisjon:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="160"/> + <location filename="../profile-widget/diveeventitem.cpp" line="178"/> <source> (cyl. %1)</source> <translation>(flaske %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="182"/> + <source>ICD</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/diveeventitem.cpp" line="183"/> + <source>ΔHe</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/diveeventitem.cpp" line="184"/> + <source>ΔN₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/diveeventitem.cpp" line="202"/> <source>Manual switch to OC</source> <translation>Manuelt bytte til OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="176"/> + <location filename="../profile-widget/diveeventitem.cpp" line="204"/> <source> begin</source> <comment>Starts with space!</comment> <translation> start</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="177"/> + <location filename="../profile-widget/diveeventitem.cpp" line="205"/> <source> end</source> <comment>Starts with space!</comment> <translation> slutt</translation> @@ -2195,23 +2207,23 @@ GPS-posisjon:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> <source>Dive list</source> <translation>Liste over dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> <source>Cloud credentials</source> <translation>Påloggingsinformasjon i skyen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Trykk '+'-knappen for å legge til et dykk (eller last ned dykk fra en dykkecomputer)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> <source>No dives in dive list</source> <translation>Ingen dykk i lista</translation> </message> @@ -2322,12 +2334,12 @@ GPS-posisjon:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <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="392"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="393"/> <source>Create a new dive site with this name</source> <translation>Opprett dykkested med dette navnet</translation> </message> @@ -2699,231 +2711,231 @@ GPS-posisjon:</translation> <translation>Dra emneknaggene til de korresponderende kolonnene under</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="360"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="533"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="361"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="534"/> <source>Tab</source> <translation>Tab</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="603"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="604"/> <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source> <translation>Noen kolonnetitler ble automatisk fylt ut. Dra og slipp disse titlene så de matcher kolonnene de er i.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="760"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/> <source>Sample time</source> <translation>Datapunkt: tid</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="762"/> <source>Sample depth</source> <translation>Datapunkt: dybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="764"/> <source>Sample temperature</source> <translation>Datapunkt: temperatur</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="766"/> <source>Sample pO₂</source> <translation>Datapunkt: pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="768"/> <source>Sample sensor1 pO₂</source> <translation>Sample sensor1 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="770"/> <source>Sample sensor2 pO₂</source> <translation>Sample sensor2 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="772"/> <source>Sample sensor3 pO₂</source> <translation>Sample sensor3 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="774"/> <source>Sample CNS</source> <translation>Datapunkt: CNS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="776"/> <source>Sample NDL</source> <translation>Datapunkt: NDL</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="778"/> <source>Sample TTS</source> <translation>Datapunkt: TTS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="780"/> <source>Sample stopdepth</source> <translation>Datapunkt: stoppdybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/> <source>Sample pressure</source> <translation>Datapunkt: trykk</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/> <source>Sample setpoint</source> <translation>Sample settpunkt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="758"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/> <source>Dive #</source> <translation>Dykk #</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="880"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="752"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="881"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="882"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="756"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="883"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="884"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="885"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="891"/> <source>Max. depth</source> <translation>Maksdybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="893"/> <source>Avg. depth</source> <translation>Snittdybde</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="924"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="926"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="927"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="914"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="915"/> <source>Cyl. size</source> <translation>Tankstr.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="916"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="917"/> <source>Start pressure</source> <translation>Starttrykk</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="918"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="919"/> <source>End pressure</source> <translation>Sluttrykk</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="920"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="921"/> <source>O₂</source> <translation>O₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="922"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="923"/> <source>He</source> <translation>He</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="886"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="887"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="889"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="895"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="897"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="687"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="899"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="687"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="688"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="688"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="689"/> <source>Visibility</source> <translation>Sikt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="689"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="690"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="901"/> <source>Notes</source> <translation>Notater</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="690"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="902"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="691"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="903"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="691"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="904"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="692"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="905"/> <source>Tags</source> <translation>Emner</translation> </message> @@ -2935,11 +2947,6 @@ GPS-posisjon:</translation> <source>(%n dive(s))</source> <translation><numerusform>(%n dykk)</numerusform><numerusform>(%n dykk)</numerusform></translation> </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> - <source>Multiple Buddies</source> - <translation>Flere buddies</translation> - </message> </context> <context> <name>DivePlanner</name> @@ -2975,65 +2982,64 @@ GPS-posisjon:</translation> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="220"/> - <source> kg/ℓ</source> - <translation> kg/ℓ</translation> + <source>kg/ℓ</source> + <translation>kg/ℓ</translation> </message> </context> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="159"/> + <location filename="../qt-models/diveplannermodel.cpp" line="163"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="194"/> - <location filename="../qt-models/diveplannermodel.cpp" line="279"/> + <location filename="../qt-models/diveplannermodel.cpp" line="263"/> <source>cyl.</source> <translation>syl.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="359"/> <source>Final depth</source> <translation>Siste dybde</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="361"/> <source>Run time</source> <translation>Løpetid</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="363"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="381"/> + <location filename="../qt-models/diveplannermodel.cpp" line="365"/> <source>Used gas</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="383"/> + <location filename="../qt-models/diveplannermodel.cpp" line="367"/> <source>CC setpoint</source> <translation>CC settpunkt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1024"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1008"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1030"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1014"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1033"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1017"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1080"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1064"/> <source>Stop times</source> <translation>Stopptider</translation> </message> @@ -3041,27 +3047,27 @@ GPS-posisjon:</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="112"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="113"/> <source>Dive planner points</source> <translation>Punkter i dykkplan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="117"/> <source>Available gases</source> <translation>Tilgjengelige gasser</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="117"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="118"/> <source>Add cylinder</source> <translation>Legg til flaske</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="144"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="145"/> <source>Add dive data point</source> <translation>Legg til punkt</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="153"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="154"/> <source>Save new</source> <translation>Lagre ny</translation> </message> @@ -3069,107 +3075,107 @@ GPS-posisjon:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Pressure</source> <translation>Trykk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>Color</source> <translation>Farge</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>User entered</source> <translation>Brukeren la inn</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure S</source> <translation>Trykk S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Pressure I</source> <translation>Trykk I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>Ceiling</source> <translation>Tak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Setpoint</source> <translation>Settpunkt</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Ambient pressure</source> <translation>Omgivelsestrykk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Heart rate</source> <translation>Hjertefrekvens</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Gradient factor</source> <translation>Gradientfaktor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> <source>Mean depth @ s</source> <translation>Snittdypde @ s</translation> </message> @@ -3233,142 +3239,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="478"/> - <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <location filename="../qt-models/divetripmodel.cpp" line="477"/> + <location filename="../qt-models/divetripmodel.cpp" line="529"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="481"/> - <location filename="../qt-models/divetripmodel.cpp" line="533"/> + <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="532"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="484"/> - <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="483"/> + <location filename="../qt-models/divetripmodel.cpp" line="535"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="487"/> + <location filename="../qt-models/divetripmodel.cpp" line="486"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="490"/> - <location filename="../qt-models/divetripmodel.cpp" line="542"/> + <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="541"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="496"/> + <location filename="../qt-models/divetripmodel.cpp" line="495"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="499"/> - <location filename="../qt-models/divetripmodel.cpp" line="551"/> + <location filename="../qt-models/divetripmodel.cpp" line="498"/> + <location filename="../qt-models/divetripmodel.cpp" line="550"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="493"/> + <location filename="../qt-models/divetripmodel.cpp" line="492"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> - <location filename="../qt-models/divetripmodel.cpp" line="554"/> + <location filename="../qt-models/divetripmodel.cpp" line="501"/> + <location filename="../qt-models/divetripmodel.cpp" line="553"/> <source>Cylinder</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> - <location filename="../qt-models/divetripmodel.cpp" line="557"/> + <location filename="../qt-models/divetripmodel.cpp" line="504"/> + <location filename="../qt-models/divetripmodel.cpp" line="556"/> <source>Gas</source> <translation>Gass</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="507"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> - <location filename="../qt-models/divetripmodel.cpp" line="565"/> + <location filename="../qt-models/divetripmodel.cpp" line="510"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> - <location filename="../qt-models/divetripmodel.cpp" line="568"/> + <location filename="../qt-models/divetripmodel.cpp" line="513"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="516"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="519"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> - <location filename="../qt-models/divetripmodel.cpp" line="574"/> + <location filename="../qt-models/divetripmodel.cpp" line="522"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="538"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="538"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="545"/> + <location filename="../qt-models/divetripmodel.cpp" line="544"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="548"/> + <location filename="../qt-models/divetripmodel.cpp" line="547"/> <source>Weight(%1)</source> <translation>Vekt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="548"/> + <location filename="../qt-models/divetripmodel.cpp" line="547"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="548"/> + <location filename="../qt-models/divetripmodel.cpp" line="547"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="562"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="562"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="571"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Photos before/during/after dive</source> <translation>Bilder før/under/etter dykk</translation> </message> @@ -3376,112 +3382,112 @@ p, li { white-space: pre-wrap; } <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="41"/> <source>no dives were selected</source> <translation>ingen dykk valgt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="51"/> <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="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="61"/> <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="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="125"/> <source>internal error</source> <translation>intern feil</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="133"/> <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="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="161"/> <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="745"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="822"/> <source>Done</source> <translation>Ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="665"/> <source>Uploading dive list...</source> <translation>Laster opp liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="697"/> <source>Downloading dive list...</source> <translation>Laster ned liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="738"/> <source>Downloading %1 dives...</source> <translation>Laster ned %1 dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="772"/> <source>Download finished - %1</source> <translation>Nedlasting er ferdig - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="786"/> <source>Problem with download</source> <translation>Kunne ikke laste ned</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="787"/> <source>The archive could not be opened: </source> <translation>Arkivet kunne ikke åpnes: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="796"/> <source>Corrupted download</source> <translation>Nedlastingen er skadet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="797"/> <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="937"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Upload finished</source> <translation>Opplasting er ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="836"/> <source>Upload failed</source> <translation>Opplasting feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="839"/> <source>Upload successful</source> <translation>Ferdig å laste opp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="842"/> <source>Login failed</source> <translation>Innlogging feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="845"/> <source>Cannot parse response</source> <translation>Kan ikke lese svar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="857"/> <source>Error: %1</source> <translation>Feil: %1</translation> </message> @@ -3505,52 +3511,52 @@ p, li { white-space: pre-wrap; } <translation>Kobler til dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="225"/> <source>Error</source> <translation>Feil</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="263"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="260"/> <source>Find Uemis dive computer</source> <translation>Finn Uemis dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="288"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="285"/> <source>Cancel download</source> <translation>Avbryt nedlasting</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="368"/> <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="366"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="369"/> <source>Log files</source> <translation>Loggfiler</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="394"/> <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="392"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="395"/> <source>Dump files</source> <translation>Dump-filer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="417"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/> <source>Retry download</source> <translation>Prøv nedlasting på nytt</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="380"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/> <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> @@ -3790,17 +3796,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="515"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="522"/> <source>Select All</source> <translation>Velg alle</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="516"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="523"/> <source>Unselect All</source> <translation>Velg ingen</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="517"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3824,8 +3830,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/listfilter.ui" line="57"/> - <source>...</source> - <translation>...</translation> + <source>Negate filter</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/listfilter.ui" line="60"/> + <source>¬</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3868,6 +3879,14 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>GasSelectionModel</name> + <message> + <location filename="../qt-models/models.cpp" line="52"/> + <source>cyl.</source> + <translation>syl.</translation> + </message> +</context> +<context> <name>GlobalDrawer</name> <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="396"/> @@ -3927,7 +3946,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="546"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="553"/> <source>Location: </source> <translation>Sted:</translation> </message> @@ -3935,32 +3954,32 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source> (same GPS fix)</source> <translation>(samme GPS-lokasjon)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="499"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source> (~%1 away</source> <translation> (~%1 borte</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n dykk her)</numerusform><numerusform>, %n dykk her)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="507"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(ingen eksisterende GPS-data, legg til GPS-data fra dette dykket)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="507"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="509"/> <source>(no GPS data)</source> <translation>(ingen GPS-data)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="509"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="511"/> <source>Pick site: </source> <translation>Velg sted:</translation> </message> @@ -3968,7 +3987,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="340"/> + <location filename="../qt-models/filtermodels.cpp" line="338"/> <source>No location set</source> <translation>Ingen sted er satt</translation> </message> @@ -4053,7 +4072,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="268"/> <source>Dive site management</source> <translation>Dykkestedsdatabase</translation> </message> @@ -4075,7 +4094,7 @@ p, li { white-space: pre-wrap; } Er du sikker på at du vil fortsette?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="275"/> <source>You are editing a dive site</source> <translation>Du redigerer et dykkested</translation> </message> @@ -4367,7 +4386,7 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> <source>Open</source> <translation>Åpne</translation> </message> @@ -4663,13 +4682,13 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="240"/> <source>&Undo</source> <translation>Angre</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="241"/> <source>&Redo</source> <translation>Gjør om</translation> </message> @@ -4704,68 +4723,69 @@ Er du sikker på at du vil fortsette?</translation> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> - <source>Take cloud storage online</source> - <translation>Skru skylagring på</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <source>Cloud storage online</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> <source>Connect to</source> <translation>Koble til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="394"/> <source>Disconnect from</source> <translation>Koble fra</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="544"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="589"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1630"/> <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="558"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="550"/> <source>Open file</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="670"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1991"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="554"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="691"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="614"/> <source>Don't save an empty log to the cloud</source> <translation>Ikke lagre en tom logg til skyen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="666"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> <source>Traverse image directories</source> <translation>Gå gjennom bildekataloger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="698"/> <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="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="703"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="854"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="972"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1067"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1854"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1008"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1097"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1103"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -4775,12 +4795,12 @@ Er du sikker på at du vil fortsette?</translation> <translation>Prøver å slå sammen dykk med %1min intervall mellom</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="261"/> <source>Template backup created</source> <translation>Sikkerhertskopi av templat opprettet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="262"/> <source>The following backup printing templates were created: %1 @@ -4803,202 +4823,219 @@ templatene være skrivebeskyttet og bør ikke redigeres direkte, siden programmet kan overskrive dem.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <source>Please save or cancel the current dive edit before going online</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="658"/> + <source>You have unsaved changes. Do you want to commit them to the cloud storage? +If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> + <source>Failure taking cloud storage online</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <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="854"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="890"/> <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="914"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="950"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="972"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1008"/> <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="1061"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1854"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1097"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <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="1067"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1103"/> <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="1114"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1150"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1335"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> <source>Dive log files</source> <translation>Dykkeloggfiler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1626"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1346"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1659"/> <source>Subsurface files</source> <translation>Subsurface-filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1348"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1349"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1395"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1396"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1397"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> <source>MkVI files</source> <translation>MkVI-filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> <source>All files</source> <translation>Alle filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <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="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <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="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="657"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <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="1625"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1658"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1713"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1744"/> <source>[local cache for] %1</source> <translation>[lokal cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1746"/> <source>[cloud storage for] %1</source> <translation>[skylager for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1838"/> <source>Opening datafile from older version</source> <translation>Åpner datafil fra eldre versjon</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1811"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1839"/> <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="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1850"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1991"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Kontakter skylager...</translation> </message> @@ -5047,7 +5084,7 @@ QML-modulene QtPositioning og QtLocation mangler muligens!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="590"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="597"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter viser %1 (av %2) dykk</translation> </message> @@ -5115,89 +5152,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="403"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> <source>Open circuit</source> <translation>Åpent system</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>Last stop at 20ft</source> <translation>Siste stopp ved 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>50% avg. depth to 20ft</source> <translation>50% av snittdybde til 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>20ft to surface</source> <translation>20ft til overflaten</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>Last stop at 6m</source> <translation>Siste stopp ved 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>50% avg. depth to 6m</source> <translation>50% av snittdybde til 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>6m to surface</source> <translation>6m til overflaten</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> <location filename="../desktop-widgets/diveplanner.cpp" line="508"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> <source>cuft/min</source> <translation>ft³/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> <location filename="../desktop-widgets/diveplanner.cpp" line="517"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="526"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="527"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="531"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="532"/> <source>psi</source> <translation>psi</translation> </message> @@ -5318,18 +5355,18 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <context> <name>PreferencesGeoreference</name> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="14"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="14"/> <source>Form</source> <translation>Skjema</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="20"/> <source>Dive site layout</source> <translation>Dykkested-layout</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5501,58 +5538,58 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <context> <name>PreferencesLanguage</name> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="14"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="14"/> <source>Form</source> <translation>Skjema</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="26"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="26"/> <source>UI language</source> <translation>Språk i brukergrensesnitt</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="32"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="32"/> <source>Use system default</source> <translation>Bruk standardverdier</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="55"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="55"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="74"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="74"/> <source>Date format</source> <translation>Datoformat</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>Foretrukket datoformat. Ofte brukte felter er</p><p>d (dag i måned)</p><p>ddd (fortkortet dagsnavn)</p><p>M (månedsnummer)</p><p>MMM (forkortet månedsnavn)</p><p>yy/yyyy (år med 2/4 sifre)</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="138"/> <source>Use UI language default</source> <translation>Bruk standard språk</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation>Dette brukes på steder der det er for liten plass til å vise full dato</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="93"/> <source>Short format</source> <translation>Kort format</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="132"/> <source>Time format</source> <translation>Tidsformat</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>Foretrukket tidsformat</p><p>Ofte brukte formater er</p><p>h (timer i 12-timersformat)</p><p>H (timer i 24-timersformat)</p><p>mm (minutter med 2 tall)</p><p>ss (sekunder med 2 tall)</p><p>t/tt (a/p eller am/pm)</p></body></html></translation> </message> @@ -5644,7 +5681,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="145"/> <source>Subsurface cloud storage</source> <translation>Skylager for Subsurface</translation> </message> @@ -5665,26 +5702,21 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="221"/> - <source>Sync to cloud in the background?</source> - <translation>Synkronisere til skylager i bakgrunnen?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="228"/> <source>Save Password locally?</source> <translation>Lagre passord lokalt?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="238"/> + <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> <source>Subsurface web service</source> <translation>Subsurface webtjeneste</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="250"/> + <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> <source>Default user ID</source> <translation>Standard bruker-ID</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="260"/> + <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> <source>Save user ID locally?</source> <translation>Lagre bruker-ID lokalt?</translation> </message> @@ -5714,24 +5746,33 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>SOCKS-proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="73"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="94"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/> + <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="76"/> + <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="113"/> <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="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Skylager for Subsurface (bruker godkjent)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="141"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Subsurface skylagring (feil passord)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="143"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Subsurface skylagring (PIN kreves)</translation> </message> @@ -6060,123 +6101,123 @@ Eksporter denne templaten til en annen fil.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="756"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="752"/> <source>Unknown dive computer</source> <translation>Ukjent computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="803"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Funksjonen Vis NDL/TTS ble avskrudd siden den brukte for mye ressurser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1379"/> <source>Add gas change</source> <translation>Legg til gassbytte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1365"/> <source>Make first dive computer</source> <translation>Velg som første dykkecomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="774"/> + <location filename="../profile-widget/profilewidget2.cpp" line="748"/> <source>Planned dive</source> <translation>Planlagt dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="776"/> + <location filename="../profile-widget/profilewidget2.cpp" line="750"/> <source>Manually added dive</source> <translation>Dykk lagt til manuelt</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1367"/> <source>Delete this dive computer</source> <translation>Slett denne computeren</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1382"/> <source> (cyl. %1)</source> <translation>(flaske %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> <source>Add setpoint change</source> <translation>Legg til endring av setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> <source>Add bookmark</source> <translation>Legg til bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1394"/> <source>Edit the profile</source> <translation>Rediger profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1398"/> <source>Remove event</source> <translation>Fjern hendelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1403"/> <source>Hide similar events</source> <translation>Skjul lignende hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Juster trykket på syl. %1 (interpolert som %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <source>Unhide all events</source> <translation>Vis alle hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1498"/> <source>Hide events</source> <translation>Skjul hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1498"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hendelser?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> <source>Remove the selected event?</source> <translation>Fjern den valgte hendelsen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1657"/> <source>Edit name of bookmark</source> <translation>Rediger navn på bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1658"/> <source>Custom name:</source> <translation>Tilpasset navn:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1663"/> <source>Name is too long!</source> <translation>Navnet er for langt</translation> </message> @@ -6184,147 +6225,147 @@ Eksporter denne templaten til en annen fil.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="141"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="291"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="168"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="325"/> <source>Starting...</source> <translation>Starter...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="192"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>Open local dive data file</source> <translation>Åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="200"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="225"/> <source>Opening local data file failed</source> <translation>Kunne ikke åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="232"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="257"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dykk hentet fra lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="315"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>working in no-cloud mode</source> <translation>jobber i ikke-sky-modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="353"/> <source>Error parsing local storage, giving up</source> <translation>Klarte ikke å lese fra lokalt lagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="362"/> <source>no cloud credentials</source> <translation>ingen påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="330"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="435"/> <source>Please enter valid cloud credentials.</source> <translation>Legg in påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="371"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="402"/> <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="377"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="408"/> <source>Invalid format for email address</source> <translation>Feil format på epostadresse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="448"/> <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="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> <source>Testing cloud credentials</source> <translation>Tester påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="483"/> <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="461"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Incorrect cloud credentials</source> <translation>Feil bruker/passord for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="467"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="497"/> <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="499"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cloud credentials are invalid</source> <translation>Påloggingsdetaljer for skyen er ugyldige</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="512"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/> <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="525"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/> <source>Cannot open cloud storage: %1</source> <translation>Kan ikke åpne skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="562"/> <source>Cannot connect to cloud storage</source> <translation>Kan ikke koble til skylagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="561"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="586"/> <source>Cloud credentials valid, loading dives...</source> <translation>Gyldig bruker/passord, henter dykk</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="596"/> <source>Cloud storage error: %1</source> <translation>Feil i skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="616"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Henter dykk fra lokalt lager ('ikke-sky-modus")</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="661"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="681"/> <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="686"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="706"/> <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="859"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="879"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="880"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="879"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="880"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="881"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="879"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1273"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1293"/> <source>Unknown GPS location</source> <translation>Ukjent GPS-posisjon</translation> </message> @@ -6443,7 +6484,7 @@ Eksporter denne templaten til en annen fil.</translation> <translation>sek</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="63"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="64"/> <source>Remove this point</source> <translation>Fjern dette punktet</translation> </message> @@ -6463,22 +6504,22 @@ Eksporter denne templaten til en annen fil.</translation> <translation>Maksimum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="626"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="512"/> <source>Invalid response from server</source> <translation>Ugyldig svar fra tjener</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="634"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="520"/> <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="680"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="566"/> <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="687"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="573"/> <source>Malformed XML response. Line %1: %2</source> <translation>Feil formattert XML-svar. Linje %1: %2</translation> </message> @@ -7102,54 +7143,54 @@ Filer med upassende dykkedato/-tid</translation> </message> <message> <location filename="../desktop-widgets/about.cpp" line="20"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2017</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-plattform dykkeloggprogramvare<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, og andre, 2011-2017</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2018</span></source> + <translation type="unfinished"/> </message> </context> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="284"/> <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="420"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="308"/> <source>Webservice</source> <translation>Nettjeneste</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="506"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="392"/> <source>Connecting...</source> <translation>Kobler til...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="525"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="411"/> <source>Download finished</source> <translation>Nedlasting er ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="539"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="425"/> <source>Download error: %1</source> <translation>Feil ved nedlasting: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="435"/> <source>Connection error: </source> <translation>Forbindelsesfeil:</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="438"/> <source>Invalid user identifier!</source> <translation>Ugyldig bruker-ID!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="441"/> <source>Cannot parse response!</source> <translation>Kan ikke lese svar!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="558"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="444"/> <source>Download successful</source> <translation>Nedlasting ferdig</translation> </message> @@ -7157,7 +7198,7 @@ Filer med upassende dykkedato/-tid</translation> <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="558"/> <source>Suits: </source> <translation>Drakter:</translation> </message> @@ -7165,7 +7206,7 @@ Filer med upassende dykkedato/-tid</translation> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="168"/> + <location filename="../qt-models/filtermodels.cpp" line="172"/> <source>No suit set</source> <translation>Ingen drakt er satt</translation> </message> @@ -7491,7 +7532,7 @@ fra luft og bruker: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="535"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="542"/> <source>Tags: </source> <translation>Emneord:</translation> </message> @@ -7499,7 +7540,7 @@ fra luft og bruker: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="193"/> + <location filename="../qt-models/filtermodels.cpp" line="197"/> <source>Empty tags</source> <translation>Ingen emneord</translation> </message> @@ -7698,7 +7739,7 @@ fra luft og bruker: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="675"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="682"/> <source>%1click to visit %2</source> <translation>%1klikk for å besøke %2</translation> </message> @@ -7769,12 +7810,12 @@ fra luft og bruker: <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <location filename="../qt-models/divetripmodel.cpp" line="365"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <location filename="../qt-models/divetripmodel.cpp" line="365"/> <source>min</source> <translation>min</translation> </message> @@ -7785,13 +7826,13 @@ fra luft og bruker: </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="246"/> - <location filename="../qt-models/divetripmodel.cpp" line="423"/> + <location filename="../qt-models/divetripmodel.cpp" line="422"/> <source>kg</source> <translation>kg</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="246"/> - <location filename="../qt-models/divetripmodel.cpp" line="423"/> + <location filename="../qt-models/divetripmodel.cpp" line="422"/> <source>lbs</source> <translation>pund</translation> </message> @@ -7812,7 +7853,7 @@ fra luft og bruker: </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="260"/> - <location filename="../qt-models/divetripmodel.cpp" line="410"/> + <location filename="../qt-models/divetripmodel.cpp" line="409"/> <source>/min</source> <translation>/min</translation> </message> @@ -8150,12 +8191,12 @@ Language: %1</source> <translation>Last opp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="213"/> <source>Operation timed out</source> <translation>Handlingen fikk tidsavbrudd</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="234"/> <source>Transferring data...</source> <translation>Overfører data...</translation> </message> @@ -8306,7 +8347,7 @@ Snitt</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="795"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Kunne ikke lese header</translation> </message> @@ -8317,40 +8358,40 @@ 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="253"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>deco stop</source> <translation>dekostopp</translation> </message> <message> <location filename="../core/cochran.c" line="331"/> <location filename="../core/cochran.c" line="385"/> - <location filename="../core/file.c" line="770"/> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/import-csv.c" line="682"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>ascent</source> <translation>oppstigning</translation> </message> <message> <location filename="../core/cochran.c" line="337"/> - <location filename="../core/file.c" line="748"/> + <location filename="../core/import-csv.c" line="660"/> <source>battery</source> <translation>batteri</translation> </message> <message> <location filename="../core/cochran.c" line="343"/> - <location filename="../core/libdivecomputer.c" line="271"/> + <location filename="../core/libdivecomputer.c" line="268"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="270"/> + <location filename="../core/libdivecomputer.c" line="267"/> <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="272"/> + <location filename="../core/libdivecomputer.c" line="269"/> <source>pO₂</source> <translation>pO₂</translation> </message> @@ -8358,110 +8399,111 @@ Snitt</translation> <location filename="../core/cochran.c" line="360"/> <location filename="../core/cochran.c" line="409"/> <location filename="../core/cochran.c" line="416"/> - <location filename="../core/file.c" line="851"/> - <location filename="../core/libdivecomputer.c" line="263"/> - <location filename="../core/libdivecomputer.c" line="277"/> + <location filename="../core/import-csv.c" line="763"/> + <location filename="../core/libdivecomputer.c" line="260"/> + <location filename="../core/libdivecomputer.c" line="274"/> + <location filename="../core/plannernotes.c" line="175"/> <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="254"/> + <location filename="../core/libdivecomputer.c" line="251"/> <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="256"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>ceiling</source> <translation>tak</translation> </message> <message> <location filename="../core/cochran.c" line="390"/> - <location filename="../core/libdivecomputer.c" line="258"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>transmitter</source> <translation>sender</translation> </message> <message> - <location filename="../core/datatrak.c" line="258"/> + <location filename="../core/datatrak.c" line="259"/> <source>clear</source> <translation>klart</translation> </message> <message> - <location filename="../core/datatrak.c" line="261"/> + <location filename="../core/datatrak.c" line="262"/> <source>misty</source> <translation>lett tåke</translation> </message> <message> - <location filename="../core/datatrak.c" line="264"/> + <location filename="../core/datatrak.c" line="265"/> <source>fog</source> <translation>tåke</translation> </message> <message> - <location filename="../core/datatrak.c" line="267"/> + <location filename="../core/datatrak.c" line="268"/> <source>rain</source> <translation>regn</translation> </message> <message> - <location filename="../core/datatrak.c" line="270"/> + <location filename="../core/datatrak.c" line="271"/> <source>storm</source> <translation>storm</translation> </message> <message> - <location filename="../core/datatrak.c" line="273"/> + <location filename="../core/datatrak.c" line="274"/> <source>snow</source> <translation>sn</translation> </message> <message> - <location filename="../core/datatrak.c" line="293"/> + <location filename="../core/datatrak.c" line="294"/> <source>No suit</source> <translation>Ingen drakt</translation> </message> <message> - <location filename="../core/datatrak.c" line="296"/> + <location filename="../core/datatrak.c" line="297"/> <source>Shorty</source> <translation>Shorty</translation> </message> <message> - <location filename="../core/datatrak.c" line="299"/> + <location filename="../core/datatrak.c" line="300"/> <source>Combi</source> <translation>Kombi</translation> </message> <message> - <location filename="../core/datatrak.c" line="302"/> + <location filename="../core/datatrak.c" line="303"/> <source>Wet suit</source> <translation>Våtdrakt</translation> </message> <message> - <location filename="../core/datatrak.c" line="305"/> + <location filename="../core/datatrak.c" line="306"/> <source>Semidry suit</source> <translation>Semidry</translation> </message> <message> - <location filename="../core/datatrak.c" line="308"/> + <location filename="../core/datatrak.c" line="309"/> <source>Dry suit</source> <translation>Tørrdrakt</translation> </message> <message> - <location filename="../core/datatrak.c" line="368"/> + <location filename="../core/datatrak.c" line="369"/> <source>no stop</source> <translation>ingen stop</translation> </message> <message> - <location filename="../core/datatrak.c" line="370"/> + <location filename="../core/datatrak.c" line="371"/> <location filename="../core/dive.c" line="30"/> <source>deco</source> <translation>deko</translation> </message> <message> - <location filename="../core/datatrak.c" line="372"/> + <location filename="../core/datatrak.c" line="373"/> <source>single ascent</source> <translation>enkel oppstigning</translation> </message> <message> - <location filename="../core/datatrak.c" line="374"/> + <location filename="../core/datatrak.c" line="375"/> <source>multiple ascent</source> <translation>flere oppstigninger</translation> </message> @@ -8471,117 +8513,117 @@ Snitt</translation> <translation>ferskvann</translation> </message> <message> - <location filename="../core/datatrak.c" line="376"/> + <location filename="../core/datatrak.c" line="377"/> <source>fresh water</source> <translation>ferskvann</translation> </message> <message> - <location filename="../core/datatrak.c" line="378"/> + <location filename="../core/datatrak.c" line="379"/> <source>salt water</source> <translation>saltvan</translation> </message> <message> - <location filename="../core/datatrak.c" line="403"/> + <location filename="../core/datatrak.c" line="404"/> <source>sight seeing</source> <translation>sightseeing</translation> </message> <message> - <location filename="../core/datatrak.c" line="405"/> + <location filename="../core/datatrak.c" line="406"/> <source>club dive</source> <translation>klubbdyk</translation> </message> <message> - <location filename="../core/datatrak.c" line="407"/> + <location filename="../core/datatrak.c" line="408"/> <location filename="../core/dive.c" line="29"/> <source>instructor</source> <translation>instruktør</translation> </message> <message> - <location filename="../core/datatrak.c" line="409"/> + <location filename="../core/datatrak.c" line="410"/> <source>instruction</source> <translation>instruksjon</translation> </message> <message> - <location filename="../core/datatrak.c" line="411"/> + <location filename="../core/datatrak.c" line="412"/> <location filename="../core/dive.c" line="28"/> <source>night</source> <translation>nattdykk</translation> </message> <message> - <location filename="../core/datatrak.c" line="413"/> + <location filename="../core/datatrak.c" line="414"/> <location filename="../core/dive.c" line="26"/> <source>cave</source> <translation>grotte</translation> </message> <message> - <location filename="../core/datatrak.c" line="415"/> + <location filename="../core/datatrak.c" line="416"/> <location filename="../core/dive.c" line="25"/> <source>ice</source> <translation>isdykk</translation> </message> <message> - <location filename="../core/datatrak.c" line="417"/> + <location filename="../core/datatrak.c" line="418"/> <source>search</source> <translation>søk</translation> </message> <message> - <location filename="../core/datatrak.c" line="426"/> + <location filename="../core/datatrak.c" line="427"/> <location filename="../core/dive.c" line="26"/> <source>wreck</source> <translation>vrakdykk</translation> </message> <message> - <location filename="../core/datatrak.c" line="428"/> + <location filename="../core/datatrak.c" line="429"/> <location filename="../core/dive.c" line="27"/> <source>river</source> <translation>elv</translation> </message> <message> - <location filename="../core/datatrak.c" line="430"/> + <location filename="../core/datatrak.c" line="431"/> <location filename="../core/dive.c" line="24"/> <source>drift</source> <translation>strømdykk</translation> </message> <message> - <location filename="../core/datatrak.c" line="432"/> + <location filename="../core/datatrak.c" line="433"/> <location filename="../core/dive.c" line="29"/> <source>photo</source> <translation>foto</translation> </message> <message> - <location filename="../core/datatrak.c" line="434"/> + <location filename="../core/datatrak.c" line="435"/> <source>other</source> <translation>annet</translation> </message> <message> - <location filename="../core/datatrak.c" line="445"/> + <location filename="../core/datatrak.c" line="446"/> <source>Other activities</source> <translation>Andre aktiviteter</translation> </message> <message> - <location filename="../core/datatrak.c" line="469"/> + <location filename="../core/datatrak.c" line="470"/> <source>Datatrak/Wlog notes</source> <translation>Datatrak/Wlog-notater</translation> </message> <message> - <location filename="../core/datatrak.c" line="513"/> + <location filename="../core/datatrak.c" line="514"/> <source>[Warning] Manual dive # %d </source> <translation>[Advarsel] Manuelt dykk # %d </translation> </message> <message> - <location filename="../core/datatrak.c" line="539"/> + <location filename="../core/datatrak.c" line="540"/> <source>[Error] Out of memory for dive %d. Abort parsing.</source> <translation>[Feil] Tomt for minne for dykk %d. Avslutter innlesing.</translation> </message> <message> - <location filename="../core/datatrak.c" line="585"/> + <location filename="../core/datatrak.c" line="587"/> <source>[Error] File is not a DataTrak file. Aborted</source> <translation>[Feil] Loggen er ikke en DataTrak-fil. Avbryter.</translation> </message> <message> - <location filename="../core/datatrak.c" line="598"/> + <location filename="../core/datatrak.c" line="600"/> <source>Error: no dive</source> <translation>Feil: Ikke noe dykk</translation> </message> @@ -8643,8 +8685,8 @@ Snitt</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1143"/> <location filename="../core/planner.c" line="1146"/> + <location filename="../core/planner.c" line="1149"/> <source>oxygen</source> <translation>oksygen</translation> </message> @@ -8660,6 +8702,9 @@ Snitt</translation> </message> <message> <location filename="../core/dive.c" line="270"/> + <location filename="../core/plannernotes.c" line="58"/> + <location filename="../core/plannernotes.c" line="59"/> + <location filename="../core/plannernotes.c" line="60"/> <location filename="../core/qthelper.cpp" line="662"/> <source>bar</source> <translation>bar</translation> @@ -8729,10 +8774,10 @@ Snitt</translation> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="682"/> + <location filename="../core/divelist.c" line="672"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1139"/> <location filename="../core/planner.c" line="1142"/> + <location filename="../core/planner.c" line="1145"/> <source>air</source> <translation>luft</translation> </message> @@ -8742,99 +8787,99 @@ Snitt</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="199"/> + <location filename="../core/equipment.c" line="185"/> <source>integrated</source> <translation>integrert bly</translation> </message> <message> - <location filename="../core/equipment.c" line="200"/> + <location filename="../core/equipment.c" line="186"/> <source>belt</source> <translation>vektbelte</translation> </message> <message> - <location filename="../core/equipment.c" line="201"/> + <location filename="../core/equipment.c" line="187"/> <source>ankle</source> <translation>ankelvekt</translation> </message> <message> - <location filename="../core/equipment.c" line="202"/> + <location filename="../core/equipment.c" line="188"/> <source>backplate</source> <translation>bakplate</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="189"/> <source>clip-on</source> <translation>clip-on</translation> </message> <message> - <location filename="../core/file.c" line="112"/> + <location filename="../core/file.c" line="113"/> <source>No dives in the input file '%s'</source> <translation>Ingen dykk i fila '%s'</translation> </message> <message> - <location filename="../core/file.c" line="122"/> - <location filename="../core/file.c" line="504"/> - <location filename="../core/file.c" line="590"/> - <location filename="../core/file.c" line="888"/> - <location filename="../core/file.c" line="1098"/> + <location filename="../core/file.c" line="321"/> + <location filename="../core/import-csv.c" line="115"/> + <location filename="../core/import-csv.c" line="360"/> + <location filename="../core/import-csv.c" line="501"/> + <location filename="../core/import-csv.c" line="839"/> <location filename="../core/ostctools.c" line="49"/> <source>Failed to read '%s'</source> <translation>Kunne ikke åpne '%s'</translation> </message> <message> - <location filename="../core/file.c" line="391"/> + <location filename="../core/file.c" line="208"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>Kunne ikke åpne CSV-fil %s. Bruk import-dialogen isteden</translation> </message> <message> - <location filename="../core/file.c" line="506"/> + <location filename="../core/file.c" line="323"/> <source>Empty file '%s'</source> <translation>Tom fil '%s'</translation> </message> <message> - <location filename="../core/file.c" line="687"/> + <location filename="../core/import-csv.c" line="599"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Posiden-import feilet: klarte ikke å lese '%s'</translation> </message> <message> - <location filename="../core/file.c" line="723"/> + <location filename="../core/import-csv.c" line="635"/> <source>Mouth piece position OC</source> <translation>Munnstykkeposisjon OC</translation> </message> <message> - <location filename="../core/file.c" line="727"/> + <location filename="../core/import-csv.c" line="639"/> <source>Mouth piece position CC</source> <translation>Munnstykkeposisjon CC</translation> </message> <message> - <location filename="../core/file.c" line="731"/> + <location filename="../core/import-csv.c" line="643"/> <source>Mouth piece position unknown</source> <translation>Munnstykkeposisjon ukjent</translation> </message> <message> - <location filename="../core/file.c" line="735"/> + <location filename="../core/import-csv.c" line="647"/> <source>Mouth piece position not connected</source> <translation>Munnstykkeposisjon ikke tilkoblet</translation> </message> <message> - <location filename="../core/file.c" line="742"/> + <location filename="../core/import-csv.c" line="654"/> <source>Power off</source> <translation>Skru av</translation> </message> <message> - <location filename="../core/file.c" line="792"/> + <location filename="../core/import-csv.c" line="704"/> <source>O₂ calibration failed</source> <translation>O₂-kalibrering feilet</translation> </message> <message> - <location filename="../core/file.c" line="794"/> - <location filename="../core/file.c" line="803"/> + <location filename="../core/import-csv.c" line="706"/> + <location filename="../core/import-csv.c" line="715"/> <source>O₂ calibration</source> <translation>O₂-kalibrering</translation> </message> <message> - <location filename="../core/file.c" line="949"/> + <location filename="../core/import-csv.c" line="234"/> <source>No dive profile found from '%s'</source> <translation>Ingen dykkeprofil funnet i '%s'</translation> </message> @@ -8870,295 +8915,295 @@ Snitt</translation> <translation>Subsurface skylager ødelagt</translation> </message> <message> - <location filename="../core/git-access.c" line="285"/> + <location filename="../core/git-access.c" line="307"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Kunne ikke oppdatere Subsurface skylager, prøv igjen senere</translation> </message> <message> - <location filename="../core/git-access.c" line="345"/> + <location filename="../core/git-access.c" line="367"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Skylager og lokal data avviker. Feil: merge failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="375"/> + <location filename="../core/git-access.c" line="397"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Skylager og lokal data er forskjellig. Klarer ikke å kombinere nye data med lokale data.</translation> </message> <message> - <location filename="../core/git-access.c" line="409"/> + <location filename="../core/git-access.c" line="431"/> <source>Remote storage and local data diverged</source> <translation>Skylager og lokal data er forskjellig</translation> </message> <message> - <location filename="../core/git-access.c" line="412"/> + <location filename="../core/git-access.c" line="434"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Skylager og lokal data er forskjellig. Feil: kunne ikke skrive data (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="421"/> + <location filename="../core/git-access.c" line="443"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problemer med det lokale mellomlageret til skylageret</translation> </message> <message> - <location filename="../core/git-access.c" line="422"/> + <location filename="../core/git-access.c" line="444"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Flyttet mellomlager til %s. Prøv igjen.</translation> </message> <message> - <location filename="../core/git-access.c" line="469"/> + <location filename="../core/git-access.c" line="491"/> <source>Update local storage to match cloud storage</source> <translation>Oppdaterer lokalt lager til å matche skylager</translation> </message> <message> - <location filename="../core/git-access.c" line="477"/> + <location filename="../core/git-access.c" line="499"/> <source>Push local changes to cloud storage</source> <translation>Dytter lokale endringer til skyen</translation> </message> <message> - <location filename="../core/git-access.c" line="495"/> + <location filename="../core/git-access.c" line="517"/> <source>Try to merge local changes into cloud storage</source> <translation>Prøver å slå sammen lokale endringer til skylager</translation> </message> <message> - <location filename="../core/git-access.c" line="537"/> + <location filename="../core/git-access.c" line="559"/> <source>Store data into cloud storage</source> <translation>Lagrer data til skylager</translation> </message> <message> - <location filename="../core/git-access.c" line="561"/> + <location filename="../core/git-access.c" line="583"/> <source>Sync with cloud storage</source> <translation>Synkroniserer med skylager</translation> </message> <message> - <location filename="../core/git-access.c" line="588"/> + <location filename="../core/git-access.c" line="610"/> <source>Can't reach cloud server, working with local data</source> <translation>Kunne ikke nå skyserver, bruker isteden lokal data</translation> </message> <message> - <location filename="../core/git-access.c" line="601"/> + <location filename="../core/git-access.c" line="623"/> <source>Successful cloud connection, fetch remote</source> <translation>Koblet til skylager, henter data</translation> </message> <message> - <location filename="../core/git-access.c" line="618"/> + <location filename="../core/git-access.c" line="642"/> <source>Done syncing with cloud storage</source> <translation>Ferdig å synkroniserer med skylager</translation> </message> <message> - <location filename="../core/git-access.c" line="759"/> + <location filename="../core/git-access.c" line="777"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Klarte ikke å koble til skylager for Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="762"/> + <location filename="../core/git-access.c" line="780"/> <source>git clone of %s failed (%s)</source> <translation>git clone of %s failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="785"/> + <location filename="../core/git-access.c" line="806"/> <source>Synchronising data file</source> <translation>Synkroniserer datafil</translation> </message> <message> <location filename="../core/import-divinglog.c" line="312"/> - <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/uemis-downloader.c" line="137"/> + <location filename="../core/libdivecomputer.c" line="236"/> + <location filename="../core/uemis-downloader.c" line="193"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="252"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>none</source> <translation>ingen</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="257"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>workload</source> <translation>arbeidsbelastning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="259"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>violation</source> <translation>brudd</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="260"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>bookmark</source> <translation>bokmerke</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="261"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>surface</source> <translation>overflate</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="262"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>safety stop</source> <translation>sikkerhetsstopp</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="264"/> + <location filename="../core/libdivecomputer.c" line="261"/> <source>safety stop (voluntary)</source> <translation>sikkerhetsstopp (frivillig)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="262"/> <source>safety stop (mandatory)</source> <translation>sikkerhetsstopp (obligatorisk)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="266"/> + <location filename="../core/libdivecomputer.c" line="263"/> <source>deepstop</source> <translation>dypstopp</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="267"/> + <location filename="../core/libdivecomputer.c" line="264"/> <source>ceiling (safety stop)</source> <translation>tak (sikkerhetsstopp)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="268"/> + <location filename="../core/libdivecomputer.c" line="265"/> <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="269"/> + <location filename="../core/libdivecomputer.c" line="266"/> <source>divetime</source> <translation>dykketid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="273"/> + <location filename="../core/libdivecomputer.c" line="270"/> <source>airtime</source> <translation>lufttid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="274"/> + <location filename="../core/libdivecomputer.c" line="271"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="275"/> + <location filename="../core/libdivecomputer.c" line="272"/> <source>heading</source> <translation>retning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="276"/> + <location filename="../core/libdivecomputer.c" line="273"/> <source>tissue level warning</source> <translation>Advarsel: nivå i vev</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="286"/> + <location filename="../core/libdivecomputer.c" line="283"/> <source>invalid event number</source> <translation>ugyldig hendelsesnummer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="607"/> + <location filename="../core/libdivecomputer.c" line="604"/> <source>Error parsing the datetime</source> <translation>Feil ved lesing av dato</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="625"/> + <location filename="../core/libdivecomputer.c" line="622"/> <source>Dive %d: %s</source> <translation>Dykk %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="631"/> + <location filename="../core/libdivecomputer.c" line="628"/> <source>Error parsing the divetime</source> <translation>Feil ved lesing av dykketid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="641"/> + <location filename="../core/libdivecomputer.c" line="638"/> <source>Error parsing the maxdepth</source> <translation>Feil ved lesing av maksdybde</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="660"/> + <location filename="../core/libdivecomputer.c" line="657"/> <source>Error parsing temperature</source> <translation>Klarte ikke å lese temperatur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="680"/> + <location filename="../core/libdivecomputer.c" line="677"/> <source>Error parsing the gas mix count</source> <translation>Feil ved lesing av gassmiksantall</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="692"/> + <location filename="../core/libdivecomputer.c" line="689"/> <source>Error obtaining water salinity</source> <translation>Feil ved lesing av salthetsgrad</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="701"/> + <location filename="../core/libdivecomputer.c" line="698"/> <source>Error obtaining surface pressure</source> <translation>Klarte ikke å hente overflatetrykk</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="726"/> + <location filename="../core/libdivecomputer.c" line="723"/> <source>Error obtaining dive mode</source> <translation>Kunne ikke hente dykkemodus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="749"/> + <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="775"/> + <location filename="../core/libdivecomputer.c" line="772"/> <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="781"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Feil ved registrering av data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="802"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="809"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation>Ferdig å laste ned dykk på %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="943"/> + <location filename="../core/libdivecomputer.c" line="941"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="962"/> + <location filename="../core/libdivecomputer.c" line="960"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1024"/> + <location filename="../core/libdivecomputer.c" line="1022"/> <source>Error registering the event handler.</source> <translation>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1029"/> + <location filename="../core/libdivecomputer.c" line="1027"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1050"/> + <location filename="../core/libdivecomputer.c" line="1048"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1089"/> + <location filename="../core/libdivecomputer.c" line="1087"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1098"/> + <location filename="../core/libdivecomputer.c" line="1096"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1123"/> + <location filename="../core/libdivecomputer.c" line="1121"/> <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> @@ -9167,13 +9212,13 @@ I de fleste tilfeller vil en logg fra libdivecomputer være nyttig for å feilsà Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1132"/> + <location filename="../core/libdivecomputer.c" line="1130"/> <source>No new dives downloaded from dive computer</source> <translation>Ingen dykk lastet ned fra dykkecomputer</translation> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1132"/> + <location filename="../core/parse-xml.c" line="1139"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>Flere GPS-posisjoner for dette steder; også %s @@ -9188,23 +9233,23 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. </translation> </message> <message> - <location filename="../core/load-git.c" line="1719"/> + <location filename="../core/load-git.c" line="1724"/> <source>Load dives from local cache</source> <translation>Last inn dykk fra lokal cache</translation> </message> <message> - <location filename="../core/load-git.c" line="1723"/> + <location filename="../core/load-git.c" line="1728"/> <source>Successfully opened dive data</source> <translation>Åpnet dykkelogg</translation> </message> <message> - <location filename="../core/ostctools.c" line="109"/> - <location filename="../core/ostctools.c" line="141"/> + <location filename="../core/ostctools.c" line="124"/> + <location filename="../core/ostctools.c" line="155"/> <source>Unknown DC in dive %d</source> <translation>Ukjent computer i dykk %d</translation> </message> <message> - <location filename="../core/ostctools.c" line="154"/> + <location filename="../core/ostctools.c" line="167"/> <source>Error - %s - parsing dive %d</source> <translation>Feil - %s - leser dykk %d</translation> </message> @@ -9216,37 +9261,38 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1593"/> + <location filename="../core/parse-xml.c" line="1600"/> <source>Failed to parse '%s'</source> <translation>Kunne ikke lese '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2034"/> + <location filename="../core/parse-xml.c" line="2033"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åpne stilark %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="62"/> + <location filename="../core/plannernotes.c" line="97"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>Advarsel: Dette er en ny implementasjon av %s og er en dykkeplan-implementasjon som bare har sett begrenset med testing. Vi anbefaler å ikke planlegge dykk utelukkende på bakgrunn av disse resultatene.</translation> </message> <message> - <location filename="../core/plannernotes.c" line="76"/> + <location filename="../core/plannernotes.c" line="108"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Kalkulering av dekompresjon tok for lang tid, og er avbrutt</translation> </message> <message> - <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="401"/> - <location filename="../core/plannernotes.c" line="407"/> - <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="489"/> - <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/plannernotes.c" line="110"/> + <location filename="../core/plannernotes.c" line="468"/> + <location filename="../core/plannernotes.c" line="474"/> + <location filename="../core/plannernotes.c" line="513"/> + <location filename="../core/plannernotes.c" line="544"/> + <location filename="../core/plannernotes.c" line="572"/> + <location filename="../core/plannernotes.c" line="585"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="342"/> + <location filename="../core/plannernotes.c" line="411"/> <source>, effective GF=%d/%d</source> <translation>, effektiv GF=%d/%d</translation> </message> @@ -9257,231 +9303,257 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>Endring av SP</translation> </message> <message> - <location filename="../core/plannernotes.c" line="57"/> + <location filename="../core/plannernotes.c" line="92"/> <source>VPM-B</source> <translation>VPM-B</translation> </message> <message> - <location filename="../core/plannernotes.c" line="59"/> + <location filename="../core/plannernotes.c" line="94"/> <source>BUHLMANN</source> <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="150"/> <source>Runtime: %dmin<br></div></source> <translation>Kjøretid:%dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="155"/> <source>depth</source> <translation>dybde</translation> </message> <message> - <location filename="../core/plannernotes.c" line="126"/> + <location filename="../core/plannernotes.c" line="158"/> <source>duration</source> <translation>lengde</translation> </message> <message> - <location filename="../core/plannernotes.c" line="129"/> + <location filename="../core/plannernotes.c" line="161"/> + <location filename="../core/plannernotes.c" line="173"/> <source>runtime</source> <translation>løpetid</translation> </message> <message> - <location filename="../core/plannernotes.c" line="132"/> + <location filename="../core/plannernotes.c" line="164"/> <source>gas</source> <translation>gass</translation> </message> <message> + <location filename="../core/plannernotes.c" line="171"/> + <source>Isobaric counterdiffusion information</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="177"/> + <source>&#916;He</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="179"/> + <source>&#916;N&#8322;</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="181"/> + <source>max &#916;N&#8322;</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="231"/> <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="187"/> + <location filename="../core/plannernotes.c" line="238"/> <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="200"/> + <location filename="../core/plannernotes.c" line="251"/> <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="207"/> + <location filename="../core/plannernotes.c" line="258"/> <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="253"/> + <location filename="../core/plannernotes.c" line="304"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="256"/> - <location filename="../core/plannernotes.c" line="260"/> + <location filename="../core/plannernotes.c" line="307"/> + <location filename="../core/plannernotes.c" line="311"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="269"/> - <location filename="../core/plannernotes.c" line="281"/> + <location filename="../core/plannernotes.c" line="320"/> + <location filename="../core/plannernotes.c" line="338"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="304"/> + <location filename="../core/plannernotes.c" line="367"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Bytt gass til %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="306"/> + <location filename="../core/plannernotes.c" line="369"/> <source>Switch gas to %s</source> <translation>Bytt til gass %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="326"/> + <location filename="../core/plannernotes.c" line="395"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="328"/> + <location filename="../core/plannernotes.c" line="397"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="338"/> + <location filename="../core/plannernotes.c" line="407"/> <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="433"/> + <location filename="../core/plannernotes.c" line="500"/> <source>Minimum gas</source> <translation>Minimum gass</translation> </message> <message> - <location filename="../core/plannernotes.c" line="434"/> + <location filename="../core/plannernotes.c" line="501"/> <source>based on</source> <translation>basert på</translation> </message> <message> - <location filename="../core/plannernotes.c" line="436"/> + <location filename="../core/plannernotes.c" line="503"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> + <location filename="../core/plannernotes.c" line="522"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s/%.0f%s av <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="458"/> + <location filename="../core/plannernotes.c" line="527"/> <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> <translation>%.0f%s av <span style='color: red;'><b>%s</b></span> (%.0f%s under planlagt oppstigning)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="461"/> + <location filename="../core/plannernotes.c" line="530"/> <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s av <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="99"/> - <location filename="../core/plannernotes.c" line="105"/> + <location filename="../core/plannernotes.c" line="119"/> + <location filename="../core/plannernotes.c" line="129"/> + <location filename="../core/plannernotes.c" line="137"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="107"/> + <location filename="../core/plannernotes.c" line="139"/> <source>dive plan</b> (surface interval </source> <translation>dykkeplan</b> (overflateintervall </translation> </message> <message> - <location filename="../core/plannernotes.c" line="109"/> + <location filename="../core/plannernotes.c" line="141"/> <source>created on</source> <translation>laget på</translation> </message> <message> - <location filename="../core/plannernotes.c" line="101"/> + <location filename="../core/plannernotes.c" line="131"/> <source>dive plan</b> created on</source> <translation>dykkeplan</b> laget på</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="121"/> <source>dive plan</b> (overlapping dives detected)</source> <translation>dykkeplan </b> (overlappende dykk oppdaget)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="147"/> <source>Runtime: %dmin%s</source> <translation>Kjøretid: %dmin%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="402"/> <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="340"/> + <location filename="../core/plannernotes.c" line="409"/> <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="346"/> + <location filename="../core/plannernotes.c" line="415"/> <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="354"/> + <location filename="../core/plannernotes.c" line="423"/> <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="372"/> + <location filename="../core/plannernotes.c" line="439"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gassforbruk (CCR-etapper ekskludert):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="374"/> + <location filename="../core/plannernotes.c" line="441"/> <source>Gas consumption (based on SAC</source> <translation>Gassforbruk (basert på SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="402"/> + <location filename="../core/plannernotes.c" line="469"/> <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="408"/> + <location filename="../core/plannernotes.c" line="475"/> <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="447"/> + <location filename="../core/plannernotes.c" line="514"/> <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="452"/> + <location filename="../core/plannernotes.c" line="519"/> <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="486"/> + <location filename="../core/plannernotes.c" line="545"/> + <source>Isobaric counterdiffusion conditions exceeded</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="569"/> <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="498"/> + <location filename="../core/plannernotes.c" line="582"/> <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="876"/> + <location filename="../core/planner.c" line="879"/> <source>Can't find gas %s</source> <translation>Finner ikke gassen %s</translation> </message> <message> - <location filename="../core/planner.c" line="1147"/> + <location filename="../core/planner.c" line="1150"/> <source>ean</source> <translation>ean</translation> </message> @@ -10150,97 +10222,62 @@ EADD: %d%s / %.1fg/ℓ <translation>(ingen dykk)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Sun</source> - <translation>søn</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Mon</source> - <translation>man</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Tue</source> - <translation>tir</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Wed</source> - <translation>ons</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Thu</source> - <translation>tor</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Fri</source> - <translation>fre</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Sat</source> - <translation>lør</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="140"/> + <location filename="../core/subsurfacestartup.c" line="130"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="140"/> + <location filename="../core/subsurfacestartup.c" line="130"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="140"/> + <location filename="../core/subsurfacestartup.c" line="130"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="140"/> + <location filename="../core/subsurfacestartup.c" line="130"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="140"/> + <location filename="../core/subsurfacestartup.c" line="130"/> <source>May</source> <translation>mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="140"/> + <location filename="../core/subsurfacestartup.c" line="130"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="141"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="141"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="141"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="141"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="141"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="141"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Dec</source> <translation>des</translation> </message> @@ -10276,92 +10313,92 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Ingen dykk å laste ned</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="450"/> + <location filename="../core/uemis-downloader.c" line="507"/> <source>%s %s</source> <translation>%s %s</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="470"/> + <location filename="../core/uemis-downloader.c" line="527"/> <source>data</source> <translation>data</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="498"/> + <location filename="../core/uemis-downloader.c" line="555"/> <source>dive log #</source> <translation>dykkelogg #</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="500"/> + <location filename="../core/uemis-downloader.c" line="557"/> <source>dive spot #</source> <translation>dykkested #</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="502"/> + <location filename="../core/uemis-downloader.c" line="559"/> <source>details for #</source> <translation>detaljer for # </translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="705"/> + <location filename="../core/uemis-downloader.c" line="789"/> <source>wetsuit</source> <translation>våtdrakt</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="705"/> + <location filename="../core/uemis-downloader.c" line="789"/> <source>semidry</source> <translation>semidry</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="705"/> + <location filename="../core/uemis-downloader.c" line="789"/> <source>drysuit</source> <translation>tørrdrakt</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="706"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>shorty</source> <translation>shorty</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="706"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>vest</source> <translation>vest</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="706"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>long john</source> <translation>ermeløs våtdrakt</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="706"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>jacket</source> <translation>overdel</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="706"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>full suit</source> <translation>hel drakt</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="706"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>2 pcs full suit</source> <translation>todelt drakt</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="707"/> + <location filename="../core/uemis-downloader.c" line="791"/> <source>membrane</source> <translation>skalldrakt</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="1237"/> + <location filename="../core/uemis-downloader.c" line="1328"/> <source>Initialise communication</source> <translation>Start kommunikasjon</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="1240"/> + <location filename="../core/uemis-downloader.c" line="1331"/> <source>Uemis init failed</source> <translation>Klarer ikke å lese fra Uemis</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="1252"/> + <location filename="../core/uemis-downloader.c" line="1343"/> <source>Start download</source> <translation>Start nedlasting</translation> </message> @@ -10471,7 +10508,8 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Lengde:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="48"/> + <location filename="../core/plannernotes.c" line="505"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10617,22 +10655,22 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>By</translation> </message> <message> - <location filename="../core/save-git.c" line="956"/> + <location filename="../core/save-git.c" line="958"/> <source>Start saving data</source> <translation>Lagrer data</translation> </message> <message> - <location filename="../core/save-git.c" line="965"/> + <location filename="../core/save-git.c" line="967"/> <source>Start saving dives</source> <translation>Lagrer dykk</translation> </message> <message> - <location filename="../core/save-git.c" line="998"/> + <location filename="../core/save-git.c" line="1000"/> <source>Done creating local cache</source> <translation>Opprettet lokal cache</translation> </message> <message> - <location filename="../core/save-git.c" line="1238"/> + <location filename="../core/save-git.c" line="1248"/> <source>Preparing to save data</source> <translation>Forbereder lagring av data</translation> </message> @@ -10650,112 +10688,112 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="119"/> + <location filename="../mobile-widgets/qml/main.qml" line="121"/> <source>Dive list</source> <translation>Liste over dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="135"/> + <location filename="../mobile-widgets/qml/main.qml" line="139"/> <source>Dive management</source> <translation>Administrasjon av dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="239"/> + <location filename="../mobile-widgets/qml/main.qml" line="268"/> <source>Disable location service</source> <translation>Skru av lokasjonstjeneste</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="256"/> + <location filename="../mobile-widgets/qml/main.qml" line="290"/> <source>Settings</source> <translation>Valg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="138"/> + <location filename="../mobile-widgets/qml/main.qml" line="144"/> <source>Add dive manually</source> <translation>Legg til dykk manuelt</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="149"/> + <location filename="../mobile-widgets/qml/main.qml" line="157"/> <source>Download from DC</source> <translation>Lastet ned fra DC</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="166"/> + <location filename="../mobile-widgets/qml/main.qml" line="178"/> <source>Manual sync with cloud</source> <translation>Manuell skysynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="185"/> + <location filename="../mobile-widgets/qml/main.qml" line="199"/> <source>Offline mode</source> <translation>Frakoblet modus</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="190"/> + <location filename="../mobile-widgets/qml/main.qml" line="204"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Ved å skru av automatisk skysynkronisering vil all data bli lagret lokalt. Dette kan være nyttig ved begrenset eller ingen nettverkstilgang. Velg "Manuell synk med skyen" hvis du har nettverkstilgang og ønsker å synke til skyen.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="199"/> + <location filename="../mobile-widgets/qml/main.qml" line="215"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="285"/> + <location filename="../mobile-widgets/qml/main.qml" line="323"/> <source>Help</source> <translation>Hjelp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="204"/> + <location filename="../mobile-widgets/qml/main.qml" line="222"/> <source>Upload GPS data</source> <translation>Last opp GPS-data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="159"/> + <location filename="../mobile-widgets/qml/main.qml" line="169"/> <source>Apply GPS fixes</source> <translation>Legg til GPS-fiks</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="185"/> + <location filename="../mobile-widgets/qml/main.qml" line="199"/> <source>Auto cloud sync enabled</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="212"/> + <location filename="../mobile-widgets/qml/main.qml" line="233"/> <source>Download GPS data</source> <translation>Last ned GPS-data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="220"/> + <location filename="../mobile-widgets/qml/main.qml" line="244"/> <source>Show GPS fixes</source> <translation>Vis GPS-posisjoner</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="231"/> + <location filename="../mobile-widgets/qml/main.qml" line="257"/> <source>Clear GPS cache</source> <translation>Slett GPS-cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="265"/> + <location filename="../mobile-widgets/qml/main.qml" line="301"/> <source>Developer</source> <translation>Utvikler</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>App log</source> <translation>Applikasjonslogg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="312"/> <source>Theme information</source> <translation>Temainformasjon</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="247"/> + <location filename="../mobile-widgets/qml/main.qml" line="279"/> <source>About</source> <translation>Om</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="239"/> + <location filename="../mobile-widgets/qml/main.qml" line="268"/> <source>Run location service</source> <translation>Kjør posisjonstjeneste</translation> </message> |