diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-10-29 20:14:15 +0100 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-10-29 20:14:15 +0100 |
| commit | c88b59392bbf030b900fc40f7f1419c13a815c9d (patch) | |
| tree | 9f01fece9578b7f867ae06ebb417e611c27b722d /translations/subsurface_nb_NO.ts | |
| parent | 090e86e34d1aad8dc4b907ccd3e461bc6de73fc8 (diff) | |
| download | subsurface-c88b59392bbf030b900fc40f7f1419c13a815c9d.tar.gz | |
Latest translations
This includes several fixed translations where arguments didn't
match the source strings, several of which could likely have
resulted in crashes.
Credit goes to Robert's update to checktranslation.pl.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_nb_NO.ts')
| -rw-r--r-- | translations/subsurface_nb_NO.ts | 770 |
1 files changed, 413 insertions, 357 deletions
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 1c1c780fd..e64df1f6b 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -377,6 +377,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1784,27 +1792,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Klikk her for å fjerne denne flaska.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Dybde for bytte av dekogass. Kalkulert ved hjelp av valgt deko-pO₂, hvis den ikke er satt manuelt.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Utregnet fra valgt bunn-pO₂. Ved å sette MOD justeres O₂%. Sett til '*' for best O₂% ved maks dybde.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Utregnet for valgt best miks END. Ved å sette MND justeres He%. Sett til '*' for best He% ved maks dybde.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Gassen er i bruk. Bare flasker som ikke er i bruk kan fjernes.</translation> </message> @@ -2050,67 +2058,67 @@ GPS-posisjon:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>In profil tilgjengelig</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Lufttemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Flaske:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Vanntemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>På kart</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Vekt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Notater</translation> </message> @@ -2118,23 +2126,23 @@ GPS-posisjon:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation>(flaske %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Manuelt bytte til OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> start</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> slutt</translation> @@ -2172,23 +2180,23 @@ GPS-posisjon:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Liste over dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Påloggingsinformasjon i skyen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Trykk '+'-knappen for å legge til et dykk (eller last ned dykk fra en dykkecomputer)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Ingen dykk i lista</translation> </message> @@ -2196,102 +2204,102 @@ GPS-posisjon:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Fold ut turer</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Fold sammen turer</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Slå sammen andre</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Fjern dykk fra tur</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Lag ny tur</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Legg til dykk til turen over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Legg til dykk til turen under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Slå samme tur med turen over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Slå sammen tur med turen under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Marker dykk som ugyldige</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Slå sammen valgte dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Renummerer dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Flytt på dykketider</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Del opp valgte dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Hent bilde(r) fra fil(er)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Hent bilde fra web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Bildefiler (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 er ikke et bilde</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Åpne bilder</translation> </message> @@ -2299,12 +2307,12 @@ GPS-posisjon:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Lag et nytt dykkested, og kopier relevant informasjon fra dette dykket</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Opprett dykkested med dette navnet</translation> </message> @@ -2964,27 +2972,33 @@ GPS-posisjon:</translation> <translation>ukjent</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Siste dybde</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Løpetid</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC settpunkt</translation> </message> @@ -3020,112 +3034,107 @@ GPS-posisjon:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Trykk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Farge</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Brukeren la inn</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Flaskeindeks</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Trykk S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Trykk I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Tak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Settpunkt</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Omgivelsestrykk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Hjertefrekvens</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Gradientfaktor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Snittdypde @ s</translation> </message> @@ -3362,82 +3371,82 @@ p, li { white-space: pre-wrap; } <translation>kunne ikke skrive zip-fil: %s zip-feil %d system-feil %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Laster opp liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Laster ned liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Laster ned %1 dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Nedlasting er ferdig - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Kunne ikke laste ned</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Arkivet kunne ikke åpnes: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Nedlastingen er skadet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Arkivet kunne ikke åpnes: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Opplasting er ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Opplasting feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Ferdig å laste opp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Innlogging feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Kan ikke lese svar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Feil: %1</translation> </message> @@ -3445,33 +3454,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Last ned</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Velg nedlastingsmåte for Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation>Kobler til dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Feil</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Finn Uemis dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Avbryt nedlasting</translation> </message> @@ -3578,7 +3587,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Last ned</translation> </message> @@ -3604,7 +3613,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -3619,52 +3628,52 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth er ikke skrudd på</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Leverandør:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Dykkecomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation>Forbindelse:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Prøv igjen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Nedlastede dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>OK</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Velg alle</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Velg ingen</translation> </message> @@ -3695,12 +3704,12 @@ p, li { white-space: pre-wrap; } <translation>Koble til Facebook text placeholder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Bruk "Del på"-menyen for å koble Subsurface fra Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Logg inn for å koble til Facebook. Dette gjør at Subsurface kan poste dykk på veggen din</translation> </message> @@ -3708,22 +3717,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>Logget inn på Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Feil, ukjent bruker-id, kan ikke logge inn.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>Lastet opp dykk til Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Kunne ikke laste opp dykk. Se debug-meldinger og send til epostlista til Subsurface</translation> </message> @@ -3974,7 +3983,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Dykkestedsdatabase</translation> </message> @@ -3996,7 +4005,7 @@ p, li { white-space: pre-wrap; } Er du sikker på at du vil fortsette?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Du redigerer et dykkested</translation> </message> @@ -4224,12 +4233,12 @@ Er du sikker på at du vil fortsette?</translation> <translation>Nytt dykkested</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Slette endringer?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Du er i ferd med å droppe endringene dine.</translation> </message> @@ -4288,7 +4297,7 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Åpne</translation> </message> @@ -4584,13 +4593,13 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>Angre</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>Gjør om</translation> </message> @@ -4630,58 +4639,63 @@ Er du sikker på at du vil fortsette?</translation> <translation>Skru skylagring på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Koble til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Koble fra</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Gå gjennom bildekataloger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <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="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -4691,105 +4705,105 @@ Er du sikker på at du vil fortsette?</translation> <translation>Prøver å slå sammen dykk med %1min intervall mellom</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <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="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <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="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <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="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Avslutt denne redigeringa før du starter en ny.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <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="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <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="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <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="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <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="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[lokal cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[skylager for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Åpner datafil fra eldre versjon</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <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="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Loggfiler (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran-filer (*.can *.CAN);;CSV-filer (*.csv *.CSV);;DiveLog.de-filer (*.dld *.DLD);;JDiveLog-filer (*.jlb *.JLB);;Liquivision-filer (*.lvd *.LVD);;MkVI-filer (*.txt *.TXT);;Suunto-filer (*.sde *.db *.SDE *.DB);;Divesoft-filer (*.dlf *.DLF);;UDDF/UDCF-filer (*.uddf *.udcf *.UDDF *.UDCF);;XML-filer (*.xml *.XML);;APD log-filer (*.apd *.APD);;Datatrak/WLog-filer (*.log *.LOG);;OSTCtools-filer (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Alle filer (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Kontakter skylager...</translation> </message> @@ -4797,7 +4811,7 @@ Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Dra valgte dykkested</translation> </message> @@ -5115,32 +5129,12 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Geo-oppslag av dykkested</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Skru på geo-koding for dykkestedsdatabase</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Les inn sted uten GPS-data</translation> + <source>Dive site layout</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Samme format for eksisterende dyk</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Dykkestedsoppsett</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5444,7 +5438,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Skylager for Subsurface</translation> </message> @@ -5525,6 +5519,16 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Subsurface cloud storage (credentials verified)</source> <translation>Skylager for Subsurface (bruker godkjent)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5795,28 +5799,28 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Import</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Importer mal</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML-filer (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Eksporter mal som</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Dette kan ikke gjøres om!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Slette mal: %1?</translation> </message> @@ -5824,12 +5828,12 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Ukjent computer</translation> </message> @@ -5839,108 +5843,108 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Funksjonen Vis NDL/TTS ble avskrudd siden den brukte for mye ressurser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Legg til gassbytte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation>(Tank %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Velg som første dykkecomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>Planlagt dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>Dykk lagt til manuelt</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Slett denne computeren</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Legg til endring av setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Legg til bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Rediger profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Fjern hendelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Skjul lignende hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Juster trykket i tank %1 (nå er den satt til %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Vis alle hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Skjul hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hendelser?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Fjern den valgte hendelsen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Rediger navn på bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Tilpasset navn:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Navnet er for langt</translation> </message> @@ -5948,147 +5952,147 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Starter...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation>Åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation>Kunne ikke åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <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="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>jobber i ikke-sky-modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <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="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>ingen påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Legg in påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <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="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation>Feil format på epostadresse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <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="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Tester påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <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="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation>Feil bruker/passord for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <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="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Påloggingsdetaljer for skyen er ugyldige</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <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="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Kan ikke åpne skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Kan ikke koble til skylagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation>Gyldig bruker/passord, henter dykk</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Feil i skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <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="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <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="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Tilkobling til skylagring OK. Ingen dykk i lista.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Ukjent GPS-posisjon</translation> </message> @@ -6246,6 +6250,16 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <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"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Emner</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6661,64 +6675,64 @@ Filer med upassende dykkedato/-tid</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Liten</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Dato: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Varighet: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>t</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Sted: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Dykkeleder: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6811,12 +6825,12 @@ Filer med upassende dykkedato/-tid</translation> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation>For å bruke Subsurface-mobile med skylagring, skriv brukernavn og passord.<br/><br/>Hvis dette er første gang du bruker skylagring med Subsurface, skriv inn epostadresse (bare små bokstaver) og passord (bare bokstaver og tall).<br/><br/>For å bruke Subsurface-mobile uten skylagring, velg "ingen skylagring" over.</translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation>Takk for at du registrerte deg hos Subsurface. Vi sendte <b>%1</b> en PIN-kode for å fullføre registreringen. Hvis du ikke mottar en epost fra oss innen 15 minutter, dobbelt sjekk at du har skrevet epostadressen rett, og sjekk søppelpostmappa di.<br/><br/>Hvis du fremdeles har problemer, kontakt oss på brukerforumet vårt (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> @@ -7441,7 +7455,7 @@ fra luft og bruker: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1klikk for å besøke %2</translation> </message> @@ -8396,8 +8410,8 @@ Snitt</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>oksygen</translation> </message> @@ -8482,15 +8496,15 @@ Snitt</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>luft</translation> </message> @@ -8719,7 +8733,7 @@ Snitt</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>ukjent</translation> @@ -8979,7 +8993,7 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>Kunne ikke lese '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åpne stilark %s</translation> </message> @@ -8995,21 +9009,21 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, effektiv GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>Endring av SP</translation> @@ -9025,195 +9039,211 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Kjøretid:%dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>dybde</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>lengde</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>løpetid</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gass</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u i %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u på %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Bytt gass til %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Bytt til gass %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Dekomodell: VPM-B med nominell konservatisme</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>dykkeplan</b> (overflateintervall </translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>laget på</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>dykkeplan</b> laget på</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Kjøretid: %dmin VARIATIONS<br></div></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomodell: Bühlmann ZHL-16C med GF Low = %d%% og GF High = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Dekomodell: VPM-B med +%d konservervatisme</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomodell: Rekreasjonsmodus basert på Bühlmann ZHL-16B med GF Low = %d%% og GF High = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>ATM-trykk: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gassforbruk (CCR-etapper ekskludert):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Gassforbruk (basert på SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>dette er mer gass en det som er tilgjengelig i tanken!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>ikke nok i reserve til å dele gass under oppstigning!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gass</span> (basert på %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>påkrevet minimum gass ved oppstigning overstiger flasketrykk</translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s av <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s i planlagt oppstigning)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s under planlagt oppstigning) av <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>høy pO₂-verdi %.2f ve %d:%02u med gass %s ved dybde %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>lav pO₂ verdi %.2f ved %d:%02u med gass %s ved dybde %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Finner ikke gassen %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9815,6 +9845,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Dykkestatus</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Fridykk</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Alle (ved turstatistikk)</translation> @@ -9850,97 +9905,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(ingen dykk)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>søn</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>man</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>tir</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>ons</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>tor</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>fre</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>lør</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>des</translation> </message> @@ -10171,6 +10226,7 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Lengde:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10276,7 +10332,7 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Dybde</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>planlagt stopp over tak</translation> </message> @@ -10316,22 +10372,22 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>By</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Lagrer data</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Lagrer dykk</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>Opprettet lokal cache</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>Forbereder lagring av data</translation> </message> |