diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-09-15 22:00:13 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-09-15 22:00:13 -0700 |
| commit | 5e1ad4948e9d4a44c0587511ecedd7856ac5a32e (patch) | |
| tree | 0fcf0112c2c7514bfeefb4f1c9392766dcf5e523 /translations/subsurface_nb_NO.ts | |
| parent | 5e3bf0b4fa3e7b48e7bed9608640eee80336833e (diff) | |
| download | subsurface-5e1ad4948e9d4a44c0587511ecedd7856ac5a32e.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 | 1550 |
1 files changed, 811 insertions, 739 deletions
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 15eb59a52..20c3d8904 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -328,27 +328,22 @@ <context> <name>CloudCredentials</name> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="51"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/> <source>Cloud credentials</source> <translation>Påloggingsinformasjon i skyen</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="57"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/> <source>Email</source> <translation>Epost</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="69"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="72"/> <source>Password</source> <translation>Passord</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="93"/> - <source>Show password</source> - <translation>Vis passord</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="98"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="91"/> <source>PIN</source> <translation>PIN</translation> </message> @@ -1604,82 +1599,82 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1363"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> <source>Backup dive computer settings</source> <translation>Backupinnstillinger for computer</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> <source>Backup files (*.xml)</source> <translation>Backupfil (*.xml)</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> <source>XML backup error</source> <translation>Feil ved XML-backup</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> <source>An error occurred while saving the backup file. %1</source> <translation>En feil inntraff under lagring av backupfila. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> <source>Backup succeeded</source> <translation>Backup OK</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Your settings have been saved to: %1</source> <translation>Instillingene ble lagret til: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> <source>Restore dive computer settings</source> <translation>Gjenopprett computerinnstillinger</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1390"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> <source>XML restore error</source> <translation>Feil ved gjenoppretting fra XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> <source>An error occurred while restoring the backup file. %1</source> <translation>En feil inntraff ved gjenoppretting av backupfila. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> <source>Restore succeeded</source> <translation>Gjenoppretting OK</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> <source>Your settings have been restored successfully.</source> <translation>Innstillingene dine har blitt gjenopprettet.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Select firmware file</source> <translation>Velg firmware-fil</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> <source>All files (*.*)</source> <translation>Alle filer (*.*)</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1467"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> <source>Choose file for dive computer download logfile</source> <translation>Velg loggfil for nedlasting fra dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> <source>Log files (*.log)</source> <translation>Loggfiler (*.log)</translation> </message> @@ -1894,22 +1889,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="42"/> + <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="76"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="78"/> <source>Delete dive</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="91"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="93"/> <source>Show on map</source> <translation>Vis på kart</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="163"/> <source>Multiple Buddies</source> <translation>Flere buddies</translation> </message> @@ -1917,94 +1912,104 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> <source>Dive %1</source> <translation>Dykk %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="88"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> <source>Date:</source> <translation>Dato:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="96"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> <source>Location:</source> <translation>Sted:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> <source>Coordinates:</source> <translation>Koordinater:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="114"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> <source>Use current GPS location:</source> <translation>Bruk nåværende GPS-posisjon:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="147"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> <source>Depth:</source> <translation>Dybde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="156"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> <source>Duration:</source> <translation>Lengde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="166"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> <source>Air Temp:</source> <translation>Lufttemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> <source>Water Temp:</source> <translation>Vanntemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="184"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="195"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="217"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> <source>Weight:</source> <translation>Vekt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="227"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> <source>Cylinder:</source> <translation>Flaske:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> <source>Gas mix:</source> <translation>Gassmiks:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="248"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> <source>Start Pressure:</source> <translation>Starttrykk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="257"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> <source>End Pressure:</source> <translation>Sluttrykk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="267"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <source>Rating:</source> + <translation>Vurdering:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <source>Visibility:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> <source>Notes:</source> <translation>Notater:</translation> </message> @@ -2012,57 +2017,67 @@ GPS-posisjon:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="156"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> <source>No profile to show</source> <translation>In profil tilgjengelig</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="162"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="168"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Air Temp:</source> <translation>Lufttemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> <source>Cylinder:</source> <translation>Flaske:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="174"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Water Temp:</source> <translation>Vanntemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="72"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <source>Rating:</source> + <translation>Vurdering:</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <source>Visibility:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="219"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> <source>Weight:</source> <translation>Vekt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="272"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="226"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="308"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> <source>Notes</source> <translation>Notater</translation> </message> @@ -2124,23 +2139,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="279"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="285"/> + <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="275"/> + <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="281"/> + <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 type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="304"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="306"/> <source>No dives in dive list</source> <translation>Ingen dykk i lista</translation> </message> @@ -2251,12 +2266,12 @@ GPS-posisjon:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="331"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="329"/> <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="332"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="330"/> <source>Create a new dive site with this name</source> <translation>Opprett dykkested med dette navnet</translation> </message> @@ -2446,7 +2461,7 @@ GPS-posisjon:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/> <source>Light</source> <translation>Lys</translation> </message> @@ -2456,121 +2471,121 @@ GPS-posisjon:</translation> <translation>Sand</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="77"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Generelt format som brukes til datautveksling mellom en mengde dykkerelaterte programmer.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="79"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> <source>Comma separated values describing the dive profile.</source> <translation>Dykkeprofil med kommaseparerte verdier.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Dykkeinformasjon som kommaseparerte verdier. Dette inkluderer de fleste dykkedetaljene men ikke profilinformasjonen.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> <source>Send the dive data to divelogs.de website.</source> <translation>Send dataene til divelogs.de.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Send dykkedata til dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML-eksport av dykkestedene, visualisert på et verdenskart.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> <source>Subsurface native XML format.</source> <translation>Subsurface sitt eget XML-format.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> <source>Write depths of images to file.</source> <translation>Skriv dybdedata fra bilder til fil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> <source>Write dive as TeX macros to file.</source> <translation>Lagre dykk som TeX-makroer til fil.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> <source>Export UDDF file as</source> <translation>Eksporter UDDF-filer som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF-filer (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> <source>Export CSV file as</source> <translation>Eksporter CSV-file som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV-filer (*.csv *.CSV)</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Export world map</source> <translation>Eksporter verdenskart</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> <source>HTML files (*.html)</source> <translation>HTML-filer (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> <source>Export Subsurface XML</source> <translation>Eksporter Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML-filer (*.xml *.ssrf)</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> <source>Save image depths</source> <translation>Lagre dybdedata fra bilder </translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>Export to TeX file</source> <translation>Eksporter til TeX-fil</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> <source>TeX files (*.tex)</source> <translation>TeX-filer (*.tex)</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> <source>Export HTML files as</source> <translation>Eksporter HTML-filer som</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> <source>Please wait, exporting...</source> <translation>Vent, eksporterer...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="310"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> <source>Can't open file %s</source> <translation>Klarer ikke åpne fila %s</translation> </message> @@ -2640,191 +2655,191 @@ GPS-posisjon:</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/> <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="759"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/> <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="761"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/> <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="763"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/> <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="765"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/> <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="767"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/> <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="769"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/> <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="771"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/> <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="773"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/> <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="775"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/> <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="777"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/> <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="779"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/> <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="781"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/> <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="755"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/> <source>Dive #</source> <translation>Dykk #</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="880"/> <source>Date</source> <translation>Dato</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="880"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="882"/> <source>Time</source> <translation>Tid</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="882"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="884"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/> <source>Max. depth</source> <translation>Maksdybde</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/> <source>Avg. depth</source> <translation>Snittdybde</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="922"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="924"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="924"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="926"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="912"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="914"/> <source>Cyl. size</source> <translation>Tankstr.</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="914"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="916"/> <source>Start pressure</source> <translation>Starttrykk</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="916"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="918"/> <source>End pressure</source> <translation>Sluttrykk</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="918"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="920"/> <source>O₂</source> <translation>O₂</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="920"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="922"/> <source>He</source> <translation>He</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="884"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="886"/> <source>Location</source> <translation>Sted</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="886"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/> <source>GPS</source> <translation>GPS</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/> <source>Suit</source> <translation>Drakt</translation> </message> @@ -2840,19 +2855,19 @@ GPS-posisjon:</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="689"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/> <source>Notes</source> <translation>Notater</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="690"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="902"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="691"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="902"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="904"/> <source>Tags</source> <translation>Emner</translation> </message> @@ -3309,82 +3324,82 @@ p, li { white-space: pre-wrap; } <translation>kunne ikke skrive zip-fil: %s zip-feil %d system-feil %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="759"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="793"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Laster opp liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="825"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Laster ned liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="866"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Laster ned %1 dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Nedlasting er ferdig - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Kunne ikke laste ned</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="915"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Arkivet kunne ikke åpnes: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Nedlastingen er skadet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="925"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <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="951"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Opplasting er ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="964"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Opplasting feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="967"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Ferdig å laste opp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Innlogging feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="973"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Kan ikke lese svar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="985"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Feil: %1</translation> </message> @@ -3519,7 +3534,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="122"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> <source>Download</source> <translation>Last ned</translation> </message> @@ -3545,6 +3560,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -3554,60 +3570,62 @@ p, li { white-space: pre-wrap; } <translation>Dykkecomputer</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="21"/> + <source>Bluetooth is not enabled</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> <source> Vendor name: </source> <translation>Leverandør:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="70"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> <source> Dive Computer:</source> <translation>Dykkecomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="81"/> - <source>Bluetooth download:</source> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="128"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> <source>Retry</source> <translation>Prøv igjen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="154"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="167"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> <source> Downloaded dives</source> <translation>Nedlastede dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="204"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <source>Info:</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> <source>Accept</source> <translation>OK</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="230"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> <source>Select All</source> <translation>Velg alle</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="247"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Unselect All</source> <translation>Velg ingen</translation> </message> </context> <context> - <name>DownloadedDiveDelegate</name> - <message> - <location filename="../mobile-widgets/qml/DownloadedDiveDelegate.qml" line="78"/> - <source>Duration: </source> - <translation>Varighet:</translation> - </message> -</context> -<context> <name>ExtraDataModel</name> <message> <location filename="../qt-models/divecomputerextradatamodel.cpp" line="11"/> @@ -3633,12 +3651,12 @@ p, li { white-space: pre-wrap; } <translation>Koble til Facebook text placeholder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="255"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="257"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Bruk "Del på"-menyen for å koble Subsurface fra Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="264"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Logg inn for å koble til Facebook. Dette gjør at Subsurface kan poste dykk på veggen din</translation> </message> @@ -3646,22 +3664,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="215"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/> <source>Photo upload sucessfull</source> <translation>Lastet opp bilde</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="218"/> <source>Your dive profile was updated to Facebook.</source> <translation>Dykkeprofilen din ble oppdatert på Facebook.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="220"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="222"/> <source>Photo upload failed</source> <translation>Fotoopplasting feilet</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="221"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="223"/> <source>Your dive profile was not updated to Facebook, please send the following to the developer. </source> @@ -3717,12 +3735,12 @@ send gjerne følgende til utvikleren. <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2241"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2237"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Denne funksjonen er ikke tilgjengelig for den valgte computeren.</translation> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2246"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2242"/> <source>Firmware update failed!</source> <translation>Kunne ikke oppdatere firmware!</translation> </message> @@ -3730,56 +3748,43 @@ send gjerne følgende til utvikleren. <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="393"/> <source>Back</source> <translation>Tilbake</translation> </message> </context> <context> - <name>GlobeGPS</name> - <message> - <location filename="../desktop-widgets/globe.cpp" line="125"/> - <source>Edit selected dive locations</source> - <translation>Rediger valgte steder</translation> - </message> -</context> -<context> <name>GpsList</name> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="15"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/> <source>GPS Fixes</source> <translation>GPS-posisjoner</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="28"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="27"/> <source>Date: </source> <translation>Dato:</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="38"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="39"/> <source>Name: </source> <translation>Navn:</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="48"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="51"/> <source>Latitude: </source> <translation>Latitude: </translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="57"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="62"/> <source>Longitude: </source> <translation>Longitude: </translation> </message> - <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="100"/> - <source>List of stored GPS fixes</source> - <translation>Liste over lagrede GPS-posisjoner</translation> - </message> </context> <context> <name>GpsLocation</name> <message> - <location filename="../core/gpslocation.cpp" line="127"/> + <location filename="../core/gpslocation.cpp" line="135"/> <source>Unknown GPS location</source> <translation>Ukjent GPS-posisjon</translation> </message> @@ -3808,32 +3813,32 @@ send gjerne følgende til utvikleren. <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="497"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> <source> (same GPS fix)</source> <translation>(samme GPS-lokasjon)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="499"/> <source> (~%1 away</source> <translation> (~%1 borte</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> <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="508"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> <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="510"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="507"/> <source>(no GPS data)</source> <translation>(ingen GPS-data)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="512"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="509"/> <source>Pick site: </source> <translation>Velg sted:</translation> </message> @@ -3916,29 +3921,29 @@ send gjerne følgende til utvikleren. </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="218"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="216"/> <source>Dive site management</source> <translation>Dykkestedsdatabase</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="64"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> <source>Merge into current site</source> <translation>Slå sammen med gjeldende dykkested</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="73"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> <source>Merging dive sites</source> <translation>Slå sammen steder</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="74"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>Du er i ferd med å slå sammen steder, og du kan ikke angre Er du sikker på at du vil fortsette?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="225"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="223"/> <source>You are editing a dive site</source> <translation>Du redigerer et dykkested</translation> </message> @@ -3956,8 +3961,8 @@ Er du sikker på at du vil fortsette?</translation> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="550"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> <source>Notes</source> <translation>Notater</translation> </message> @@ -3978,19 +3983,19 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="549"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> <source>Location</source> <translation>Sted</translation> </message> @@ -4075,103 +4080,103 @@ Er du sikker på at du vil fortsette?</translation> <translation>Bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="79"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> <source>Apply changes</source> <translation>Bruk endringene</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="83"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Discard changes</source> <translation>Forkast endringene</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="99"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> <source>Cylinders</source> <translation>Flasker</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="100"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> <source>Add cylinder</source> <translation>Legg til flaske</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="103"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Weights</source> <translation>Vekter</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="104"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add weight system</source> <translation>Legg til vektsystem</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="108"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="108"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="108"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="108"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Freedive</source> <translation>Fridykk</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="296"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> <source>Water temp. [%1]</source> <translation>Vanntemp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="336"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> <source>This trip is being edited.</source> <translation>Denne turen redigeres.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> <source>Multiple dives are being edited.</source> <translation>Flere dykk redigeres.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> <source>This dive is being edited.</source> <translation>Dette dykket redigeres.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="476"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="509"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> <source>Trip notes</source> <translation>Turnotater</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="504"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> <source>Trip location</source> <translation>Tursted</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="713"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="711"/> <source>New dive site</source> <translation>Nytt dykkested</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Slette endringer?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1014"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Du er i ferd med å droppe endringene dine.</translation> </message> @@ -4230,7 +4235,7 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="521"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="512"/> <source>Open</source> <translation>Åpne</translation> </message> @@ -4371,8 +4376,8 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="380"/> - <source>&Globe</source> - <translation>&Globus</translation> + <source>&Map</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="388"/> @@ -4526,13 +4531,13 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="235"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="226"/> <source>&Undo</source> <translation>Angre</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> <source>&Redo</source> <translation>Gjør om</translation> </message> @@ -4572,58 +4577,58 @@ Er du sikker på at du vil fortsette?</translation> <translation>Skru skylagring på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="335"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="359"/> <source>Connect to</source> <translation>Koble til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="353"/> <source>Disconnect from</source> <translation>Koble fra</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="512"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="557"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1585"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="503"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="548"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1576"/> <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="518"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="509"/> <source>Open file</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="522"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2018"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="513"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2009"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="622"/> <source>Traverse image directories</source> <translation>Gå gjennom bildekataloger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="625"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="633"/> <source>Scanning images...(this can take a while)</source> <translation>Går gjennom bilder... (dette kan ta en stund)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="587"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="814"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="923"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1008"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1014"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1889"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="659"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="805"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="914"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="999"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1005"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1880"/> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -4633,110 +4638,141 @@ Er du sikker på at du vil fortsette?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="693"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="684"/> <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="814"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="805"/> <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="866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="923"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="914"/> <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="1008"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1889"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="999"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1880"/> <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="1014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1005"/> <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="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1052"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1284"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/> <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="1287"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/> <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="1292"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1284"/> <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="1612"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1603"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1604"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1710"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1701"/> <source>[local cache for] %1</source> <translation>[lokal cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1703"/> <source>[cloud storage for] %1</source> <translation>[skylager for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1828"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>Opening datafile from older version</source> <translation>Åpner datafil fra eldre versjon</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1829"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1820"/> <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="1840"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1841"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1832"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Loggfiler (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran-filer (*.can *.CAN);;CSV-filer (*.csv *.CSV);;DiveLog.de-filer (*.dld *.DLD);;JDiveLog-filer (*.jlb *.JLB);;Liquivision-filer (*.lvd *.LVD);;MkVI-filer (*.txt *.TXT);;Suunto-filer (*.sde *.db *.SDE *.DB);;Divesoft-filer (*.dlf *.DLF);;UDDF/UDCF-filer (*.uddf *.udcf *.UDDF *.UDCF);;XML-filer (*.xml *.XML);;APD log-filer (*.apd *.APD);;Datatrak/WLog-filer (*.log *.LOG);;OSTCtools-filer (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Alle filer (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2018"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2009"/> <source>Contacting cloud service...</source> <translation>Kontakter skylager...</translation> </message> </context> <context> + <name>MapWidget</name> + <message> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <source>Drag the selected dive location</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>MapWidgetContextMenu</name> + <message> + <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <source>Open location in Google Maps</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <source>Copy location to clipboard (decimal)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <source>Copy location to clipboard (sexagesimal)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <source>Select visible dive locations</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>MultiFilter</name> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="644"/> @@ -4747,12 +4783,12 @@ Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>Du burde oppdatere firmwaren på computeren din: du har versjon %1 men den siste stabile versjonen er %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -4761,32 +4797,50 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-nedlasting før du starter oppdateringen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="307"/> <source>Not now</source> <translation>Ikke nå</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="307"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="308"/> <source>Update firmware</source> <translation>Oppdater firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="309"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="310"/> <source>Firmware upgrade notice</source> <translation>Firmwareoppgraderingsnotis</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="327"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="328"/> <source>Save the downloaded firmware as</source> <translation>Lagre den nedlastede firmwaren som</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="328"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> <source>Firmware files (*.hex *.bin)</source> <translation>Firmware-filer (*.hex *.bin)</translation> </message> </context> <context> + <name>Page1Form.ui</name> + <message> + <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="26"/> + <source>Page 1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="37"/> + <source>Text Field</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="42"/> + <source>Press Me</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../desktop-widgets/diveplanner.cpp" line="340"/> @@ -4877,69 +4931,6 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned </message> </context> <context> - <name>Preferences</name> - <message> - <location filename="../mobile-widgets/qml/Preferences.qml" line="12"/> - <location filename="../mobile-widgets/qml/Preferences.qml" line="39"/> - <source>Preferences</source> - <translation>Valg</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/Preferences.qml" line="15"/> - <source>Save</source> - <translation>Lagre</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/Preferences.qml" line="46"/> - <source>Theme</source> - <translation>Tema</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/Preferences.qml" line="82"/> - <source>Blue</source> - <translation>Blå</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/Preferences.qml" line="95"/> - <location filename="../mobile-widgets/qml/Preferences.qml" line="161"/> - <location filename="../mobile-widgets/qml/Preferences.qml" line="227"/> - <source>regular text</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/Preferences.qml" line="110"/> - <location filename="../mobile-widgets/qml/Preferences.qml" line="176"/> - <location filename="../mobile-widgets/qml/Preferences.qml" line="242"/> - <source>Highlight</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/Preferences.qml" line="148"/> - <source>Pink</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/Preferences.qml" line="214"/> - <source>Dark</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/Preferences.qml" line="261"/> - <source>Subsurface GPS data webservice</source> - <translation>Webtjeneste for Subsurface GPS-data</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/Preferences.qml" line="270"/> - <source>Distance threshold (meters)</source> - <translation>Terskelverdi for avstand (meter)</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/Preferences.qml" line="281"/> - <source>Time threshold (minutes)</source> - <translation>Terskelverdi for tid (minutter)</translation> - </message> -</context> -<context> <name>PreferencesDefaults</name> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="14"/> @@ -5324,24 +5315,24 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <translation>Språk</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> <source>Restart required</source> <translation>Programmet må startes på nytt</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="55"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>For å bytte språk må du starte Subsurface på nytt.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> <source>Literal characters</source> <translation>Bokstavelige tegn</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="78"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="84"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> <source>Non-special character(s) in time format. These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> @@ -5780,12 +5771,12 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Funksjonen Vis NDL/TTS ble avskrudd siden den brukte for mye ressurser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> <source>Add gas change</source> <translation>Legg til gassbytte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1407"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> <source> (Tank %1)</source> <translation>(Tank %1)</translation> </message> @@ -5810,78 +5801,78 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Slett denne computeren</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1415"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> <source>Add setpoint change</source> <translation>Legg til endring av setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> <source>Add bookmark</source> <translation>Legg til bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> <source>Edit the profile</source> <translation>Rediger profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source>Remove event</source> <translation>Fjern hendelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1430"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> <source>Hide similar events</source> <translation>Skjul lignende hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1466"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1473"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Juster trykket i tank %1 (nå er den satt til %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1488"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> <source>Unhide all events</source> <translation>Vis alle hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1523"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> <source>Hide events</source> <translation>Skjul hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1523"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hendelser?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1558"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>Remove the selected event?</source> <translation>Fjern den valgte hendelsen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1559"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1682"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Edit name of bookmark</source> <translation>Rediger navn på bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1683"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> <source>Custom name:</source> <translation>Tilpasset navn:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1688"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> <source>Name is too long!</source> <translation>Navnet er for langt</translation> </message> @@ -5889,131 +5880,146 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="86"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> <source>Starting...</source> <translation>Starter...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="135"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="143"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="163"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>working in no-cloud mode</source> <translation>jobber i ikke-sky-modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="209"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="240"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="249"/> <source>no cloud credentials</source> <translation>ingen påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="250"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="321"/> <source>Please enter valid cloud credentials.</source> <translation>Legg in påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="289"/> + <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> + <translation>Epost og passord for skylager kan bare bestå av bokstaver, tall og '.', '-', '_', og '+'.</translation> + </message> + <message> + <location filename="../mobile-widgets/qmlmanager.cpp" line="295"/> + <source>Invalid format for email address</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qmlmanager.cpp" line="335"/> <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="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="356"/> <source>Testing cloud credentials</source> <translation>Tester påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="321"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <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="330"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="378"/> + <source>Incorrect cloud credentials</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qmlmanager.cpp" line="384"/> <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="362"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="416"/> <source>Cloud credentials are invalid</source> <translation>Påloggingsdetaljer for skyen er ugyldige</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="429"/> <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="388"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Cannot open cloud storage: %1</source> <translation>Kan ikke åpne skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="400"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="454"/> <source>Cannot connect to cloud storage</source> <translation>Kan ikke koble til skylagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="478"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="436"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cloud storage error: %1</source> <translation>Feil i skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="479"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="578"/> <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="549"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="603"/> <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="719"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="774"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="719"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="774"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="775"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="719"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1095"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1162"/> <source>Unknown GPS location</source> <translation>Ukjent GPS-posisjon</translation> </message> @@ -6026,79 +6032,79 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Venter på GPS-posisjon</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="787"/> - <location filename="../core/qthelper.cpp" line="1348"/> + <location filename="../core/qthelper.cpp" line="783"/> + <location filename="../core/qthelper.cpp" line="1344"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="789"/> - <location filename="../core/qthelper.cpp" line="1347"/> + <location filename="../core/qthelper.cpp" line="785"/> + <location filename="../core/qthelper.cpp" line="1343"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="815"/> + <location filename="../core/qthelper.cpp" line="811"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="817"/> + <location filename="../core/qthelper.cpp" line="813"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="842"/> - <location filename="../core/qthelper.cpp" line="1323"/> + <location filename="../core/qthelper.cpp" line="838"/> + <location filename="../core/qthelper.cpp" line="1319"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="844"/> - <location filename="../core/qthelper.cpp" line="1324"/> + <location filename="../core/qthelper.cpp" line="840"/> + <location filename="../core/qthelper.cpp" line="1320"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="869"/> - <location filename="../core/qthelper.cpp" line="1373"/> + <location filename="../core/qthelper.cpp" line="865"/> + <location filename="../core/qthelper.cpp" line="1369"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="871"/> - <location filename="../core/qthelper.cpp" line="1372"/> + <location filename="../core/qthelper.cpp" line="867"/> + <location filename="../core/qthelper.cpp" line="1368"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="892"/> - <location filename="../core/qthelper.cpp" line="1308"/> + <location filename="../core/qthelper.cpp" line="888"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>AIR</source> <translation>Luft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="894"/> + <location filename="../core/qthelper.cpp" line="890"/> <source>EAN</source> <translation>EAN</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1032"/> + <location filename="../core/qthelper.cpp" line="1028"/> <source>(%n dive(s))</source> <translation><numerusform>(%n dykk)</numerusform><numerusform>(%n dykk)</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1308"/> + <location filename="../core/qthelper.cpp" line="1304"/> <source>OXYGEN</source> <translation>Oksygen</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1395"/> + <location filename="../core/qthelper.cpp" line="1391"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1396"/> + <location filename="../core/qthelper.cpp" line="1392"/> <source>cuft</source> <translation>ft³</translation> </message> @@ -6137,11 +6143,6 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Fjern dette punktet</translation> </message> <message> - <location filename="../desktop-widgets/globe.cpp" line="328"/> - <source>Move the map and double-click to set the dive location</source> - <translation>Finn sted i kartet og dobbeltklikk for å sette posisjon</translation> - </message> - <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> <source>Average</source> <translation>Gjennomsnitt</translation> @@ -6157,43 +6158,31 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Maksimum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="639"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="637"/> <source>Invalid response from server</source> <translation>Ugyldig svar fra tjener</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="647"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="645"/> <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="693"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/> <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="700"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="698"/> <source>Malformed XML response. Line %1: %2</source> <translation>Feil formattert XML-svar. Linje %1: %2</translation> </message> - <message> - <location filename="../core/btdiscovery.cpp" line="166"/> - <location filename="../core/downloadfromdcthread.cpp" line="142"/> - <location filename="../core/downloadfromdcthread.cpp" line="296"/> - <location filename="../core/downloadfromdcthread.cpp" line="313"/> - <location filename="../core/downloadfromdcthread.cpp" line="319"/> - <location filename="../core/downloadfromdcthread.cpp" line="331"/> - <location filename="../core/downloadfromdcthread.cpp" line="358"/> - <location filename="../core/downloadfromdcthread.cpp" line="378"/> - <source>Paired Bluetooth Devices</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ReadSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2138"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2163"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2134"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2159"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Denne funksjonen er ikke tilgjengelig for den valgte computeren.</translation> </message> @@ -6235,7 +6224,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ResetSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2266"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2262"/> <source>Reset settings failed!</source> <translation>Kunne ikke nullstille innstillinger!</translation> </message> @@ -6267,6 +6256,83 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> </context> <context> + <name>Settings</name> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> + <source>Settings</source> + <translation>Valg</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="38"/> + <source>Theme</source> + <translation>Tema</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="46"/> + <source>Blue</source> + <translation>Blå</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="61"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="113"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="166"/> + <source>regular text</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="76"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="128"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="181"/> + <source>Highlight</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="99"/> + <source>Pink</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="151"/> + <source>Dark</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="215"/> + <source>Subsurface GPS data webservice</source> + <translation>Webtjeneste for Subsurface GPS-data</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="224"/> + <source>Distance threshold (meters)</source> + <translation>Terskelverdi for avstand (meter)</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="240"/> + <source>Time threshold (minutes)</source> + <translation>Terskelverdi for tid (minutter)</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="267"/> + <source>Dive computer</source> + <translation>Dykkecomputer</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="276"/> + <source>Save detailed log</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="299"/> + <source>Developer</source> + <translation>Utvikler</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="308"/> + <source>Display Developer menu</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ShiftImageTimesDialog</name> <message> <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/> @@ -6475,54 +6541,54 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="305"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="307"/> <source>Dive date: %1 </source> <translation>Dato: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="310"/> <source>Duration: %1 </source> <translation>Varighet: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="309"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="311"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>t</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="310"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="312"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="313"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="315"/> <source>Dive location: %1 </source> <translation>Sted: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="316"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="318"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="319"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="321"/> <source>Divemaster: %1 </source> <translation>Dykkeleder: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="324"/> <source> %1</source> <translation> @@ -6537,57 +6603,57 @@ Files with inappropriate date/time</source> <translation>Dialogboks</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="57"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="25"/> <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> <translation>Teksten til høyre vil bli postet som beskrivelsen til bildet på Facebook. Albumnavn er obligatorisk (dykkeprofilen vil bli postet til albumet).</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="70"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="38"/> <source>Album</source> <translation>Album</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="77"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="45"/> <source>The profile picture will be posted in this album (required)</source> <translation>Dykkeprofilen vil bli postet i dette albumet (obligatorisk)</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="84"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="52"/> <source>Include</source> <translation>Inkluder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="91"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="59"/> <source>Date and time</source> <translation>Dato og tid</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="98"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="66"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="105"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="73"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="112"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="80"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="119"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="87"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="126"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="94"/> <source>Notes</source> <translation>Notater</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="139"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="107"/> <source>Facebook post preview</source> <translation>Forhåndsvisning av Facebookpost</translation> </message> @@ -6661,37 +6727,37 @@ Files with inappropriate date/time</source> <translation>Nettjeneste</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="519"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="517"/> <source>Connecting...</source> <translation>Kobler til...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="538"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> <source>Download finished</source> <translation>Nedlasting er ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="550"/> <source>Download error: %1</source> <translation>Feil ved nedlasting: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="562"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/> <source>Connection error: </source> <translation>Forbindelsesfeil:</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="565"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="563"/> <source>Invalid user identifier!</source> <translation>Ugyldig bruker-ID!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="568"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="566"/> <source>Cannot parse response!</source> <translation>Kan ikke lese svar!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="571"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="569"/> <source>Download successful</source> <translation>Nedlasting ferdig</translation> </message> @@ -7709,15 +7775,15 @@ Language: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2187"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2212"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2183"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2208"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Denne funksjonen er ikke tilgjengelig for den valgte computeren.</translation> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2189"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2200"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2209"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2185"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2196"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2205"/> <source>Failed!</source> <translation>Feil!</translation> </message> @@ -7825,7 +7891,7 @@ Snitt</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="840"/> + <location filename="../core/libdivecomputer.c" line="790"/> <source>Error parsing the header</source> <translation>Kunne ikke lese header</translation> </message> @@ -7833,7 +7899,7 @@ Snitt</translation> <context> <name>gettectFromC</name> <message> - <location filename="../core/profile.c" line="1343"/> + <location filename="../core/profile.c" line="1363"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> @@ -7845,40 +7911,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="251"/> + <location filename="../core/libdivecomputer.c" line="252"/> <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="779"/> - <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/file.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>ascent</source> <translation>oppstigning</translation> </message> <message> <location filename="../core/cochran.c" line="337"/> - <location filename="../core/file.c" line="757"/> + <location filename="../core/file.c" line="749"/> <source>battery</source> <translation>batteri</translation> </message> <message> <location filename="../core/cochran.c" line="343"/> - <location filename="../core/libdivecomputer.c" line="269"/> + <location filename="../core/libdivecomputer.c" line="270"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="268"/> + <location filename="../core/libdivecomputer.c" line="269"/> <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="270"/> + <location filename="../core/libdivecomputer.c" line="271"/> <source>pO₂</source> <translation>pO₂</translation> </message> @@ -7886,29 +7952,29 @@ 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="870"/> - <location filename="../core/libdivecomputer.c" line="261"/> - <location filename="../core/libdivecomputer.c" line="275"/> + <location filename="../core/file.c" line="852"/> + <location filename="../core/libdivecomputer.c" line="262"/> + <location filename="../core/libdivecomputer.c" line="276"/> <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="252"/> + <location filename="../core/libdivecomputer.c" line="253"/> <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="254"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>ceiling</source> <translation>tak</translation> </message> <message> <location filename="../core/cochran.c" line="390"/> - <location filename="../core/libdivecomputer.c" line="256"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>transmitter</source> <translation>sender</translation> </message> @@ -8170,8 +8236,8 @@ Snitt</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1079"/> - <location filename="../core/planner.c" line="1082"/> + <location filename="../core/planner.c" line="1126"/> + <location filename="../core/planner.c" line="1129"/> <source>oxygen</source> <translation>oksygen</translation> </message> @@ -8181,90 +8247,90 @@ Snitt</translation> <translation>Ikke i bruk</translation> </message> <message> - <location filename="../core/dive.c" line="182"/> + <location filename="../core/dive.c" line="265"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="187"/> - <location filename="../core/qthelper.cpp" line="671"/> + <location filename="../core/dive.c" line="270"/> + <location filename="../core/qthelper.cpp" line="667"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="191"/> - <location filename="../core/qthelper.cpp" line="674"/> + <location filename="../core/dive.c" line="274"/> + <location filename="../core/qthelper.cpp" line="670"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="228"/> + <location filename="../core/dive.c" line="311"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="233"/> + <location filename="../core/dive.c" line="316"/> <source>cuft</source> <translation>ft³</translation> </message> <message> - <location filename="../core/dive.c" line="274"/> - <location filename="../core/qthelper.cpp" line="592"/> - <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/dive.c" line="357"/> + <location filename="../core/qthelper.cpp" line="588"/> + <location filename="../core/qthelper.cpp" line="603"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="279"/> - <location filename="../core/qthelper.cpp" line="595"/> - <location filename="../core/qthelper.cpp" line="609"/> + <location filename="../core/dive.c" line="362"/> + <location filename="../core/qthelper.cpp" line="591"/> + <location filename="../core/qthelper.cpp" line="605"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="302"/> + <location filename="../core/dive.c" line="385"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> + <location filename="../core/dive.c" line="387"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="309"/> + <location filename="../core/dive.c" line="392"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="311"/> + <location filename="../core/dive.c" line="394"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="330"/> - <location filename="../core/qthelper.cpp" line="618"/> - <location filename="../core/qthelper.cpp" line="628"/> + <location filename="../core/dive.c" line="413"/> + <location filename="../core/qthelper.cpp" line="614"/> + <location filename="../core/qthelper.cpp" line="624"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../core/dive.c" line="334"/> - <location filename="../core/qthelper.cpp" line="616"/> - <location filename="../core/qthelper.cpp" line="626"/> + <location filename="../core/dive.c" line="417"/> + <location filename="../core/qthelper.cpp" line="612"/> + <location filename="../core/qthelper.cpp" line="622"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1756"/> + <location filename="../core/dive.c" line="1841"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="495"/> + <location filename="../core/divelist.c" line="498"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1075"/> - <location filename="../core/planner.c" line="1078"/> + <location filename="../core/planner.c" line="1122"/> + <location filename="../core/planner.c" line="1125"/> <source>air</source> <translation>luft</translation> </message> @@ -8305,67 +8371,72 @@ Snitt</translation> </message> <message> <location filename="../core/file.c" line="122"/> - <location filename="../core/file.c" line="513"/> - <location filename="../core/file.c" line="599"/> - <location filename="../core/file.c" line="911"/> - <location filename="../core/file.c" line="1108"/> + <location filename="../core/file.c" line="505"/> + <location filename="../core/file.c" line="591"/> + <location filename="../core/file.c" line="889"/> + <location filename="../core/file.c" line="1099"/> <location filename="../core/ostctools.c" line="52"/> <source>Failed to read '%s'</source> <translation>Kunne ikke åpne '%s'</translation> </message> <message> - <location filename="../core/file.c" line="399"/> + <location filename="../core/file.c" line="391"/> <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="515"/> + <location filename="../core/file.c" line="507"/> <source>Empty file '%s'</source> <translation>Tom fil '%s'</translation> </message> <message> - <location filename="../core/file.c" line="696"/> + <location filename="../core/file.c" line="688"/> <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="732"/> + <location filename="../core/file.c" line="724"/> <source>Mouth piece position OC</source> <translation>Munnstykkeposisjon OC</translation> </message> <message> - <location filename="../core/file.c" line="736"/> + <location filename="../core/file.c" line="728"/> <source>Mouth piece position CC</source> <translation>Munnstykkeposisjon CC</translation> </message> <message> - <location filename="../core/file.c" line="740"/> + <location filename="../core/file.c" line="732"/> <source>Mouth piece position unknown</source> <translation>Munnstykkeposisjon ukjent</translation> </message> <message> - <location filename="../core/file.c" line="744"/> + <location filename="../core/file.c" line="736"/> <source>Mouth piece position not connected</source> <translation>Munnstykkeposisjon ikke tilkoblet</translation> </message> <message> - <location filename="../core/file.c" line="751"/> + <location filename="../core/file.c" line="743"/> <source>Power off</source> <translation>Skru av</translation> </message> <message> - <location filename="../core/file.c" line="811"/> + <location filename="../core/file.c" line="793"/> <source>O₂ calibration failed</source> <translation>O₂-kalibrering feilet</translation> </message> <message> - <location filename="../core/file.c" line="813"/> - <location filename="../core/file.c" line="822"/> + <location filename="../core/file.c" line="795"/> + <location filename="../core/file.c" line="804"/> <source>O₂ calibration</source> <translation>O₂-kalibrering</translation> </message> <message> + <location filename="../core/file.c" line="950"/> + <source>No dive profile found from '%s'</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/git-access.c" line="56"/> <source>Checkout from storage (%lu/%lu)</source> <translation type="unfinished"/> @@ -8472,221 +8543,228 @@ Snitt</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="748"/> + <location filename="../core/git-access.c" line="752"/> <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="751"/> + <location filename="../core/git-access.c" line="755"/> <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="774"/> + <location filename="../core/git-access.c" line="778"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="237"/> - <location filename="../core/parse-xml.c" line="3326"/> + <location filename="../core/libdivecomputer.c" line="238"/> + <location filename="../core/parse-xml.c" line="3456"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="250"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>none</source> <translation>ingen</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>workload</source> <translation>arbeidsbelastning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="257"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>violation</source> <translation>brudd</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="258"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>bookmark</source> <translation>bokmerke</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="259"/> + <location filename="../core/libdivecomputer.c" line="260"/> <source>surface</source> <translation>overflate</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="260"/> + <location filename="../core/libdivecomputer.c" line="261"/> <source>safety stop</source> <translation>sikkerhetsstopp</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="262"/> + <location filename="../core/libdivecomputer.c" line="263"/> <source>safety stop (voluntary)</source> <translation>sikkerhetsstopp (frivillig)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="263"/> + <location filename="../core/libdivecomputer.c" line="264"/> <source>safety stop (mandatory)</source> <translation>sikkerhetsstopp (obligatorisk)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="264"/> + <location filename="../core/libdivecomputer.c" line="265"/> <source>deepstop</source> <translation>dypstopp</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="266"/> <source>ceiling (safety stop)</source> <translation>tak (sikkerhetsstopp)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="266"/> + <location filename="../core/libdivecomputer.c" line="267"/> <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="267"/> + <location filename="../core/libdivecomputer.c" line="268"/> <source>divetime</source> <translation>dykketid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="271"/> + <location filename="../core/libdivecomputer.c" line="272"/> <source>airtime</source> <translation>lufttid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="272"/> + <location filename="../core/libdivecomputer.c" line="273"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="273"/> + <location filename="../core/libdivecomputer.c" line="274"/> <source>heading</source> <translation>retning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="274"/> + <location filename="../core/libdivecomputer.c" line="275"/> <source>tissue level warning</source> <translation>Advarsel: nivå i vev</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="284"/> + <location filename="../core/libdivecomputer.c" line="285"/> <source>invalid event number</source> <translation>ugyldig hendelsesnummer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="656"/> + <location filename="../core/libdivecomputer.c" line="606"/> <source>Error parsing the datetime</source> <translation>Feil ved lesing av dato</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="674"/> + <location filename="../core/libdivecomputer.c" line="624"/> <source>Dive %d: %s</source> <translation>Dykk %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="680"/> + <location filename="../core/libdivecomputer.c" line="630"/> <source>Error parsing the divetime</source> <translation>Feil ved lesing av dykketid</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="690"/> + <location filename="../core/libdivecomputer.c" line="640"/> <source>Error parsing the maxdepth</source> <translation>Feil ved lesing av maksdybde</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="709"/> + <location filename="../core/libdivecomputer.c" line="659"/> <source>Error parsing temperature</source> <translation>Klarte ikke å lese temperatur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="729"/> + <location filename="../core/libdivecomputer.c" line="679"/> <source>Error parsing the gas mix count</source> <translation>Feil ved lesing av gassmiksantall</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="741"/> + <location filename="../core/libdivecomputer.c" line="691"/> <source>Error obtaining water salinity</source> <translation>Feil ved lesing av salthetsgrad</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="750"/> + <location filename="../core/libdivecomputer.c" line="700"/> <source>Error obtaining surface pressure</source> <translation>Klarte ikke å hente overflatetrykk</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="775"/> + <location filename="../core/libdivecomputer.c" line="725"/> <source>Error obtaining dive mode</source> <translation>Kunne ikke hente dykkemodus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="795"/> + <location filename="../core/libdivecomputer.c" line="745"/> <source>Error parsing the gas mix</source> <translation>Feil ved lesing av gassmiks</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="820"/> + <location filename="../core/libdivecomputer.c" line="770"/> <source>Unable to create parser for %s %s</source> <translation>Kunne ikke lage parser for %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="826"/> + <location filename="../core/libdivecomputer.c" line="776"/> <source>Error registering the data</source> <translation>Feil ved registrering av data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="847"/> + <location filename="../core/libdivecomputer.c" line="797"/> <source>Error parsing the samples</source> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="985"/> + <location filename="../core/libdivecomputer.c" line="804"/> + <source>Already downloaded dive at %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/libdivecomputer.c" line="938"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="993"/> - <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> - <translation>modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)</translation> + <location filename="../core/libdivecomputer.c" line="957"/> + <source>model=%s firmware=%u serial=%u</source> + <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1068"/> + <location filename="../core/libdivecomputer.c" line="1019"/> <source>Error registering the event handler.</source> <translation>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1073"/> + <location filename="../core/libdivecomputer.c" line="1024"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1045"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1133"/> + <location filename="../core/libdivecomputer.c" line="1084"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1140"/> + <location filename="../core/libdivecomputer.c" line="1091"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1165"/> - <source>Insufficient privileges to open the device %s %s (%s)</source> - <translation>Har ikke tilgang til å åpne enhet %s %s (%s)</translation> + <location filename="../core/libdivecomputer.c" line="1116"/> + <source>Error opening the device %s %s (%s). +In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. +You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> + <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1245"/> + <location filename="../core/parse-xml.c" line="1270"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>Flere GPS-posisjoner for dette steder; også %s @@ -8694,19 +8772,19 @@ Snitt</translation> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1307"/> + <location filename="../core/parse-xml.c" line="1332"/> <source>additional name for site: %s </source> <translation>ytterligere navn for sted: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1683"/> + <location filename="../core/load-git.c" line="1703"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1687"/> + <location filename="../core/load-git.c" line="1707"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8722,19 +8800,19 @@ Snitt</translation> <translation>Feil - %s - leser dykk %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="520"/> + <location filename="../core/parse-xml.c" line="524"/> <source>Strange percentage reading %s </source> <translation>Rar lesing av prosent %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2053"/> + <location filename="../core/parse-xml.c" line="2094"/> <source>Failed to parse '%s'</source> <translation>Kunne ikke lese '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3784"/> + <location filename="../core/parse-xml.c" line="3978"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åpne stilark %s</translation> </message> @@ -8750,21 +8828,21 @@ Snitt</translation> </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="386"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="420"/> - <location filename="../core/plannernotes.c" line="455"/> - <location filename="../core/plannernotes.c" line="467"/> + <location filename="../core/plannernotes.c" line="387"/> + <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="425"/> + <location filename="../core/plannernotes.c" line="460"/> + <location filename="../core/plannernotes.c" line="472"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="327"/> + <location filename="../core/plannernotes.c" line="328"/> <source>, effective GF=%d/%d</source> <translation>, effektiv GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="321"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>Endring av SP</translation> @@ -8780,11 +8858,6 @@ Snitt</translation> <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="104"/> - <source>Runtime: %dmin<br></div></source> - <translation>Kjøretid:%dmin<br></div></translation> - </message> - <message> <location filename="../core/plannernotes.c" line="109"/> <source>depth</source> <translation>dybde</translation> @@ -8825,48 +8898,53 @@ Snitt</translation> <translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="238"/> + <location filename="../core/plannernotes.c" line="239"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="241"/> - <location filename="../core/plannernotes.c" line="245"/> + <location filename="../core/plannernotes.c" line="242"/> + <location filename="../core/plannernotes.c" line="246"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="254"/> - <location filename="../core/plannernotes.c" line="266"/> + <location filename="../core/plannernotes.c" line="255"/> + <location filename="../core/plannernotes.c" line="267"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="289"/> + <location filename="../core/plannernotes.c" line="290"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Bytt gass til %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="291"/> + <location filename="../core/plannernotes.c" line="292"/> <source>Switch gas to %s</source> <translation>Bytt til gass %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="311"/> + <location filename="../core/plannernotes.c" line="312"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="313"/> + <location filename="../core/plannernotes.c" line="314"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="323"/> + <location filename="../core/plannernotes.c" line="324"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Dekomodell: VPM-B med nominell konservatisme</translation> </message> <message> + <location filename="../core/plannernotes.c" line="418"/> + <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="98"/> <source>Subsurface</source> @@ -8888,87 +8966,87 @@ Snitt</translation> <translation>dykkeplan</b> laget på</translation> </message> <message> - <location filename="../core/plannernotes.c" line="318"/> + <location filename="../core/plannernotes.c" line="104"/> + <source>Runtime: %dmin VARIATIONS<br></div></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="319"/> <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="325"/> + <location filename="../core/plannernotes.c" line="326"/> <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="331"/> + <location filename="../core/plannernotes.c" line="332"/> <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="339"/> + <location filename="../core/plannernotes.c" line="340"/> <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="357"/> + <location filename="../core/plannernotes.c" line="358"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gassforbruk (CCR-etapper ekskludert):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="359"/> + <location filename="../core/plannernotes.c" line="360"/> <source>Gas consumption (based on SAC</source> <translation>Gassforbruk (basert på SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="387"/> + <location filename="../core/plannernotes.c" line="388"/> <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="393"/> + <location filename="../core/plannernotes.c" line="394"/> <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="414"/> - <source><br>&nbsp;&mdash; <span style='color: green;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</source> - <translation><br>&nbsp;&mdash; <span style='color: green;'>Minimum gass</span> (basert på %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="421"/> + <location filename="../core/plannernotes.c" line="426"/> <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="424"/> + <location filename="../core/plannernotes.c" line="429"/> <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="427"/> + <location filename="../core/plannernotes.c" line="432"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s under planlagt oppstigning) av <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="452"/> + <location filename="../core/plannernotes.c" line="457"/> <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="464"/> + <location filename="../core/plannernotes.c" line="469"/> <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="837"/> + <location filename="../core/planner.c" line="873"/> <source>Can't find gas %s</source> <translation>Finner ikke gassen %s</translation> </message> <message> - <location filename="../core/planner.c" line="1083"/> + <location filename="../core/planner.c" line="1130"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1301"/> + <location filename="../core/profile.c" line="1316"/> <source>@: %d:%02d D: %.1f%s </source> @@ -8977,311 +9055,310 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1304"/> - <source>P: %d%s -</source> - <translation>P: %d%s -</translation> - </message> - <message> - <location filename="../core/profile.c" line="1308"/> + <location filename="../core/profile.c" line="1328"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1314"/> + <location filename="../core/profile.c" line="1334"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1337"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1319"/> + <location filename="../core/profile.c" line="1339"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1321"/> + <location filename="../core/profile.c" line="1341"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1323"/> + <location filename="../core/profile.c" line="1343"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1345"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1328"/> + <location filename="../core/profile.c" line="1348"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1362"/> + <location filename="../core/profile.c" line="1382"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1354"/> + <location filename="../core/profile.c" line="1374"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Sikkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1336"/> + <location filename="../core/profile.c" line="1324"/> + <source>P: %d%s (%s) +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1356"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1360"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1377"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1365"/> + <location filename="../core/profile.c" line="1385"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deko: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1369"/> + <location filename="../core/profile.c" line="1389"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../core/profile.c" line="1371"/> + <location filename="../core/profile.c" line="1391"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1374"/> + <location filename="../core/profile.c" line="1394"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1377"/> + <location filename="../core/profile.c" line="1397"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1385"/> + <location filename="../core/profile.c" line="1405"/> <source>In deco (calc) </source> <translation>I deko (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1388"/> + <location filename="../core/profile.c" line="1408"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1410"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1414"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1396"/> + <location filename="../core/profile.c" line="1416"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1399"/> + <location filename="../core/profile.c" line="1419"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1402"/> + <location filename="../core/profile.c" line="1422"/> <source>Calculated ceiling %.0f%s </source> <translation>Kalkulert tak %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1408"/> + <location filename="../core/profile.c" line="1428"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Vev %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1414"/> + <location filename="../core/profile.c" line="1434"/> <source>heart rate: %d </source> <translation>puls: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1416"/> + <location filename="../core/profile.c" line="1436"/> <source>bearing: %d </source> <translation>retning: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1419"/> + <location filename="../core/profile.c" line="1439"/> <source>mean depth to here %.1f%s </source> <translation>snittdybde hit %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1520"/> + <location filename="../core/profile.c" line="1535"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1524"/> - <location filename="../core/profile.c" line="1528"/> - <location filename="../core/profile.c" line="1532"/> + <location filename="../core/profile.c" line="1539"/> + <location filename="../core/profile.c" line="1543"/> + <location filename="../core/profile.c" line="1547"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1551"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> + <location filename="../core/profile.c" line="1555"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1559"/> + <location filename="../core/profile.c" line="1563"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1555"/> + <location filename="../core/profile.c" line="1570"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1580"/> + <location filename="../core/profile.c" line="1595"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="64"/> + <location filename="../core/qthelper.cpp" line="60"/> <source>%1km</source> <translation>%1km</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="66"/> + <location filename="../core/qthelper.cpp" line="62"/> <source>%1m</source> <translation>%1m</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="70"/> + <location filename="../core/qthelper.cpp" line="66"/> <source>%1mi</source> <translation>%1mi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="72"/> + <location filename="../core/qthelper.cpp" line="68"/> <source>%1yd</source> <translation>%1yd</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="88"/> - <location filename="../core/qthelper.cpp" line="223"/> + <location filename="../core/qthelper.cpp" line="84"/> + <location filename="../core/qthelper.cpp" line="219"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="88"/> - <location filename="../core/qthelper.cpp" line="224"/> + <location filename="../core/qthelper.cpp" line="84"/> + <location filename="../core/qthelper.cpp" line="220"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="89"/> - <location filename="../core/qthelper.cpp" line="225"/> + <location filename="../core/qthelper.cpp" line="85"/> + <location filename="../core/qthelper.cpp" line="221"/> <source>E</source> <translation>Ø</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="89"/> - <location filename="../core/qthelper.cpp" line="226"/> + <location filename="../core/qthelper.cpp" line="85"/> + <location filename="../core/qthelper.cpp" line="222"/> <source>W</source> <translation>V</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="637"/> + <location filename="../core/qthelper.cpp" line="633"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="640"/> + <location filename="../core/qthelper.cpp" line="636"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="969"/> + <location filename="../core/qthelper.cpp" line="965"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> @@ -10062,22 +10139,22 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>By</translation> </message> <message> - <location filename="../core/save-git.c" line="940"/> + <location filename="../core/save-git.c" line="985"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="949"/> + <location filename="../core/save-git.c" line="994"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="982"/> + <location filename="../core/save-git.c" line="1027"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1213"/> + <location filename="../core/save-git.c" line="1258"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10085,12 +10162,12 @@ Er Uemis Zurich plugget i ordentlig?</translation> <context> <name>main</name> <message> - <location filename="../mobile-widgets/qml/main.qml" line="13"/> + <location filename="../mobile-widgets/qml/main.qml" line="14"/> <source>Subsurface-mobile</source> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="110"/> + <location filename="../mobile-widgets/qml/main.qml" line="109"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> @@ -10100,119 +10177,114 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Liste over dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="132"/> - <source>Settings</source> - <translation>Valg</translation> + <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <source>Dive management</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="134"/> - <source>Cloud credentials</source> - <translation>Påloggingsinformasjon i skyen</translation> + <location filename="../mobile-widgets/qml/main.qml" line="233"/> + <source>Disable location service</source> + <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Manage dives</source> - <translation>Adminstrer dykk</translation> + <location filename="../mobile-widgets/qml/main.qml" line="249"/> + <source>Settings</source> + <translation>Valg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="157"/> + <location filename="../mobile-widgets/qml/main.qml" line="136"/> <source>Add dive manually</source> <translation>Legg til dykk manuelt</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="165"/> + <location filename="../mobile-widgets/qml/main.qml" line="145"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="173"/> + <location filename="../mobile-widgets/qml/main.qml" line="154"/> + <source>Apply GPS Fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="161"/> <source>Manual sync with cloud</source> <translation>Manuell skysynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="191"/> + <location filename="../mobile-widgets/qml/main.qml" line="180"/> <source>Offline mode</source> <translation>Frakoblet modus</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="191"/> + <location filename="../mobile-widgets/qml/main.qml" line="180"/> <source>Enable auto cloud sync</source> <translation>Skru på automatisk skysynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="196"/> + <location filename="../mobile-widgets/qml/main.qml" line="185"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="204"/> + <location filename="../mobile-widgets/qml/main.qml" line="194"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> - <source>GPS-tag dives</source> - <translation>GPS-tagg dykk</translation> + <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <source>Help</source> + <translation>Hjelp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="215"/> + <location filename="../mobile-widgets/qml/main.qml" line="199"/> <source>Upload GPS data</source> <translation>Last opp GPS-data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="222"/> + <location filename="../mobile-widgets/qml/main.qml" line="207"/> <source>Download GPS data</source> <translation>Last ned GPS-data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="229"/> + <location filename="../mobile-widgets/qml/main.qml" line="215"/> <source>Show GPS fixes</source> <translation>Vis GPS-posisjoner</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="238"/> + <location filename="../mobile-widgets/qml/main.qml" line="225"/> <source>Clear GPS cache</source> <translation>Slett GPS-cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="147"/> - <source>Preferences</source> - <translation>Valg</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="245"/> + <location filename="../mobile-widgets/qml/main.qml" line="257"/> <source>Developer</source> <translation>Utvikler</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="247"/> + <location filename="../mobile-widgets/qml/main.qml" line="260"/> <source>App log</source> <translation>Applikasjonslogg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="254"/> + <location filename="../mobile-widgets/qml/main.qml" line="267"/> <source>Theme information</source> <translation>Temainformasjon</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> - <source>User manual</source> - <translation>Brukermanual</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="267"/> + <location filename="../mobile-widgets/qml/main.qml" line="241"/> <source>About</source> <translation>Om</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> + <location filename="../mobile-widgets/qml/main.qml" line="233"/> <source>Run location service</source> <translation>Kjør posisjonstjeneste</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> - <source>No GPS source available</source> - <translation>Ingen GPS-kilde tilgjengelig</translation> + <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/main.qml" line="28"/> + <source>Hello World</source> + <translation type="unfinished"/> </message> </context> <context> |