diff options
Diffstat (limited to 'translations/subsurface_nb_NO.ts')
| -rw-r--r-- | translations/subsurface_nb_NO.ts | 772 |
1 files changed, 401 insertions, 371 deletions
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 35208c742..db9fc538d 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -322,12 +322,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="532"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="540"/> <source>Person: </source> <translation>Person: </translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="533"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="541"/> <source>Searches for buddies and divemasters</source> <translation>Søk etter buddyer og dykkeledere</translation> </message> @@ -335,7 +335,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="266"/> + <location filename="../qt-models/filtermodels.cpp" line="287"/> <source>No buddies</source> <translation>Ingen buddyer</translation> </message> @@ -1945,132 +1945,127 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="46"/> <source>Dive details</source> <translation>Detaljer for dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="140"/> <source>Delete dive</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="155"/> <source>Cancel edit</source> <translation>Avbryt redigering</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="163"/> <source>Show on map</source> <translation>Vis på kart</translation> </message> - <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> - <source>Multiple Buddies</source> - <translation>Flere buddies</translation> - </message> </context> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="109"/> <source>Dive %1</source> <translation>Dykk %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="113"/> <source>Date:</source> <translation>Dato:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="125"/> <source>Location:</source> <translation>Sted:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="141"/> <source>Coordinates:</source> <translation>Koordinater:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="154"/> <source>Use current GPS location:</source> <translation>Bruk nåværende GPS-posisjon:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="169"/> <source>Depth:</source> <translation>Dybde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/> <source>Duration:</source> <translation>Lengde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="196"/> <source>Air Temp:</source> <translation>Lufttemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="209"/> <source>Water Temp:</source> <translation>Vanntemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="222"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="235"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="248"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="261"/> <source>Weight:</source> <translation>Vekt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="275"/> <source>Cylinder:</source> <translation>Flaske:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="288"/> <source>Gas mix:</source> <translation>Gassmiks:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="302"/> <source>Start Pressure:</source> <translation>Starttrykk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="315"/> <source>End Pressure:</source> <translation>Sluttrykk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="328"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="341"/> <source>Visibility:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="355"/> <source>Notes:</source> <translation>Notater:</translation> </message> @@ -3023,22 +3018,22 @@ GPS-posisjon:</translation> <translation>CC settpunkt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1024"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1030"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1033"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1080"/> <source>Stop times</source> <translation>Stopptider</translation> </message> @@ -3381,112 +3376,112 @@ p, li { white-space: pre-wrap; } <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> <source>no dives were selected</source> <translation>ingen dykk valgt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>kunne ikke finne stilark for eksport til divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="187"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> <source>failed to create zip file for upload: %s</source> <translation>klarte ikke å lage zipfil for opplasting: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> <source>internal error</source> <translation>intern feil</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="259"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Konvertering av dykk %1 til divelogs.de-format feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="287"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>kunne ikke skrive zip-fil: %s zip-feil %d system-feil %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/> <source>Done</source> <translation>Ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/> <source>Uploading dive list...</source> <translation>Laster opp liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/> <source>Downloading dive list...</source> <translation>Laster ned liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/> <source>Downloading %1 dives...</source> <translation>Laster ned %1 dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/> <source>Download finished - %1</source> <translation>Nedlasting er ferdig - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/> <source>Problem with download</source> <translation>Kunne ikke laste ned</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/> <source>The archive could not be opened: </source> <translation>Arkivet kunne ikke åpnes: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/> <source>Corrupted download</source> <translation>Nedlastingen er skadet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/> <source>The archive could not be opened: %1</source> <translation>Arkivet kunne ikke åpnes: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/> <source>Upload finished</source> <translation>Opplasting er ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> <source>Upload failed</source> <translation>Opplasting feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/> <source>Upload successful</source> <translation>Ferdig å laste opp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/> <source>Login failed</source> <translation>Innlogging feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/> <source>Cannot parse response</source> <translation>Kan ikke lese svar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Error: %1</source> <translation>Feil: %1</translation> </message> @@ -3515,47 +3510,47 @@ p, li { white-space: pre-wrap; } <translation>Feil</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="263"/> <source>Find Uemis dive computer</source> <translation>Finn Uemis dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="288"/> <source>Cancel download</source> <translation>Avbryt nedlasting</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> <source>Choose file for dive computer download logfile</source> <translation>Velg loggfil for nedlasting fra dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="366"/> <source>Log files</source> <translation>Loggfiler</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> <source>Choose file for dive computer binary dump file</source> <translation>Velg binær dumpfil for nedlasting fra dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/> <source>Dump files</source> <translation>Dump-filer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="417"/> <source>Retry download</source> <translation>Prøv nedlasting på nytt</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="380"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Lagring av dump fra libdivecomputer vil IKKE laste ned dykk til dykkeloggen.</translation> </message> @@ -3628,6 +3623,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Download</source> <translation>Last ned</translation> </message> @@ -3693,27 +3690,32 @@ p, li { white-space: pre-wrap; } <translation>Avslutt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> + <source>Rescan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="232"/> <source> Downloaded dives</source> <translation>Nedlastede dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="233"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Accept</source> <translation>OK</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="292"/> <source>Select All</source> <translation>Velg alle</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="300"/> <source>Unselect All</source> <translation>Velg ingen</translation> </message> @@ -3786,6 +3788,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FilterBase</name> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="515"/> + <source>Select All</source> + <translation>Velg alle</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="516"/> + <source>Unselect All</source> + <translation>Velg ingen</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="517"/> + <source>Invert Selection</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../desktop-widgets/listfilter.ui" line="14"/> @@ -3802,6 +3822,11 @@ p, li { white-space: pre-wrap; } <source>Filter this list</source> <translation>Filtrer denne lista</translation> </message> + <message> + <location filename="../desktop-widgets/listfilter.ui" line="57"/> + <source>...</source> + <translation>...</translation> + </message> </context> <context> <name>FilterWidget2</name> @@ -3902,7 +3927,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="559"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="546"/> <source>Location: </source> <translation>Sted:</translation> </message> @@ -3943,7 +3968,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="314"/> + <location filename="../qt-models/filtermodels.cpp" line="340"/> <source>No location set</source> <translation>Ingen sted er satt</translation> </message> @@ -4068,8 +4093,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="530"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="529"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="568"/> <source>Notes</source> <translation>Notater</translation> </message> @@ -4102,7 +4127,7 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="567"/> <source>Location</source> <translation>Sted</translation> </message> @@ -4263,27 +4288,27 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip notes</source> <translation>Turnotater</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="512"/> <source>Trip location</source> <translation>Tursted</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="734"/> <source>New dive site</source> <translation>Nytt dykkested</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1038"/> <source>Discard the changes?</source> <translation>Slette endringer?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1039"/> <source>You are about to discard your changes.</source> <translation>Du er i ferd med å droppe endringene dine.</translation> </message> @@ -4697,7 +4722,7 @@ Er du sikker på at du vil fortsette?</translation> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <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> @@ -4708,39 +4733,39 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="670"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1991"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> <source>Don't save an empty log to the cloud</source> <translation>Ikke lagre en tom logg til skyen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="666"/> <source>Traverse image directories</source> <translation>Gå gjennom bildekataloger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <source>Scanning images...(this can take a while)</source> <translation>Går gjennom bilder... (dette kan ta en stund)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="703"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="854"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="972"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1067"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1854"/> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -4778,202 +4803,202 @@ templatene være skrivebeskyttet og bør ikke redigeres direkte, siden programmet kan overskrive dem.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> <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="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="854"/> <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="916"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="914"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="972"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Prøver å re-planlegge et dykk som ikke allerede er et planlagt dykk.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1854"/> <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="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1067"/> <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="1116"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1114"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1335"/> <source>Dive log files</source> <translation>Dykkeloggfiler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1626"/> <source>Subsurface files</source> <translation>Subsurface-filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> <source>MkVI files</source> <translation>MkVI-filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> <source>All files</source> <translation>Alle filer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> <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="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <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="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> <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="1627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1713"/> <source>[local cache for] %1</source> <translation>[lokal cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[cloud storage for] %1</source> <translation>[skylager for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1810"/> <source>Opening datafile from older version</source> <translation>Åpner datafil fra eldre versjon</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1811"/> <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="1830"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1991"/> <source>Contacting cloud service...</source> <translation>Kontakter skylager...</translation> </message> @@ -5022,7 +5047,7 @@ QML-modulene QtPositioning og QtLocation mangler muligens!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="644"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="590"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter viser %1 (av %2) dykk</translation> </message> @@ -5105,74 +5130,74 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>Last stop at 20ft</source> <translation>Siste stopp ved 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>50% avg. depth to 20ft</source> <translation>50% av snittdybde til 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>20ft to surface</source> <translation>20ft til overflaten</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>Last stop at 6m</source> <translation>Siste stopp ved 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>50% avg. depth to 6m</source> <translation>50% av snittdybde til 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>6m to surface</source> <translation>6m til overflaten</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="508"/> <source>cuft/min</source> <translation>ft³/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="517"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="526"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="531"/> <source>psi</source> <translation>psi</translation> </message> @@ -6159,124 +6184,124 @@ Eksporter denne templaten til en annen fil.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="141"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="291"/> <source>Starting...</source> <translation>Starter...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="192"/> <source>Open local dive data file</source> <translation>Åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="200"/> <source>Opening local data file failed</source> <translation>Kunne ikke åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="232"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dykk hentet fra lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="315"/> <source>working in no-cloud mode</source> <translation>jobber i ikke-sky-modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/> <source>Error parsing local storage, giving up</source> <translation>Klarte ikke å lese fra lokalt lagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> <source>no cloud credentials</source> <translation>ingen påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="330"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> <source>Please enter valid cloud credentials.</source> <translation>Legg in påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="371"/> <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="380"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="377"/> <source>Invalid format for email address</source> <translation>Feil format på epostadresse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> <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="442"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Testing cloud credentials</source> <translation>Tester påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <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="464"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="461"/> <source>Incorrect cloud credentials</source> <translation>Feil bruker/passord for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="467"/> <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="502"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="499"/> <source>Cloud credentials are invalid</source> <translation>Påloggingsdetaljer for skyen er ugyldige</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="512"/> <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="528"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="525"/> <source>Cannot open cloud storage: %1</source> <translation>Kan ikke åpne skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/> <source>Cannot connect to cloud storage</source> <translation>Kan ikke koble til skylagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="561"/> <source>Cloud credentials valid, loading dives...</source> <translation>Gyldig bruker/passord, henter dykk</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> <source>Cloud storage error: %1</source> <translation>Feil i skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="616"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Henter dykk fra lokalt lager ('ikke-sky-modus")</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="661"/> <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="689"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="686"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Tilkobling til skylagring OK. Ingen dykk i lista.</translation> </message> @@ -6299,7 +6324,7 @@ Eksporter denne templaten til en annen fil.</translation> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1273"/> <source>Unknown GPS location</source> <translation>Ukjent GPS-posisjon</translation> </message> @@ -6312,79 +6337,79 @@ Eksporter denne templaten til en annen fil.</translation> <translation>Venter på GPS-posisjon</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="783"/> - <location filename="../core/qthelper.cpp" line="1344"/> + <location filename="../core/qthelper.cpp" line="778"/> + <location filename="../core/qthelper.cpp" line="1339"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="785"/> - <location filename="../core/qthelper.cpp" line="1343"/> + <location filename="../core/qthelper.cpp" line="780"/> + <location filename="../core/qthelper.cpp" line="1338"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="811"/> + <location filename="../core/qthelper.cpp" line="806"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="813"/> + <location filename="../core/qthelper.cpp" line="808"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="838"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="833"/> + <location filename="../core/qthelper.cpp" line="1314"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="840"/> - <location filename="../core/qthelper.cpp" line="1320"/> + <location filename="../core/qthelper.cpp" line="835"/> + <location filename="../core/qthelper.cpp" line="1315"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="865"/> - <location filename="../core/qthelper.cpp" line="1369"/> + <location filename="../core/qthelper.cpp" line="860"/> + <location filename="../core/qthelper.cpp" line="1364"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="867"/> - <location filename="../core/qthelper.cpp" line="1368"/> + <location filename="../core/qthelper.cpp" line="862"/> + <location filename="../core/qthelper.cpp" line="1363"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="888"/> - <location filename="../core/qthelper.cpp" line="1304"/> + <location filename="../core/qthelper.cpp" line="883"/> + <location filename="../core/qthelper.cpp" line="1299"/> <source>AIR</source> <translation>Luft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="890"/> + <location filename="../core/qthelper.cpp" line="885"/> <source>EAN</source> <translation>EAN</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1028"/> + <location filename="../core/qthelper.cpp" line="1023"/> <source>(%n dive(s))</source> <translation><numerusform>(%n dykk)</numerusform><numerusform>(%n dykk)</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1304"/> + <location filename="../core/qthelper.cpp" line="1299"/> <source>OXYGEN</source> <translation>Oksygen</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1391"/> + <location filename="../core/qthelper.cpp" line="1386"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1392"/> + <location filename="../core/qthelper.cpp" line="1387"/> <source>cuft</source> <translation>ft³</translation> </message> @@ -6438,32 +6463,32 @@ Eksporter denne templaten til en annen fil.</translation> <translation>Maksimum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="638"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="626"/> <source>Invalid response from server</source> <translation>Ugyldig svar fra tjener</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="646"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="634"/> <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="692"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="680"/> <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="699"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Malformed XML response. Line %1: %2</source> <translation>Feil formattert XML-svar. Linje %1: %2</translation> </message> <message> - <location filename="../core/divesite.cpp" line="20"/> + <location filename="../core/divesite-helper.cpp" line="20"/> <source>No dive site layout categories set in preferences!</source> <translation>Ingen kategorier for dykkesteds-layout er satt i valgpanelet!</translation> </message> <message> - <location filename="../core/divesite.cpp" line="28"/> + <location filename="../core/divesite-helper.cpp" line="28"/> <source>Tags</source> <translation>Emner</translation> </message> @@ -6734,39 +6759,39 @@ valgte dykk. </translation> <translation>Hvilket dato og tid vises på bildet?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="311"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> <source>Open image file</source> <translation>Åpne bilder</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="311"/> <source>Image files</source> <translation>Bildefiler</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Selected dive date/time</source> <translation>Valgte dykkedato/-tid</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="393"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source>First selected dive date/time</source> <translation>Første valgte dykkedato/-tid</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="394"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> <source>Last selected dive date/time</source> <translation>Siste valgte dykkedato/-tid</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="396"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="393"/> <source> Files with inappropriate date/time</source> <translation> Filer med upassende dykkedato/-tid</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="406"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="403"/> <source>No Exif date/time found</source> <translation>Ingen Exif-dato/-tid funnet</translation> </message> @@ -7084,47 +7109,47 @@ Filer med upassende dykkedato/-tid</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="410"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> <source>Enter User ID and click Download</source> <translation>Skriv inn bruker-ID og trykk Last ned</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="432"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="420"/> <source>Webservice</source> <translation>Nettjeneste</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="518"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="506"/> <source>Connecting...</source> <translation>Kobler til...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="537"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="525"/> <source>Download finished</source> <translation>Nedlasting er ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="539"/> <source>Download error: %1</source> <translation>Feil ved nedlasting: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="561"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> <source>Connection error: </source> <translation>Forbindelsesfeil:</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="564"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> <source>Invalid user identifier!</source> <translation>Ugyldig bruker-ID!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="567"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> <source>Cannot parse response!</source> <translation>Kan ikke lese svar!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="570"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="558"/> <source>Download successful</source> <translation>Nedlasting ferdig</translation> </message> @@ -7132,7 +7157,7 @@ Filer med upassende dykkedato/-tid</translation> <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="585"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> <source>Suits: </source> <translation>Drakter:</translation> </message> @@ -7140,7 +7165,7 @@ Filer med upassende dykkedato/-tid</translation> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="159"/> + <location filename="../qt-models/filtermodels.cpp" line="168"/> <source>No suit set</source> <translation>Ingen drakt er satt</translation> </message> @@ -7266,32 +7291,37 @@ Filer med upassende dykkedato/-tid</translation> <translation>Bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="29"/> + <source>Zoom level</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Load image(s) from file(s)</source> <translation>Hent bilde(r) fra fil(er)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> <source>Load image(s) from web</source> <translation>Hent bilde(r) fra web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> <source>Delete selected images</source> <translation>Sletter valgte bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> <source>Delete all images</source> <translation>Slett alle bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="94"/> <source>Deleting Images</source> <translation>Sletter bilder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="94"/> <source>Are you sure you want to delete all images?</source> <translation>Er du sikker på at du vil slette alle bilder?</translation> </message> @@ -7461,7 +7491,7 @@ fra luft og bruker: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="506"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="535"/> <source>Tags: </source> <translation>Emneord:</translation> </message> @@ -7469,7 +7499,7 @@ fra luft og bruker: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="179"/> + <location filename="../qt-models/filtermodels.cpp" line="193"/> <source>Empty tags</source> <translation>Ingen emneord</translation> </message> @@ -7668,7 +7698,7 @@ fra luft og bruker: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="675"/> <source>%1click to visit %2</source> <translation>%1klikk for å besøke %2</translation> </message> @@ -8120,12 +8150,12 @@ Language: %1</source> <translation>Last opp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="339"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> <source>Operation timed out</source> <translation>Handlingen fikk tidsavbrudd</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="360"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> <source>Transferring data...</source> <translation>Overfører data...</translation> </message> @@ -8276,7 +8306,7 @@ Snitt</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="792"/> + <location filename="../core/libdivecomputer.c" line="795"/> <source>Error parsing the header</source> <translation>Kunne ikke lese header</translation> </message> @@ -8294,14 +8324,14 @@ Snitt</translation> <message> <location filename="../core/cochran.c" line="331"/> <location filename="../core/cochran.c" line="385"/> - <location filename="../core/file.c" line="771"/> + <location filename="../core/file.c" line="770"/> <location filename="../core/libdivecomputer.c" line="255"/> <source>ascent</source> <translation>oppstigning</translation> </message> <message> <location filename="../core/cochran.c" line="337"/> - <location filename="../core/file.c" line="749"/> + <location filename="../core/file.c" line="748"/> <source>battery</source> <translation>batteri</translation> </message> @@ -8328,7 +8358,7 @@ 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="852"/> + <location filename="../core/file.c" line="851"/> <location filename="../core/libdivecomputer.c" line="263"/> <location filename="../core/libdivecomputer.c" line="277"/> <source>gaschange</source> @@ -8630,13 +8660,13 @@ Snitt</translation> </message> <message> <location filename="../core/dive.c" line="270"/> - <location filename="../core/qthelper.cpp" line="667"/> + <location filename="../core/qthelper.cpp" line="662"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../core/dive.c" line="274"/> - <location filename="../core/qthelper.cpp" line="670"/> + <location filename="../core/qthelper.cpp" line="665"/> <source>psi</source> <translation>psi</translation> </message> @@ -8652,15 +8682,15 @@ Snitt</translation> </message> <message> <location filename="../core/dive.c" line="357"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="603"/> + <location filename="../core/qthelper.cpp" line="583"/> + <location filename="../core/qthelper.cpp" line="598"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../core/dive.c" line="362"/> - <location filename="../core/qthelper.cpp" line="591"/> - <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="600"/> <source>ft</source> <translation>ft</translation> </message> @@ -8686,15 +8716,15 @@ Snitt</translation> </message> <message> <location filename="../core/dive.c" line="413"/> - <location filename="../core/qthelper.cpp" line="614"/> - <location filename="../core/qthelper.cpp" line="624"/> + <location filename="../core/qthelper.cpp" line="609"/> + <location filename="../core/qthelper.cpp" line="619"/> <source>lbs</source> <translation>pund</translation> </message> <message> <location filename="../core/dive.c" line="417"/> - <location filename="../core/qthelper.cpp" line="612"/> - <location filename="../core/qthelper.cpp" line="622"/> + <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="617"/> <source>kg</source> <translation>kg</translation> </message> @@ -8743,11 +8773,11 @@ Snitt</translation> </message> <message> <location filename="../core/file.c" line="122"/> - <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"/> + <location filename="../core/file.c" line="504"/> + <location filename="../core/file.c" line="590"/> + <location filename="../core/file.c" line="888"/> + <location filename="../core/file.c" line="1098"/> + <location filename="../core/ostctools.c" line="49"/> <source>Failed to read '%s'</source> <translation>Kunne ikke åpne '%s'</translation> </message> @@ -8758,53 +8788,53 @@ Snitt</translation> <translation>Kunne ikke åpne CSV-fil %s. Bruk import-dialogen isteden</translation> </message> <message> - <location filename="../core/file.c" line="507"/> + <location filename="../core/file.c" line="506"/> <source>Empty file '%s'</source> <translation>Tom fil '%s'</translation> </message> <message> - <location filename="../core/file.c" line="688"/> + <location filename="../core/file.c" line="687"/> <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="724"/> + <location filename="../core/file.c" line="723"/> <source>Mouth piece position OC</source> <translation>Munnstykkeposisjon OC</translation> </message> <message> - <location filename="../core/file.c" line="728"/> + <location filename="../core/file.c" line="727"/> <source>Mouth piece position CC</source> <translation>Munnstykkeposisjon CC</translation> </message> <message> - <location filename="../core/file.c" line="732"/> + <location filename="../core/file.c" line="731"/> <source>Mouth piece position unknown</source> <translation>Munnstykkeposisjon ukjent</translation> </message> <message> - <location filename="../core/file.c" line="736"/> + <location filename="../core/file.c" line="735"/> <source>Mouth piece position not connected</source> <translation>Munnstykkeposisjon ikke tilkoblet</translation> </message> <message> - <location filename="../core/file.c" line="743"/> + <location filename="../core/file.c" line="742"/> <source>Power off</source> <translation>Skru av</translation> </message> <message> - <location filename="../core/file.c" line="793"/> + <location filename="../core/file.c" line="792"/> <source>O₂ calibration failed</source> <translation>O₂-kalibrering feilet</translation> </message> <message> - <location filename="../core/file.c" line="795"/> - <location filename="../core/file.c" line="804"/> + <location filename="../core/file.c" line="794"/> + <location filename="../core/file.c" line="803"/> <source>O₂ calibration</source> <translation>O₂-kalibrering</translation> </message> <message> - <location filename="../core/file.c" line="950"/> + <location filename="../core/file.c" line="949"/> <source>No dive profile found from '%s'</source> <translation>Ingen dykkeprofil funnet i '%s'</translation> </message> @@ -8910,22 +8940,22 @@ Snitt</translation> <translation>Koblet til skylager, henter data</translation> </message> <message> - <location filename="../core/git-access.c" line="616"/> + <location filename="../core/git-access.c" line="618"/> <source>Done syncing with cloud storage</source> <translation>Ferdig å synkroniserer med skylager</translation> </message> <message> - <location filename="../core/git-access.c" line="757"/> + <location filename="../core/git-access.c" line="759"/> <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="760"/> + <location filename="../core/git-access.c" line="762"/> <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="783"/> + <location filename="../core/git-access.c" line="785"/> <source>Synchronising data file</source> <translation>Synkroniserer datafil</translation> </message> @@ -9068,67 +9098,67 @@ Snitt</translation> <translation>Kunne ikke hente dykkemodus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="746"/> + <location filename="../core/libdivecomputer.c" line="749"/> <source>Error parsing the gas mix</source> <translation>Feil ved lesing av gassmiks</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="772"/> + <location filename="../core/libdivecomputer.c" line="775"/> <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="778"/> + <location filename="../core/libdivecomputer.c" line="781"/> <source>Error registering the data</source> <translation>Feil ved registrering av data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="799"/> + <location filename="../core/libdivecomputer.c" line="802"/> <source>Error parsing the samples</source> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="806"/> + <location filename="../core/libdivecomputer.c" line="809"/> <source>Already downloaded dive at %s</source> <translation>Ferdig å laste ned dykk på %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="940"/> + <location filename="../core/libdivecomputer.c" line="943"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="959"/> + <location filename="../core/libdivecomputer.c" line="962"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1021"/> + <location filename="../core/libdivecomputer.c" line="1024"/> <source>Error registering the event handler.</source> <translation>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1026"/> + <location filename="../core/libdivecomputer.c" line="1029"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1047"/> + <location filename="../core/libdivecomputer.c" line="1050"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1086"/> + <location filename="../core/libdivecomputer.c" line="1089"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1095"/> + <location filename="../core/libdivecomputer.c" line="1098"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1120"/> + <location filename="../core/libdivecomputer.c" line="1123"/> <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> @@ -9137,7 +9167,7 @@ I de fleste tilfeller vil en logg fra libdivecomputer være nyttig for å feilsà Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1129"/> + <location filename="../core/libdivecomputer.c" line="1132"/> <source>No new dives downloaded from dive computer</source> <translation>Ingen dykk lastet ned fra dykkecomputer</translation> </message> @@ -9151,30 +9181,30 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="493"/> <source>additional name for site: %s </source> <translation>ytterligere navn for sted: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1719"/> <source>Load dives from local cache</source> <translation>Last inn dykk fra lokal cache</translation> </message> <message> - <location filename="../core/load-git.c" line="1711"/> + <location filename="../core/load-git.c" line="1723"/> <source>Successfully opened dive data</source> <translation>Åpnet dykkelogg</translation> </message> <message> - <location filename="../core/ostctools.c" line="93"/> - <location filename="../core/ostctools.c" line="125"/> + <location filename="../core/ostctools.c" line="109"/> + <location filename="../core/ostctools.c" line="141"/> <source>Unknown DC in dive %d</source> <translation>Ukjent computer i dykk %d</translation> </message> <message> - <location filename="../core/ostctools.c" line="138"/> + <location filename="../core/ostctools.c" line="154"/> <source>Error - %s - parsing dive %d</source> <translation>Feil - %s - leser dykk %d</translation> </message> @@ -9456,7 +9486,7 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1379"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9465,84 +9495,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1387"/> + <location filename="../core/profile.c" line="1391"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1393"/> + <location filename="../core/profile.c" line="1397"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1396"/> + <location filename="../core/profile.c" line="1400"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1402"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1400"/> + <location filename="../core/profile.c" line="1404"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1402"/> + <location filename="../core/profile.c" line="1406"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1408"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1411"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1447"/> + <location filename="../core/profile.c" line="1451"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1439"/> + <location filename="../core/profile.c" line="1443"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Sikkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1387"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1416"/> + <location filename="../core/profile.c" line="1420"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9551,7 +9581,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1422"/> + <location filename="../core/profile.c" line="1426"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9560,168 +9590,168 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1431"/> <source>Density: %.1fg/ℓ </source> <translation>Tetthet: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1442"/> + <location filename="../core/profile.c" line="1446"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1454"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deko: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1454"/> + <location filename="../core/profile.c" line="1458"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../core/profile.c" line="1456"/> + <location filename="../core/profile.c" line="1460"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1459"/> + <location filename="../core/profile.c" line="1463"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1462"/> + <location filename="../core/profile.c" line="1466"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1474"/> <source>In deco (calc) </source> <translation>I deko (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1477"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1475"/> + <location filename="../core/profile.c" line="1479"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1479"/> + <location filename="../core/profile.c" line="1483"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1485"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (kalk.) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1488"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1487"/> + <location filename="../core/profile.c" line="1491"/> <source>Calculated ceiling %.0f%s </source> <translation>Kalkulert tak %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1493"/> + <location filename="../core/profile.c" line="1497"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Vev %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1499"/> + <location filename="../core/profile.c" line="1503"/> <source>heart rate: %d </source> <translation>puls: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1501"/> + <location filename="../core/profile.c" line="1505"/> <source>bearing: %d </source> <translation>retning: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1508"/> <source>mean depth to here %.1f%s </source> <translation>snittdybde hit %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1601"/> + <location filename="../core/profile.c" line="1605"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1605"/> <location filename="../core/profile.c" line="1609"/> <location filename="../core/profile.c" line="1613"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1617"/> + <location filename="../core/profile.c" line="1621"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1621"/> + <location filename="../core/profile.c" line="1625"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1625"/> <location filename="../core/profile.c" line="1629"/> + <location filename="../core/profile.c" line="1633"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1636"/> + <location filename="../core/profile.c" line="1640"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1661"/> + <location filename="../core/profile.c" line="1665"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> @@ -9770,17 +9800,17 @@ EADD: %d%s / %.1fg/ℓ <translation>V</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="633"/> + <location filename="../core/qthelper.cpp" line="628"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="636"/> + <location filename="../core/qthelper.cpp" line="631"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="965"/> + <location filename="../core/qthelper.cpp" line="960"/> <source>more than %1 days</source> <translation>mer enn %1 dager</translation> </message> @@ -10620,112 +10650,112 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="118"/> + <location filename="../mobile-widgets/qml/main.qml" line="119"/> <source>Dive list</source> <translation>Liste over dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="134"/> + <location filename="../mobile-widgets/qml/main.qml" line="135"/> <source>Dive management</source> <translation>Administrasjon av dyk</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="235"/> + <location filename="../mobile-widgets/qml/main.qml" line="239"/> <source>Disable location service</source> <translation>Skru av lokasjonstjeneste</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="251"/> + <location filename="../mobile-widgets/qml/main.qml" line="256"/> <source>Settings</source> <translation>Valg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="137"/> + <location filename="../mobile-widgets/qml/main.qml" line="138"/> <source>Add dive manually</source> <translation>Legg til dykk manuelt</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="147"/> + <location filename="../mobile-widgets/qml/main.qml" line="149"/> <source>Download from DC</source> <translation>Lastet ned fra DC</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="163"/> + <location filename="../mobile-widgets/qml/main.qml" line="166"/> <source>Manual sync with cloud</source> <translation>Manuell skysynkronisering</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="182"/> + <location filename="../mobile-widgets/qml/main.qml" line="185"/> <source>Offline mode</source> <translation>Frakoblet modus</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="182"/> - <source>Enable auto cloud sync</source> - <translation>Skru på automatisk skysynkronisering</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="187"/> + <location filename="../mobile-widgets/qml/main.qml" line="190"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation>Ved å skru av automatisk skysynkronisering vil all data bli lagret lokalt. Dette kan være nyttig ved begrenset eller ingen nettverkstilgang. Velg "Manuell synk med skyen" hvis du har nettverkstilgang og ønsker å synke til skyen.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="196"/> + <location filename="../mobile-widgets/qml/main.qml" line="199"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="277"/> + <location filename="../mobile-widgets/qml/main.qml" line="285"/> <source>Help</source> <translation>Hjelp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="201"/> + <location filename="../mobile-widgets/qml/main.qml" line="204"/> <source>Upload GPS data</source> <translation>Last opp GPS-data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <location filename="../mobile-widgets/qml/main.qml" line="159"/> <source>Apply GPS fixes</source> <translation>Legg til GPS-fiks</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="209"/> + <location filename="../mobile-widgets/qml/main.qml" line="185"/> + <source>Auto cloud sync enabled</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="212"/> <source>Download GPS data</source> <translation>Last ned GPS-data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="217"/> + <location filename="../mobile-widgets/qml/main.qml" line="220"/> <source>Show GPS fixes</source> <translation>Vis GPS-posisjoner</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="227"/> + <location filename="../mobile-widgets/qml/main.qml" line="231"/> <source>Clear GPS cache</source> <translation>Slett GPS-cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="259"/> + <location filename="../mobile-widgets/qml/main.qml" line="265"/> <source>Developer</source> <translation>Utvikler</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="262"/> + <location filename="../mobile-widgets/qml/main.qml" line="268"/> <source>App log</source> <translation>Applikasjonslogg</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="269"/> + <location filename="../mobile-widgets/qml/main.qml" line="276"/> <source>Theme information</source> <translation>Temainformasjon</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="243"/> + <location filename="../mobile-widgets/qml/main.qml" line="247"/> <source>About</source> <translation>Om</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="235"/> + <location filename="../mobile-widgets/qml/main.qml" line="239"/> <source>Run location service</source> <translation>Kjør posisjonstjeneste</translation> </message> |