diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-09-19 07:24:12 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-09-19 07:24:42 -0700 |
| commit | 1612790ebade0786fa0cf63f98ee7402e6a37cb3 (patch) | |
| tree | dba505b9d4fb330c11c69dd2eaf6ed35a920b55a /translations/subsurface_nb_NO.ts | |
| parent | 82ff827faa62ac2e07a5e4e665c767603308ed6b (diff) | |
| download | subsurface-1612790ebade0786fa0cf63f98ee7402e6a37cb3.tar.gz | |
Latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_nb_NO.ts')
| -rw-r--r-- | translations/subsurface_nb_NO.ts | 1072 |
1 files changed, 542 insertions, 530 deletions
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 8e729ad26..fe56fcef9 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -144,6 +144,11 @@ <translation>Par</translation> </message> <message> + <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="346"/> + <source>Device %1 was paired and is authorized.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="50"/> <source>Could not initialize Winsock version 2.2</source> <translation>Kunne ikke starte Winsock version 2.2</translation> @@ -195,11 +200,6 @@ <translation>%1 er paret.</translation> </message> <message> - <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="346"/> - <source>Device %1 was authorized paired.</source> - <translation>%1 ble paret autorisert.</translation> - </message> - <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="372"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>%1 kan nå bli bruk til forbindelse. Trykk "Lagre"-knappen.</translation> @@ -1027,6 +1027,11 @@ <translation>ZH-L16</translation> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="47"/> + <source>Connect via Bluetooth</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="163"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/> <source>Save libdivecomputer logfile</source> @@ -1336,11 +1341,6 @@ <translation>Sikkerhetsnivå</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="47"/> - <source>Connect via bluetooth</source> - <translation>Koble til med bluetooth</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/> <source>Connect</source> <translation>Koble til</translation> @@ -1388,7 +1388,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1249"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2498"/> - <source>Set point</source> + <source>Setpoint</source> <translation>Settpunkt</translation> </message> <message> @@ -2773,29 +2773,29 @@ <translation>ukjent</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="297"/> + <location filename="../qt-models/diveplannermodel.cpp" line="301"/> <source>Final depth</source> <translation>Siste dybde</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="299"/> + <location filename="../qt-models/diveplannermodel.cpp" line="303"/> <source>Run time</source> <translation>Løpetid</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="301"/> + <location filename="../qt-models/diveplannermodel.cpp" line="305"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="303"/> + <location filename="../qt-models/diveplannermodel.cpp" line="307"/> <source>Used gas</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="305"/> - <source>CC set point</source> - <translation>CC settpunkt</translation> + <location filename="../qt-models/diveplannermodel.cpp" line="309"/> + <source>CC setpoint</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3662,79 +3662,79 @@ Er du sikker på at du vil fortsette?</translation> <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="184"/> + <location filename="../qt-ui/maintab.ui" line="166"/> <location filename="../build/ui_maintab.h" line="951"/> - <location filename="../qt-ui/maintab.cpp" line="642"/> + <location filename="../qt-ui/maintab.cpp" line="627"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="249"/> + <location filename="../qt-ui/maintab.ui" line="231"/> <location filename="../build/ui_maintab.h" line="954"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="259"/> + <location filename="../qt-ui/maintab.ui" line="241"/> <location filename="../build/ui_maintab.h" line="955"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="384"/> + <location filename="../qt-ui/maintab.ui" line="366"/> <location filename="../build/ui_maintab.h" line="959"/> <source>Tags</source> <translation>Emner</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="305"/> + <location filename="../qt-ui/maintab.ui" line="287"/> <location filename="../build/ui_maintab.h" line="956"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="318"/> + <location filename="../qt-ui/maintab.ui" line="300"/> <location filename="../build/ui_maintab.h" line="957"/> <source>Visibility</source> <translation>Sikt</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="325"/> + <location filename="../qt-ui/maintab.ui" line="307"/> <location filename="../build/ui_maintab.h" line="958"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="394"/> + <location filename="../qt-ui/maintab.ui" line="376"/> <location filename="../build/ui_maintab.h" line="960"/> <source>Dive mode</source> <translation>Dykkemodus</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="112"/> - <location filename="../qt-ui/maintab.ui" line="866"/> + <location filename="../qt-ui/maintab.ui" line="94"/> + <location filename="../qt-ui/maintab.ui" line="761"/> <location filename="../build/ui_maintab.h" line="949"/> <location filename="../build/ui_maintab.h" line="987"/> - <location filename="../qt-ui/maintab.cpp" line="365"/> + <location filename="../qt-ui/maintab.cpp" line="350"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="122"/> - <location filename="../qt-ui/maintab.ui" line="885"/> + <location filename="../qt-ui/maintab.ui" line="104"/> + <location filename="../qt-ui/maintab.ui" line="780"/> <location filename="../build/ui_maintab.h" line="950"/> <location filename="../build/ui_maintab.h" line="989"/> - <location filename="../qt-ui/maintab.cpp" line="366"/> + <location filename="../qt-ui/maintab.cpp" line="351"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.ui" line="436"/> + <location filename="../qt-ui/maintab.ui" line="418"/> <location filename="../build/ui_maintab.h" line="961"/> <location filename="../build/ui_maintab.h" line="963"/> - <location filename="../qt-ui/maintab.cpp" line="617"/> - <location filename="../qt-ui/maintab.cpp" line="643"/> + <location filename="../qt-ui/maintab.cpp" line="602"/> + <location filename="../qt-ui/maintab.cpp" line="628"/> <source>Notes</source> <translation>Notater</translation> </message> @@ -3745,325 +3745,325 @@ Er du sikker på at du vil fortsette?</translation> <translation>Notater om det som er valgt</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="214"/> + <location filename="../qt-ui/maintab.ui" line="196"/> <source>Edit dive site</source> <translation>Rediger dykkested</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="217"/> + <location filename="../qt-ui/maintab.ui" line="199"/> <location filename="../build/ui_maintab.h" line="953"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="521"/> + <location filename="../qt-ui/maintab.ui" line="461"/> <location filename="../build/ui_maintab.h" line="965"/> <source>Equipment</source> <translation>Utstyr</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="524"/> + <location filename="../qt-ui/maintab.ui" line="464"/> <location filename="../build/ui_maintab.h" line="966"/> <source>Used equipment in the current selection</source> <translation>Utstyr som brukes i det som er valgt</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="616"/> + <location filename="../qt-ui/maintab.ui" line="529"/> <location filename="../build/ui_maintab.h" line="994"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="619"/> + <location filename="../qt-ui/maintab.ui" line="532"/> <location filename="../build/ui_maintab.h" line="995"/> <source>Dive information</source> <translation>Dykkeinformasjon</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="714"/> + <location filename="../qt-ui/maintab.ui" line="609"/> <location filename="../build/ui_maintab.h" line="971"/> <source>Gases used</source> <translation>Brukte gasser</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="733"/> + <location filename="../qt-ui/maintab.ui" line="628"/> <location filename="../build/ui_maintab.h" line="973"/> <source>Gas consumed</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="666"/> <location filename="../build/ui_maintab.h" line="977"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="809"/> + <location filename="../qt-ui/maintab.ui" line="704"/> <location filename="../build/ui_maintab.h" line="981"/> <source>Max. depth</source> <translation>Maksdybde</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="847"/> + <location filename="../qt-ui/maintab.ui" line="742"/> <location filename="../build/ui_maintab.h" line="985"/> <source>Air pressure</source> <translation>Lufttrykk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="904"/> + <location filename="../qt-ui/maintab.ui" line="799"/> <location filename="../build/ui_maintab.h" line="991"/> <source>Dive time</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="963"/> + <location filename="../qt-ui/maintab.ui" line="858"/> <location filename="../build/ui_maintab.h" line="1007"/> <source>Simple statistics about the selection</source> <translation>Statistikk om det som er valgt</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1069"/> + <location filename="../qt-ui/maintab.ui" line="946"/> <location filename="../build/ui_maintab.h" line="999"/> <source>Total time</source> <translation>Totaltid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1136"/> + <location filename="../qt-ui/maintab.ui" line="1013"/> <location filename="../build/ui_maintab.h" line="1004"/> <source>Gas consumption</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1181"/> + <location filename="../qt-ui/maintab.ui" line="1058"/> <location filename="../build/ui_maintab.h" line="1009"/> <source>All photos from the current selection</source> <translation>Alle bilder i det som er valgt</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1207"/> + <location filename="../qt-ui/maintab.ui" line="1075"/> <location filename="../build/ui_maintab.h" line="1010"/> <source>Extra data</source> <translation>Ekstra data</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1210"/> + <location filename="../qt-ui/maintab.ui" line="1078"/> <location filename="../build/ui_maintab.h" line="1011"/> <source>Adittional data from the dive computer</source> <translation>Ekstra data fra dykkecomputeren</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="92"/> - <location filename="../qt-ui/maintab.ui" line="676"/> + <location filename="../qt-ui/maintab.ui" line="74"/> + <location filename="../qt-ui/maintab.ui" line="571"/> <location filename="../build/ui_maintab.h" line="947"/> <location filename="../build/ui_maintab.h" line="967"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="102"/> + <location filename="../qt-ui/maintab.ui" line="84"/> <location filename="../build/ui_maintab.h" line="948"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="695"/> + <location filename="../qt-ui/maintab.ui" line="590"/> <location filename="../build/ui_maintab.h" line="969"/> <source>Interval</source> <translation>Overflateintervall</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="752"/> - <location filename="../qt-ui/maintab.ui" line="1124"/> + <location filename="../qt-ui/maintab.ui" line="647"/> + <location filename="../qt-ui/maintab.ui" line="1001"/> <location filename="../build/ui_maintab.h" line="975"/> <location filename="../build/ui_maintab.h" line="1003"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="828"/> + <location filename="../qt-ui/maintab.ui" line="723"/> <location filename="../build/ui_maintab.h" line="983"/> <source>Avg. depth</source> <translation>Snittdybde</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="790"/> + <location filename="../qt-ui/maintab.ui" line="685"/> <location filename="../build/ui_maintab.h" line="979"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="923"/> + <location filename="../qt-ui/maintab.ui" line="818"/> <location filename="../build/ui_maintab.h" line="993"/> <source>Salinity</source> <translation>Saltholdighet</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="960"/> + <location filename="../qt-ui/maintab.ui" line="855"/> <location filename="../build/ui_maintab.h" line="1006"/> <source>Stats</source> <translation>Statistikk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1016"/> + <location filename="../qt-ui/maintab.ui" line="893"/> <location filename="../build/ui_maintab.h" line="996"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1057"/> + <location filename="../qt-ui/maintab.ui" line="934"/> <location filename="../build/ui_maintab.h" line="998"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1028"/> + <location filename="../qt-ui/maintab.ui" line="905"/> <location filename="../build/ui_maintab.h" line="997"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1088"/> + <location filename="../qt-ui/maintab.ui" line="965"/> <location filename="../build/ui_maintab.h" line="1001"/> <source>Dives</source> <translation>Dykk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="1178"/> + <location filename="../qt-ui/maintab.ui" line="1055"/> <location filename="../build/ui_maintab.h" line="1008"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="107"/> + <location filename="../qt-ui/maintab.cpp" line="103"/> <source>Cylinders</source> <translation>Flasker</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="111"/> + <location filename="../qt-ui/maintab.cpp" line="107"/> <source>Weights</source> <translation>Vekter</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="82"/> + <location filename="../qt-ui/maintab.cpp" line="78"/> <source>Apply changes</source> <translation>Bruk endringene</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="86"/> + <location filename="../qt-ui/maintab.cpp" line="82"/> <source>Discard changes</source> <translation>Forkast endringene</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="108"/> + <location filename="../qt-ui/maintab.cpp" line="104"/> <source>Add cylinder</source> <translation>Legg til flaske</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="112"/> + <location filename="../qt-ui/maintab.cpp" line="108"/> <source>Add weight system</source> <translation>Legg til vektsystem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="362"/> + <location filename="../qt-ui/maintab.cpp" line="347"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="363"/> + <location filename="../qt-ui/maintab.cpp" line="348"/> <source>Water temp. [%1]</source> <translation>Vanntemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="400"/> + <location filename="../qt-ui/maintab.cpp" line="385"/> <source>This trip is being edited.</source> <translation>Denne turen redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="407"/> + <location filename="../qt-ui/maintab.cpp" line="392"/> <source>Multiple dives are being edited.</source> <translation>Flere dykk redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="409"/> + <location filename="../qt-ui/maintab.cpp" line="394"/> <source>This dive is being edited.</source> <translation>Dette dykket redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> - <location filename="../qt-ui/maintab.cpp" line="612"/> + <location filename="../qt-ui/maintab.cpp" line="572"/> + <location filename="../qt-ui/maintab.cpp" line="597"/> <source>Trip notes</source> <translation>Turnotater</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="609"/> + <location filename="../qt-ui/maintab.cpp" line="594"/> <source>Trip location</source> <translation>Tursted</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="680"/> - <location filename="../qt-ui/maintab.cpp" line="712"/> - <location filename="../qt-ui/maintab.cpp" line="716"/> - <location filename="../qt-ui/maintab.cpp" line="720"/> + <location filename="../qt-ui/maintab.cpp" line="665"/> + <location filename="../qt-ui/maintab.cpp" line="697"/> + <location filename="../qt-ui/maintab.cpp" line="701"/> + <location filename="../qt-ui/maintab.cpp" line="705"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="709"/> + <location filename="../qt-ui/maintab.cpp" line="694"/> <source>Deepest dive</source> <translation>Dypeste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="710"/> + <location filename="../qt-ui/maintab.cpp" line="695"/> <source>Shallowest dive</source> <translation>Grunneste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="723"/> + <location filename="../qt-ui/maintab.cpp" line="708"/> <source>Highest total SAC of a dive</source> <translation>Høyeste totale SAC for et dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="724"/> + <location filename="../qt-ui/maintab.cpp" line="709"/> <source>Lowest total SAC of a dive</source> <translation>Laveste totale SAC for et dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="725"/> + <location filename="../qt-ui/maintab.cpp" line="710"/> <source>Average total SAC of all selected dives</source> <translation>Snitt av total SAC for de valgte dykkene</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="736"/> + <location filename="../qt-ui/maintab.cpp" line="721"/> <source>Highest temperature</source> <translation>Høyeste temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="737"/> + <location filename="../qt-ui/maintab.cpp" line="722"/> <source>Lowest temperature</source> <translation>Laveste temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="738"/> + <location filename="../qt-ui/maintab.cpp" line="723"/> <source>Average temperature of all selected dives</source> <translation>Snittemperatur for de valgte dykkene</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="748"/> + <location filename="../qt-ui/maintab.cpp" line="733"/> <source>Longest dive</source> <translation>Lengste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="749"/> + <location filename="../qt-ui/maintab.cpp" line="734"/> <source>Shortest dive</source> <translation>Korteste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="750"/> + <location filename="../qt-ui/maintab.cpp" line="735"/> <source>Average length of all selected dives</source> <translation>Snittlengde for de valgte dykkene</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="774"/> + <location filename="../qt-ui/maintab.cpp" line="759"/> <source>These gases could be mixed from Air and using: </source> @@ -4072,17 +4072,17 @@ fra luft og bruker: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="778"/> + <location filename="../qt-ui/maintab.cpp" line="763"/> <source> and </source> <translation>og</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1232"/> + <location filename="../qt-ui/maintab.cpp" line="1217"/> <source>Discard the changes?</source> <translation>Slette endringer?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1233"/> + <location filename="../qt-ui/maintab.cpp" line="1218"/> <source>You are about to discard your changes.</source> <translation>Du er i ferd med å droppe endringene dine.</translation> </message> @@ -4090,780 +4090,790 @@ fra luft og bruker: <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="70"/> + <location filename="../qt-ui/mainwindow.ui" line="61"/> <location filename="../build/ui_mainwindow.h" line="568"/> <source>&File</source> <translation>&Fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="455"/> + <location filename="../qt-ui/mainwindow.ui" line="454"/> <location filename="../build/ui_mainwindow.h" line="534"/> <source>Export dive logs</source> <translation>Eksporter dykkelogger</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="510"/> + <location filename="../qt-ui/mainwindow.ui" line="509"/> <location filename="../build/ui_mainwindow.h" line="542"/> <source>Toggle pHe graph</source> <translation>Skru pHe-graf av/på</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="546"/> + <location filename="../qt-ui/mainwindow.ui" line="545"/> <location filename="../build/ui_mainwindow.h" line="545"/> <source>Toggle calculating all tissues</source> <translation>Skru av/på utregning av vev</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="522"/> + <location filename="../qt-ui/mainwindow.ui" line="521"/> <location filename="../build/ui_mainwindow.h" line="543"/> <source>Toggle DC reported ceiling</source> <translation>Skru av/på dekograf fra computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="534"/> + <location filename="../qt-ui/mainwindow.ui" line="533"/> <location filename="../build/ui_mainwindow.h" line="544"/> <source>Toggle calculated ceiling</source> <translation>Skru av/på dekograf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="606"/> + <location filename="../qt-ui/mainwindow.ui" line="605"/> <location filename="../build/ui_mainwindow.h" line="550"/> <source>Toggle NDL, TTS</source> <translation>Skru av/på NDL, TTS</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="558"/> + <location filename="../qt-ui/mainwindow.ui" line="557"/> <location filename="../build/ui_mainwindow.h" line="546"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>Skru av/på 3m-inkrementer for dekotak</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="463"/> + <location filename="../qt-ui/mainwindow.ui" line="462"/> <location filename="../build/ui_mainwindow.h" line="537"/> <source>Configure &dive computer</source> <translation>Konfigurer &dykkecomputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="570"/> + <location filename="../qt-ui/mainwindow.ui" line="569"/> <location filename="../build/ui_mainwindow.h" line="547"/> <source>Toggle heart rate</source> <translation>Skru av/på hjertefrekvens</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="582"/> + <location filename="../qt-ui/mainwindow.ui" line="581"/> <location filename="../build/ui_mainwindow.h" line="548"/> <source>Toggle MOD</source> <translation>Skru av/på MOD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="594"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <location filename="../build/ui_mainwindow.h" line="549"/> <source>Toggle EAD, END, EADD</source> <translation>Skru av/på EAD, END, EADD</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="618"/> + <location filename="../qt-ui/mainwindow.ui" line="617"/> <location filename="../build/ui_mainwindow.h" line="551"/> <source>Toggle SAC rate</source> <translation>Skru av/på SAC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="630"/> + <location filename="../qt-ui/mainwindow.ui" line="629"/> <location filename="../build/ui_mainwindow.h" line="552"/> <source>Toggle ruler</source> <translation>Skru av/på linjal</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="95"/> + <location filename="../qt-ui/mainwindow.ui" line="86"/> <location filename="../build/ui_mainwindow.h" line="569"/> <source>&Log</source> <translation>&Logg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="112"/> + <location filename="../qt-ui/mainwindow.ui" line="103"/> <location filename="../build/ui_mainwindow.h" line="570"/> <source>&View</source> <translation>&Vis</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="128"/> + <location filename="../qt-ui/mainwindow.ui" line="119"/> <location filename="../build/ui_mainwindow.h" line="571"/> <source>&Help</source> <translation>&Hjelp</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="137"/> + <location filename="../qt-ui/mainwindow.ui" line="128"/> <location filename="../build/ui_mainwindow.h" line="572"/> <source>&Import</source> <translation>&Importer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="146"/> + <location filename="../qt-ui/mainwindow.ui" line="137"/> <location filename="../build/ui_mainwindow.h" line="573"/> <source>&Edit</source> <translation>R&ediger</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="158"/> + <location filename="../qt-ui/mainwindow.ui" line="142"/> + <source>Share on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="157"/> <location filename="../build/ui_mainwindow.h" line="453"/> <source>&New logbook</source> <translation>&Ny loggbok</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="161"/> + <location filename="../qt-ui/mainwindow.ui" line="160"/> <location filename="../build/ui_mainwindow.h" line="455"/> <source>New</source> <translation>Ny</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="164"/> + <location filename="../qt-ui/mainwindow.ui" line="163"/> <location filename="../build/ui_mainwindow.h" line="457"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="169"/> + <location filename="../qt-ui/mainwindow.ui" line="168"/> <location filename="../build/ui_mainwindow.h" line="458"/> <source>&Open logbook</source> <translation>Åpne l&oggbok</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="172"/> + <location filename="../qt-ui/mainwindow.ui" line="171"/> <location filename="../build/ui_mainwindow.h" line="460"/> - <location filename="../qt-ui/mainwindow.cpp" line="348"/> + <location filename="../qt-ui/mainwindow.cpp" line="362"/> <source>Open</source> <translation>Åpne</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="175"/> + <location filename="../qt-ui/mainwindow.ui" line="174"/> <location filename="../build/ui_mainwindow.h" line="462"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="180"/> + <location filename="../qt-ui/mainwindow.ui" line="179"/> <location filename="../build/ui_mainwindow.h" line="463"/> <source>&Save</source> <translation>Lagre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="183"/> + <location filename="../qt-ui/mainwindow.ui" line="182"/> <location filename="../build/ui_mainwindow.h" line="465"/> <source>Save</source> <translation>Lagre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="186"/> + <location filename="../qt-ui/mainwindow.ui" line="185"/> <location filename="../build/ui_mainwindow.h" line="467"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="191"/> + <location filename="../qt-ui/mainwindow.ui" line="190"/> <location filename="../build/ui_mainwindow.h" line="468"/> <source>Sa&ve as</source> <translation>Lagre som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="194"/> + <location filename="../qt-ui/mainwindow.ui" line="193"/> <location filename="../build/ui_mainwindow.h" line="470"/> <source>Save as</source> <translation>Lagre som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="197"/> + <location filename="../qt-ui/mainwindow.ui" line="196"/> <location filename="../build/ui_mainwindow.h" line="472"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="202"/> + <location filename="../qt-ui/mainwindow.ui" line="201"/> <location filename="../build/ui_mainwindow.h" line="473"/> <source>&Close</source> <translation>Lukk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="205"/> + <location filename="../qt-ui/mainwindow.ui" line="204"/> <location filename="../build/ui_mainwindow.h" line="475"/> <source>Close</source> <translation>Lukk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="208"/> + <location filename="../qt-ui/mainwindow.ui" line="207"/> <location filename="../build/ui_mainwindow.h" line="477"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="221"/> + <location filename="../qt-ui/mainwindow.ui" line="220"/> <location filename="../build/ui_mainwindow.h" line="480"/> <source>P&references</source> <translation>Valg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="251"/> + <location filename="../qt-ui/mainwindow.ui" line="250"/> <location filename="../build/ui_mainwindow.h" line="486"/> <source>Import &GPS data from Subsurface web service</source> <translation>Importer &GPS-data fra Subsurface webtjeneste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="259"/> + <location filename="../qt-ui/mainwindow.ui" line="258"/> <location filename="../build/ui_mainwindow.h" line="488"/> <source>Edit device &names</source> <translation>Rediger device&navn</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="272"/> + <location filename="../qt-ui/mainwindow.ui" line="271"/> <location filename="../build/ui_mainwindow.h" line="491"/> <source>&Edit dive</source> <translation>R&ediger dykk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="277"/> + <location filename="../qt-ui/mainwindow.ui" line="276"/> <location filename="../build/ui_mainwindow.h" line="492"/> <source>&Copy dive components</source> <translation>Kopier dykkekomponenter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="279"/> <location filename="../build/ui_mainwindow.h" line="493"/> <source>Ctrl+C</source> <translation>Ctrl+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="285"/> + <location filename="../qt-ui/mainwindow.ui" line="284"/> <location filename="../build/ui_mainwindow.h" line="494"/> <source>&Paste dive components</source> <translation>Lim inn dykkekomponenter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="288"/> + <location filename="../qt-ui/mainwindow.ui" line="287"/> <location filename="../build/ui_mainwindow.h" line="495"/> <source>Ctrl+V</source> <translation>Ctrl+V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="325"/> + <location filename="../qt-ui/mainwindow.ui" line="324"/> <location filename="../build/ui_mainwindow.h" line="503"/> <source>&Profile</source> <translation>&Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="333"/> + <location filename="../qt-ui/mainwindow.ui" line="332"/> <location filename="../build/ui_mainwindow.h" line="505"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="341"/> + <location filename="../qt-ui/mainwindow.ui" line="340"/> <location filename="../build/ui_mainwindow.h" line="507"/> <source>&All</source> <translation>&Alle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> + <location filename="../qt-ui/mainwindow.ui" line="356"/> <location filename="../build/ui_mainwindow.h" line="511"/> <source>&Next DC</source> <translation>&Neste computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="365"/> + <location filename="../qt-ui/mainwindow.ui" line="364"/> <location filename="../build/ui_mainwindow.h" line="513"/> <source>&About Subsurface</source> <translation>Om Subsurf&ace</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="381"/> + <location filename="../qt-ui/mainwindow.ui" line="380"/> <location filename="../build/ui_mainwindow.h" line="516"/> <source>&Globe</source> <translation>&Globus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="403"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <location filename="../build/ui_mainwindow.h" line="524"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="408"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <location filename="../build/ui_mainwindow.h" line="525"/> <source>Import &from divelogs.de</source> <translation>Importer &fra divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="416"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <location filename="../build/ui_mainwindow.h" line="526"/> <source>&Full screen</source> <translation>&Fullskjerm</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="419"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <location filename="../build/ui_mainwindow.h" line="528"/> <source>Toggle full screen</source> <translation>Fullskjerm av/på</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="447"/> + <location filename="../qt-ui/mainwindow.ui" line="446"/> <location filename="../build/ui_mainwindow.h" line="531"/> <source>&Check for updates</source> <translation>Se etter oppdateringer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="452"/> + <location filename="../qt-ui/mainwindow.ui" line="451"/> <location filename="../build/ui_mainwindow.h" line="532"/> <source>&Export</source> <translation>&Eksport</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="458"/> + <location filename="../qt-ui/mainwindow.ui" line="457"/> <location filename="../build/ui_mainwindow.h" line="536"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="466"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <location filename="../build/ui_mainwindow.h" line="538"/> <source>Ctrl+Shift+C</source> <translation>Ctrl+Shift+C</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="474"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <location filename="../build/ui_mainwindow.h" line="539"/> <source>Edit &dive in planner</source> <translation>Rediger &dykk i planlegger</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="486"/> + <location filename="../qt-ui/mainwindow.ui" line="485"/> <location filename="../build/ui_mainwindow.h" line="540"/> <source>Toggle pO₂ graph</source> <translation>Skru av/på pO₂-graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="498"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <location filename="../build/ui_mainwindow.h" line="541"/> <source>Toggle pN₂ graph</source> <translation>Skru av/på pN₂-graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="642"/> + <location filename="../qt-ui/mainwindow.ui" line="641"/> <location filename="../build/ui_mainwindow.h" line="553"/> <source>Scale graph</source> <translation>Skaler graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="654"/> + <location filename="../qt-ui/mainwindow.ui" line="653"/> <location filename="../build/ui_mainwindow.h" line="554"/> <source>Toggle pictures</source> <translation>Skru av/på bilder</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="666"/> + <location filename="../qt-ui/mainwindow.ui" line="665"/> <location filename="../build/ui_mainwindow.h" line="555"/> <source>Toggle tank bar</source> <translation>Skru av/på tank-linjen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="674"/> + <location filename="../qt-ui/mainwindow.ui" line="673"/> <location filename="../build/ui_mainwindow.h" line="556"/> <source>&Filter divelist</source> <translation>&Filtrer dykkeliste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="689"/> + <location filename="../qt-ui/mainwindow.ui" line="688"/> <location filename="../build/ui_mainwindow.h" line="558"/> <source>Toggle tissue graph</source> <translation>Skru av/på vev-graf</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="694"/> + <location filename="../qt-ui/mainwindow.ui" line="693"/> <location filename="../build/ui_mainwindow.h" line="559"/> <source>User &survey</source> <translation>Brukerunder&søkelse</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="699"/> + <location filename="../qt-ui/mainwindow.ui" line="698"/> <location filename="../build/ui_mainwindow.h" line="560"/> - <location filename="../qt-ui/mainwindow.cpp" line="222"/> + <location filename="../qt-ui/mainwindow.cpp" line="226"/> <source>&Undo</source> <translation>Angre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="702"/> + <location filename="../qt-ui/mainwindow.ui" line="701"/> <location filename="../build/ui_mainwindow.h" line="561"/> <source>Ctrl+Z</source> <translation>Ctrl+Z</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="707"/> + <location filename="../qt-ui/mainwindow.ui" line="706"/> <location filename="../build/ui_mainwindow.h" line="562"/> - <location filename="../qt-ui/mainwindow.cpp" line="223"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>&Redo</source> <translation>Gjør om</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="710"/> + <location filename="../qt-ui/mainwindow.ui" line="709"/> <location filename="../build/ui_mainwindow.h" line="563"/> <source>Ctrl+Shift+Z</source> <translation>Ctrl+Shift+Z</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="715"/> + <location filename="../qt-ui/mainwindow.ui" line="714"/> <location filename="../build/ui_mainwindow.h" line="564"/> <source>&Find moved images</source> <translation>&Finn bilder som er flyttet</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="720"/> + <location filename="../qt-ui/mainwindow.ui" line="719"/> <source>Open c&loud storage</source> <translation>Åpne skylager</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="725"/> + <location filename="../qt-ui/mainwindow.ui" line="724"/> <source>Save to clo&ud storage</source> <translation>Lagre til skylager</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="730"/> + <location filename="../qt-ui/mainwindow.ui" line="729"/> <location filename="../build/ui_mainwindow.h" line="567"/> <source>&Manage dive sites</source> <translation>Dykkestedsdatabase</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="735"/> + <location filename="../qt-ui/mainwindow.ui" line="734"/> <source>Dive Site &Edit</source> <translation>R&ediger dykkested</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="677"/> + <location filename="../qt-ui/mainwindow.ui" line="739"/> + <source>Facebook</source> + <translation>Facebook</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="676"/> <location filename="../build/ui_mainwindow.h" line="557"/> <source>Ctrl+F</source> <translation>Ctrl+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="213"/> + <location filename="../qt-ui/mainwindow.ui" line="212"/> <location filename="../build/ui_mainwindow.h" line="478"/> <source>&Print</source> <translation>Skriv ut</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="224"/> + <location filename="../qt-ui/mainwindow.ui" line="223"/> <location filename="../build/ui_mainwindow.h" line="481"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="232"/> + <location filename="../qt-ui/mainwindow.ui" line="231"/> <location filename="../build/ui_mainwindow.h" line="482"/> <source>&Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="243"/> + <location filename="../qt-ui/mainwindow.ui" line="242"/> <location filename="../build/ui_mainwindow.h" line="484"/> <source>Import from &dive computer</source> <translation>Importer fra &dykkecomputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="254"/> + <location filename="../qt-ui/mainwindow.ui" line="253"/> <location filename="../build/ui_mainwindow.h" line="487"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="267"/> + <location filename="../qt-ui/mainwindow.ui" line="266"/> <location filename="../build/ui_mainwindow.h" line="490"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="293"/> + <location filename="../qt-ui/mainwindow.ui" line="292"/> <location filename="../build/ui_mainwindow.h" line="496"/> <source>&Renumber</source> <translation>Nummere&r på nytt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="296"/> + <location filename="../qt-ui/mainwindow.ui" line="295"/> <location filename="../build/ui_mainwindow.h" line="497"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="312"/> + <location filename="../qt-ui/mainwindow.ui" line="311"/> <location filename="../build/ui_mainwindow.h" line="500"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="392"/> + <location filename="../qt-ui/mainwindow.ui" line="391"/> <location filename="../build/ui_mainwindow.h" line="519"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="216"/> + <location filename="../qt-ui/mainwindow.ui" line="215"/> <location filename="../build/ui_mainwindow.h" line="479"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="235"/> + <location filename="../qt-ui/mainwindow.ui" line="234"/> <location filename="../build/ui_mainwindow.h" line="483"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="246"/> + <location filename="../qt-ui/mainwindow.ui" line="245"/> <location filename="../build/ui_mainwindow.h" line="485"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="264"/> + <location filename="../qt-ui/mainwindow.ui" line="263"/> <location filename="../build/ui_mainwindow.h" line="489"/> <source>&Add dive</source> <translation>Legg til dykk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="304"/> + <location filename="../qt-ui/mainwindow.ui" line="303"/> <location filename="../build/ui_mainwindow.h" line="498"/> <source>Auto &group</source> <translation>Auto&grupper</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="309"/> + <location filename="../qt-ui/mainwindow.ui" line="308"/> <location filename="../build/ui_mainwindow.h" line="499"/> <source>&Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="317"/> + <location filename="../qt-ui/mainwindow.ui" line="316"/> <location filename="../build/ui_mainwindow.h" line="501"/> <source>&Dive list</source> <translation>&Dykkeliste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="320"/> + <location filename="../qt-ui/mainwindow.ui" line="319"/> <location filename="../build/ui_mainwindow.h" line="502"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="328"/> + <location filename="../qt-ui/mainwindow.ui" line="327"/> <location filename="../build/ui_mainwindow.h" line="504"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="336"/> + <location filename="../qt-ui/mainwindow.ui" line="335"/> <location filename="../build/ui_mainwindow.h" line="506"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="344"/> + <location filename="../qt-ui/mainwindow.ui" line="343"/> <location filename="../build/ui_mainwindow.h" line="508"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="349"/> + <location filename="../qt-ui/mainwindow.ui" line="348"/> <location filename="../build/ui_mainwindow.h" line="509"/> <source>P&revious DC</source> <translation>Fo&rrige computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> + <location filename="../qt-ui/mainwindow.ui" line="351"/> <location filename="../build/ui_mainwindow.h" line="510"/> <source>Left</source> <translation>Venstre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="360"/> + <location filename="../qt-ui/mainwindow.ui" line="359"/> <location filename="../build/ui_mainwindow.h" line="512"/> <source>Right</source> <translation>Høyre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="373"/> + <location filename="../qt-ui/mainwindow.ui" line="372"/> <location filename="../build/ui_mainwindow.h" line="514"/> <source>User &manual</source> <translation>Bruker&manual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="376"/> + <location filename="../qt-ui/mainwindow.ui" line="375"/> <location filename="../build/ui_mainwindow.h" line="515"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="384"/> + <location filename="../qt-ui/mainwindow.ui" line="383"/> <location filename="../build/ui_mainwindow.h" line="517"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="389"/> + <location filename="../qt-ui/mainwindow.ui" line="388"/> <location filename="../build/ui_mainwindow.h" line="518"/> <source>P&lan dive</source> <translation>P&lanlegg dykk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="397"/> + <location filename="../qt-ui/mainwindow.ui" line="396"/> <location filename="../build/ui_mainwindow.h" line="520"/> <source>&Import log files</source> <translation>&Importer loggfiler</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="400"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <location filename="../build/ui_mainwindow.h" line="522"/> <source>Import divelog files from other applications</source> <translation>Importer dykkelogg fra andre programmer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="422"/> + <location filename="../qt-ui/mainwindow.ui" line="421"/> <location filename="../build/ui_mainwindow.h" line="530"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="345"/> + <location filename="../qt-ui/mainwindow.cpp" line="359"/> <source>Open file</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="349"/> - <location filename="../qt-ui/mainwindow.cpp" line="454"/> - <location filename="../qt-ui/mainwindow.cpp" line="1800"/> + <location filename="../qt-ui/mainwindow.cpp" line="363"/> + <location filename="../qt-ui/mainwindow.cpp" line="468"/> + <location filename="../qt-ui/mainwindow.cpp" line="1814"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="450"/> + <location filename="../qt-ui/mainwindow.cpp" line="464"/> <source>Traverse image directories</source> <translation>Gå gjennom bildekataloger</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="453"/> + <location filename="../qt-ui/mainwindow.cpp" line="467"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="461"/> + <location filename="../qt-ui/mainwindow.cpp" line="475"/> <source>Scanning images...(this can take a while)</source> <translation>Går gjennom bilder... (dette kan ta en stund)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="514"/> + <location filename="../qt-ui/mainwindow.cpp" line="528"/> <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="../qt-ui/mainwindow.cpp" line="631"/> + <location filename="../qt-ui/mainwindow.cpp" line="645"/> <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="../qt-ui/mainwindow.cpp" line="678"/> + <location filename="../qt-ui/mainwindow.cpp" line="692"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="783"/> + <location filename="../qt-ui/mainwindow.cpp" line="797"/> <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="../qt-ui/mainwindow.cpp" line="1041"/> + <location filename="../qt-ui/mainwindow.cpp" line="1055"/> <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="../qt-ui/mainwindow.cpp" line="1044"/> + <location filename="../qt-ui/mainwindow.cpp" line="1058"/> <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="../qt-ui/mainwindow.cpp" line="1049"/> + <location filename="../qt-ui/mainwindow.cpp" line="1063"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1404"/> + <location filename="../qt-ui/mainwindow.cpp" line="1418"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1482"/> + <location filename="../qt-ui/mainwindow.cpp" line="1496"/> <source>[cloud storage for] %1</source> <translation>[skylager for] %1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1579"/> + <location filename="../qt-ui/mainwindow.cpp" line="1593"/> <source>Opening datafile from older version</source> <translation>Åpner datafil fra eldre versjon</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1580"/> + <location filename="../qt-ui/mainwindow.cpp" line="1594"/> <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="../qt-ui/mainwindow.cpp" line="1591"/> + <location filename="../qt-ui/mainwindow.cpp" line="1605"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1592"/> + <location filename="../qt-ui/mainwindow.cpp" line="1606"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;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);;All files (*)</source> <translation>Dykkeloggfiler (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;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-filer (*.apd *.APD);;Datatrak/WLog-filer (*.log *.LOG);;OSTCtools-filer (*.dive *.DIVE);;Alle filer (*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1800"/> + <location filename="../qt-ui/mainwindow.cpp" line="1814"/> <source>Contacting cloud service...</source> <translation>Kontakter skylager...</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1050"/> + <location filename="../qt-ui/mainwindow.cpp" line="1064"/> <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="../qt-ui/mainwindow.cpp" line="489"/> - <location filename="../qt-ui/mainwindow.cpp" line="631"/> - <location filename="../qt-ui/mainwindow.cpp" line="706"/> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> - <location filename="../qt-ui/mainwindow.cpp" line="783"/> - <location filename="../qt-ui/mainwindow.cpp" line="1637"/> + <location filename="../qt-ui/mainwindow.cpp" line="503"/> + <location filename="../qt-ui/mainwindow.cpp" line="645"/> + <location filename="../qt-ui/mainwindow.cpp" line="720"/> + <location filename="../qt-ui/mainwindow.cpp" line="791"/> + <location filename="../qt-ui/mainwindow.cpp" line="797"/> + <location filename="../qt-ui/mainwindow.cpp" line="1651"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="339"/> - <location filename="../qt-ui/mainwindow.cpp" line="384"/> - <location filename="../qt-ui/mainwindow.cpp" line="1386"/> + <location filename="../qt-ui/mainwindow.cpp" line="353"/> + <location filename="../qt-ui/mainwindow.cpp" line="398"/> + <location filename="../qt-ui/mainwindow.cpp" line="1400"/> <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="../qt-ui/mainwindow.cpp" line="706"/> + <location filename="../qt-ui/mainwindow.cpp" line="720"/> <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="../qt-ui/mainwindow.cpp" line="830"/> + <location filename="../qt-ui/mainwindow.cpp" line="844"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1405"/> + <location filename="../qt-ui/mainwindow.cpp" line="1419"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="777"/> - <location filename="../qt-ui/mainwindow.cpp" line="1637"/> + <location filename="../qt-ui/mainwindow.cpp" line="791"/> + <location filename="../qt-ui/mainwindow.cpp" line="1651"/> <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> @@ -5001,493 +5011,502 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <context> <name>PreferencesDialog</name> <message> - <location filename="../qt-ui/preferences.ui" line="97"/> + <location filename="../qt-ui/preferences.ui" line="88"/> <location filename="../build/ui_preferences.h" line="1288"/> <source>Defaults</source> <translation>Standardvalg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="107"/> + <location filename="../qt-ui/preferences.ui" line="98"/> <location filename="../build/ui_preferences.h" line="1290"/> <source>Units</source> <translation>Enheter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="117"/> + <location filename="../qt-ui/preferences.ui" line="108"/> <location filename="../build/ui_preferences.h" line="1292"/> <source>Graph</source> <translation>Graf</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="127"/> + <location filename="../qt-ui/preferences.ui" line="118"/> <location filename="../build/ui_preferences.h" line="1294"/> <source>Language</source> <translation>Språk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="137"/> + <location filename="../qt-ui/preferences.ui" line="128"/> <location filename="../build/ui_preferences.h" line="1296"/> <source>Network</source> <translation>Nettverk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="147"/> + <location filename="../qt-ui/preferences.ui" line="138"/> <location filename="../build/ui_preferences.h" line="1298"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="157"/> + <location filename="../qt-ui/preferences.ui" line="148"/> <location filename="../build/ui_preferences.h" line="1300"/> <source>Georeference</source> <translation>Geo-referanse</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="217"/> + <location filename="../qt-ui/preferences.ui" line="190"/> <location filename="../build/ui_preferences.h" line="1304"/> <source>Font</source> <translation>Skrifttype</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="227"/> + <location filename="../qt-ui/preferences.ui" line="200"/> <location filename="../build/ui_preferences.h" line="1305"/> <source>Font size</source> <translation>Skriftstørrelse</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="240"/> + <location filename="../qt-ui/preferences.ui" line="213"/> <location filename="../build/ui_preferences.h" line="1306"/> <source>Dives</source> <translation>Dykk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="273"/> + <location filename="../qt-ui/preferences.ui" line="237"/> <location filename="../build/ui_preferences.h" line="1308"/> <source>No default file</source> <translation>Ingen forhåndsvalgt fil</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="283"/> + <location filename="../qt-ui/preferences.ui" line="247"/> <location filename="../build/ui_preferences.h" line="1309"/> <source>&Local default file</source> <translation>&Lokal forhåndsvalgt fil</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="293"/> + <location filename="../qt-ui/preferences.ui" line="257"/> <location filename="../build/ui_preferences.h" line="1310"/> <source>Clo&ud storage default file</source> <translation>Forhåndsvalgt fil for skylager</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="305"/> + <location filename="../qt-ui/preferences.ui" line="269"/> <location filename="../build/ui_preferences.h" line="1311"/> <source>Local dive log file</source> <translation>Lokal dykkelogg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="317"/> + <location filename="../qt-ui/preferences.ui" line="281"/> <location filename="../build/ui_preferences.h" line="1312"/> <source>Use default</source> <translation>Bruk standard</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="327"/> + <location filename="../qt-ui/preferences.ui" line="291"/> <location filename="../build/ui_preferences.h" line="1313"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="349"/> <location filename="../build/ui_preferences.h" line="1318"/> <source>Animations</source> <translation>Animasjoner</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="412"/> + <location filename="../qt-ui/preferences.ui" line="358"/> <location filename="../build/ui_preferences.h" line="1319"/> <source>Speed</source> <translation>Hastighet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="439"/> + <location filename="../qt-ui/preferences.ui" line="385"/> <location filename="../build/ui_preferences.h" line="1320"/> <source>Clear all settings</source> <translation>Slett alle valg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="460"/> + <location filename="../qt-ui/preferences.ui" line="397"/> <location filename="../build/ui_preferences.h" line="1321"/> <source>Reset all settings to their default value</source> <translation>Tilbakestill valg til standardverdier</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="508"/> + <location filename="../qt-ui/preferences.ui" line="436"/> <location filename="../build/ui_preferences.h" line="1322"/> <source>Unit system</source> <translation>Enhetssystem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="514"/> + <location filename="../qt-ui/preferences.ui" line="442"/> <location filename="../build/ui_preferences.h" line="1323"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1572"/> + <location filename="../qt-ui/preferences.ui" line="1395"/> + <source>Connect to facebook text placeholder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1407"/> + <source>Disconnect</source> + <translation>Koble fra</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="1433"/> <location filename="../build/ui_preferences.h" line="1401"/> <source>Dive site geo lookup</source> <translation>Geo-oppslag av dykkested</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1578"/> + <location filename="../qt-ui/preferences.ui" line="1439"/> <location filename="../build/ui_preferences.h" line="1402"/> <source>Enable geocoding for dive site management</source> <translation>Skru på geo-koding for dykkestedsdatabase</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1585"/> + <location filename="../qt-ui/preferences.ui" line="1446"/> <location filename="../build/ui_preferences.h" line="1403"/> <source>Parse site without GPS data</source> <translation>Les inn sted uten GPS-data</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1592"/> + <location filename="../qt-ui/preferences.ui" line="1453"/> <location filename="../build/ui_preferences.h" line="1404"/> <source>Same format for existing dives</source> <translation>Samme format for eksisterende dyk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1602"/> + <location filename="../qt-ui/preferences.ui" line="1463"/> <location filename="../build/ui_preferences.h" line="1405"/> <source>Dive Site Layout</source> <translation>Dykkestedsoppsett</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1624"/> - <location filename="../qt-ui/preferences.ui" line="1641"/> + <location filename="../qt-ui/preferences.ui" line="1485"/> + <location filename="../qt-ui/preferences.ui" line="1502"/> <location filename="../build/ui_preferences.h" line="1406"/> <location filename="../build/ui_preferences.h" line="1407"/> <source>/</source> <translation>/</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="531"/> + <location filename="../qt-ui/preferences.ui" line="459"/> <location filename="../build/ui_preferences.h" line="1325"/> <source>Imperial</source> <translation>Britiske mål</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="566"/> + <location filename="../qt-ui/preferences.ui" line="494"/> <location filename="../build/ui_preferences.h" line="1328"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="573"/> + <location filename="../qt-ui/preferences.ui" line="501"/> <location filename="../build/ui_preferences.h" line="1329"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="583"/> + <location filename="../qt-ui/preferences.ui" line="511"/> <location filename="../build/ui_preferences.h" line="1330"/> <source>feet</source> <translation>fot</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="600"/> - <location filename="../qt-ui/preferences.ui" line="1027"/> + <location filename="../qt-ui/preferences.ui" line="528"/> + <location filename="../qt-ui/preferences.ui" line="946"/> <location filename="../build/ui_preferences.h" line="1332"/> <location filename="../build/ui_preferences.h" line="1366"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="610"/> + <location filename="../qt-ui/preferences.ui" line="538"/> <location filename="../build/ui_preferences.h" line="1333"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="637"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <location filename="../build/ui_preferences.h" line="1336"/> <source>cu ft</source> <translation>ft³</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="654"/> + <location filename="../qt-ui/preferences.ui" line="582"/> <location filename="../build/ui_preferences.h" line="1338"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="664"/> + <location filename="../qt-ui/preferences.ui" line="592"/> <location filename="../build/ui_preferences.h" line="1339"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="681"/> + <location filename="../qt-ui/preferences.ui" line="609"/> <location filename="../build/ui_preferences.h" line="1341"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1006"/> + <location filename="../qt-ui/preferences.ui" line="925"/> <location filename="../build/ui_preferences.h" line="1363"/> <source>CCR: show setpoints when viewing pO₂</source> <translation>CCR: vis settpunkter når pO₂ vises</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1013"/> + <location filename="../qt-ui/preferences.ui" line="932"/> <location filename="../build/ui_preferences.h" line="1364"/> <source>CCR: show individual O₂ sensor values when viewing pO₂</source> <translation>CCR: vis individuelle O₂-sensorverdier når pO₂ vises</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1020"/> + <location filename="../qt-ui/preferences.ui" line="939"/> <location filename="../build/ui_preferences.h" line="1365"/> <source>Default CCR set-point for dive planning</source> <translation>Standard CCR settpunkt for dykkeplanlegging</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1043"/> + <location filename="../qt-ui/preferences.ui" line="962"/> <location filename="../build/ui_preferences.h" line="1367"/> <source>pSCR O₂ metabolism rate</source> <translation>pSCR O₂ metabolisme-rate</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1050"/> + <location filename="../qt-ui/preferences.ui" line="969"/> <location filename="../build/ui_preferences.h" line="1368"/> <source>pSCR ratio</source> <translation>pSCR-forhold</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1057"/> + <location filename="../qt-ui/preferences.ui" line="976"/> <location filename="../build/ui_preferences.h" line="1369"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1070"/> + <location filename="../qt-ui/preferences.ui" line="989"/> <location filename="../build/ui_preferences.h" line="1371"/> <source>1:</source> <translation>1:</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1127"/> + <location filename="../qt-ui/preferences.ui" line="1037"/> <location filename="../build/ui_preferences.h" line="1372"/> <source>UI language</source> <translation>Språk i brukergrensesnitt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1133"/> + <location filename="../qt-ui/preferences.ui" line="1043"/> <location filename="../build/ui_preferences.h" line="1373"/> <source>System default</source> <translation>Systemstandard</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1214"/> + <location filename="../qt-ui/preferences.ui" line="1115"/> <location filename="../build/ui_preferences.h" line="1375"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1253"/> + <location filename="../qt-ui/preferences.ui" line="1154"/> <location filename="../build/ui_preferences.h" line="1379"/> <source>Proxy type</source> <translation>Proxytype</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1236"/> + <location filename="../qt-ui/preferences.ui" line="1137"/> <location filename="../build/ui_preferences.h" line="1377"/> <source>Host</source> <translation>Tjener</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1226"/> + <location filename="../qt-ui/preferences.ui" line="1127"/> <location filename="../build/ui_preferences.h" line="1376"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1246"/> + <location filename="../qt-ui/preferences.ui" line="1147"/> <location filename="../build/ui_preferences.h" line="1378"/> <source>Requires authentication</source> <translation>Krever autentisering</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1263"/> + <location filename="../qt-ui/preferences.ui" line="1164"/> <location filename="../build/ui_preferences.h" line="1380"/> <source>Username</source> <translation>Brukernavn</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1312"/> - <location filename="../qt-ui/preferences.ui" line="1366"/> + <location filename="../qt-ui/preferences.ui" line="1213"/> + <location filename="../qt-ui/preferences.ui" line="1267"/> <location filename="../build/ui_preferences.h" line="1381"/> <location filename="../build/ui_preferences.h" line="1387"/> <source>Password</source> <translation>Passord</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1526"/> <location filename="../build/ui_preferences.h" line="1400"/> <source>Disconnect from Facebook</source> <translation>Koble fra Facebook</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1153"/> + <location filename="../qt-ui/preferences.ui" line="1063"/> <location filename="../build/ui_preferences.h" line="1374"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="593"/> + <location filename="../qt-ui/preferences.ui" line="521"/> <location filename="../build/ui_preferences.h" line="1331"/> <source>Pressure</source> <translation>Trykk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="199"/> + <location filename="../qt-ui/preferences.ui" line="181"/> <location filename="../build/ui_preferences.h" line="1303"/> <source>Lists and tables</source> <translation>Lister og tabeller</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="264"/> + <location filename="../qt-ui/preferences.ui" line="228"/> <location filename="../build/ui_preferences.h" line="1307"/> <source>Default dive log file</source> <translation>Standard loggfil</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="336"/> + <location filename="../qt-ui/preferences.ui" line="300"/> <location filename="../build/ui_preferences.h" line="1314"/> <source>Display invalid</source> <translation>Vis ugyldige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="353"/> + <location filename="../qt-ui/preferences.ui" line="317"/> <location filename="../build/ui_preferences.h" line="1316"/> <source>Default cylinder</source> <translation>Standardflaske</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="377"/> + <location filename="../qt-ui/preferences.ui" line="332"/> <location filename="../build/ui_preferences.h" line="1317"/> <source>Use default cylinder</source> <translation>Bruk standardflaske</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1350"/> + <location filename="../qt-ui/preferences.ui" line="1251"/> <location filename="../build/ui_preferences.h" line="1382"/> <location filename="../qt-ui/preferences.cpp" line="123"/> <source>Subsurface cloud storage</source> <translation>Skylager for Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1359"/> + <location filename="../qt-ui/preferences.ui" line="1260"/> <location filename="../build/ui_preferences.h" line="1386"/> <source>Email address</source> <translation>Epostadresse</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1373"/> + <location filename="../qt-ui/preferences.ui" line="1274"/> <location filename="../build/ui_preferences.h" line="1388"/> <source>Verification PIN</source> <translation>Bekreftelses-PIN</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1380"/> + <location filename="../qt-ui/preferences.ui" line="1281"/> <source>New password</source> <translation>Nytt passord</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1408"/> + <location filename="../qt-ui/preferences.ui" line="1308"/> <location filename="../build/ui_preferences.h" line="1395"/> <source>Sync to cloud in the background?</source> <translation>Synkronisere til skylager i bakgrunnen?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1415"/> + <location filename="../qt-ui/preferences.ui" line="1315"/> <location filename="../build/ui_preferences.h" line="1396"/> <source>Save Password locally?</source> <translation>Lagre passord lokalt?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1425"/> + <location filename="../qt-ui/preferences.ui" line="1325"/> <location filename="../build/ui_preferences.h" line="1397"/> <source>Subsurface web service</source> <translation>Subsurface webtjeneste</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1446"/> + <location filename="../qt-ui/preferences.ui" line="1337"/> <location filename="../build/ui_preferences.h" line="1398"/> <source>Default user ID</source> <translation>Standard bruker-ID</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="1456"/> + <location filename="../qt-ui/preferences.ui" line="1347"/> <location filename="../build/ui_preferences.h" line="1399"/> <source>Save user ID locally?</source> <translation>Lagre bruker-ID lokalt?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="620"/> + <location filename="../qt-ui/preferences.ui" line="548"/> <location filename="../build/ui_preferences.h" line="1334"/> <source>Volume</source> <translation>Volum</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="647"/> + <location filename="../qt-ui/preferences.ui" line="575"/> <location filename="../build/ui_preferences.h" line="1337"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="674"/> + <location filename="../qt-ui/preferences.ui" line="602"/> <location filename="../build/ui_preferences.h" line="1340"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="691"/> + <location filename="../qt-ui/preferences.ui" line="619"/> <location filename="../build/ui_preferences.h" line="1342"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="706"/> + <location filename="../qt-ui/preferences.ui" line="634"/> <location filename="../build/ui_preferences.h" line="1343"/> <source>Time units</source> <translation>Tidsenheter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="719"/> + <location filename="../qt-ui/preferences.ui" line="647"/> <location filename="../build/ui_preferences.h" line="1345"/> <source>Minutes</source> <translation>Minutter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="729"/> + <location filename="../qt-ui/preferences.ui" line="657"/> <location filename="../build/ui_preferences.h" line="1346"/> <source>Seconds</source> <translation>Sekunder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="818"/> + <location filename="../qt-ui/preferences.ui" line="737"/> <location filename="../build/ui_preferences.h" line="1351"/> <source>Show</source> <translation>Vis</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="999"/> + <location filename="../qt-ui/preferences.ui" line="918"/> <location filename="../build/ui_preferences.h" line="1362"/> <source>GFLow at max depth</source> <translation>GF lav ved maksdybde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="959"/> + <location filename="../qt-ui/preferences.ui" line="878"/> <location filename="../build/ui_preferences.h" line="1359"/> <source>Misc</source> <translation>Ymse</translation> @@ -5499,140 +5518,140 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <translation>Valg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="521"/> + <location filename="../qt-ui/preferences.ui" line="449"/> <location filename="../build/ui_preferences.h" line="1324"/> <source>&Metric</source> <translation>&Metrisk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="541"/> + <location filename="../qt-ui/preferences.ui" line="469"/> <location filename="../build/ui_preferences.h" line="1326"/> <source>Personali&ze</source> <translation>Personifiser</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="554"/> + <location filename="../qt-ui/preferences.ui" line="482"/> <location filename="../build/ui_preferences.h" line="1327"/> <source>Individual settings</source> <translation>Individuelle valg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="627"/> + <location filename="../qt-ui/preferences.ui" line="555"/> <location filename="../build/ui_preferences.h" line="1335"/> <source>&liter</source> <translation>&liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="712"/> + <location filename="../qt-ui/preferences.ui" line="640"/> <location filename="../build/ui_preferences.h" line="1344"/> <source>Ascent/descent speed denominator</source> <translation>Tidsenhet for opp- og nedstigning</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="744"/> + <location filename="../qt-ui/preferences.ui" line="672"/> <location filename="../build/ui_preferences.h" line="1347"/> <source>GPS coordinates</source> <translation>GPS-koordinater</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="750"/> + <location filename="../qt-ui/preferences.ui" line="678"/> <location filename="../build/ui_preferences.h" line="1348"/> <source>Location Display</source> <translation>Stedsvisning</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="757"/> + <location filename="../qt-ui/preferences.ui" line="685"/> <location filename="../build/ui_preferences.h" line="1349"/> <source>traditional (dms)</source> <translation>tradisjonell (dms)</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="767"/> + <location filename="../qt-ui/preferences.ui" line="695"/> <location filename="../build/ui_preferences.h" line="1350"/> <source>decimal</source> <translation>desimal</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="829"/> + <location filename="../qt-ui/preferences.ui" line="748"/> <location filename="../build/ui_preferences.h" line="1352"/> <source>Threshold when showing pO₂</source> <translation>Grense når pO₂ vises</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="853"/> + <location filename="../qt-ui/preferences.ui" line="772"/> <location filename="../build/ui_preferences.h" line="1353"/> <source>Threshold when showing pN₂</source> <translation>Grense når pN₂ vises</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="877"/> + <location filename="../qt-ui/preferences.ui" line="796"/> <location filename="../build/ui_preferences.h" line="1354"/> <source>Threshold when showing pHe</source> <translation>Grense når pHe vises</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="901"/> + <location filename="../qt-ui/preferences.ui" line="820"/> <location filename="../build/ui_preferences.h" line="1355"/> <source>Max pO₂ when showing MOD</source> <translation>Maks pO₂ når MOD vises</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="925"/> + <location filename="../qt-ui/preferences.ui" line="844"/> <location filename="../build/ui_preferences.h" line="1356"/> <source>Draw dive computer reported ceiling red</source> <translation>Farg dekograf fra dykkecomputer i rødt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="936"/> + <location filename="../qt-ui/preferences.ui" line="855"/> <location filename="../build/ui_preferences.h" line="1357"/> <source>Show unused cylinders in Equipment tab</source> <translation>Vis ubrukte flasker i utstyrsfanen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="947"/> + <location filename="../qt-ui/preferences.ui" line="866"/> <location filename="../build/ui_preferences.h" line="1358"/> <source>Show average depth</source> <translation>Vis snittdybde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="965"/> + <location filename="../qt-ui/preferences.ui" line="884"/> <location filename="../build/ui_preferences.h" line="1360"/> <source>GFLow</source> <translation>GF lav</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="982"/> + <location filename="../qt-ui/preferences.ui" line="901"/> <location filename="../build/ui_preferences.h" line="1361"/> <source>GFHigh</source> <translation>GF høy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="42"/> + <location filename="../qt-ui/preferences.cpp" line="45"/> <source>No proxy</source> <translation>Ingen proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="43"/> + <location filename="../qt-ui/preferences.cpp" line="46"/> <source>System proxy</source> <translation>System-proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="44"/> + <location filename="../qt-ui/preferences.cpp" line="47"/> <source>HTTP proxy</source> <translation>HTTP-proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="45"/> + <location filename="../qt-ui/preferences.cpp" line="48"/> <source>SOCKS proxy</source> <translation>SOCKS-proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="86"/> + <location filename="../qt-ui/preferences.cpp" line="89"/> <source>To disconnect Subsurface from your Facebook account, use the button below</source> <translation>Bruk knappen under for å koble Subsurface fra Facebook</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="100"/> + <location filename="../qt-ui/preferences.cpp" line="101"/> <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> @@ -5984,12 +6003,12 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <context> <name>QObject</name> <message> - <location filename="../qthelper.cpp" line="1210"/> + <location filename="../qthelper.cpp" line="1226"/> <source>AIR</source> <translation>Luft</translation> </message> <message> - <location filename="../qthelper.cpp" line="1210"/> + <location filename="../qthelper.cpp" line="1226"/> <source>OXYGEN</source> <translation>Oksygen</translation> </message> @@ -6029,42 +6048,42 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <translation>min</translation> </message> <message> - <location filename="../qthelper.cpp" line="1224"/> + <location filename="../qthelper.cpp" line="1240"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qthelper.cpp" line="1225"/> + <location filename="../qthelper.cpp" line="1241"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qthelper.cpp" line="1248"/> + <location filename="../qthelper.cpp" line="1264"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qthelper.cpp" line="1249"/> + <location filename="../qthelper.cpp" line="1265"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qthelper.cpp" line="1271"/> + <location filename="../qthelper.cpp" line="1287"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qthelper.cpp" line="1272"/> + <location filename="../qthelper.cpp" line="1288"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qthelper.cpp" line="1294"/> + <location filename="../qthelper.cpp" line="1310"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qthelper.cpp" line="1295"/> + <location filename="../qthelper.cpp" line="1311"/> <source>cuft</source> <translation>ft³</translation> </message> @@ -6760,6 +6779,17 @@ valgte dykk. </translation> <source>color6</source> <translation>farge6</translation> </message> + <message> + <location filename="../qt-ui/templateedit.cpp" line="135"/> + <source>Do you want to save your changes?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/templateedit.cpp" line="140"/> + <source>You are about to modify a template bundled with Subsurface. +</source> + <translation type="unfinished"/> + </message> </context> <context> <name>TestParse</name> @@ -7367,29 +7397,29 @@ Snitt</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="193"/> + <location filename="../dive.c" line="194"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="198"/> + <location filename="../dive.c" line="199"/> <location filename="../qthelper.cpp" line="895"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="202"/> + <location filename="../dive.c" line="203"/> <location filename="../qthelper.cpp" line="898"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="244"/> + <location filename="../dive.c" line="245"/> <source>cuft</source> <translation>ft³</translation> </message> <message> - <location filename="../dive.c" line="281"/> + <location filename="../dive.c" line="282"/> <location filename="../qthelper.cpp" line="777"/> <location filename="../qthelper.cpp" line="792"/> <location filename="../worldmap-save.c" line="44"/> @@ -7397,56 +7427,56 @@ Snitt</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="286"/> + <location filename="../dive.c" line="287"/> <location filename="../qthelper.cpp" line="780"/> <location filename="../qthelper.cpp" line="794"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="309"/> + <location filename="../dive.c" line="310"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="312"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="316"/> + <location filename="../dive.c" line="317"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="318"/> + <location filename="../dive.c" line="319"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="337"/> + <location filename="../dive.c" line="338"/> <location filename="../qthelper.cpp" line="803"/> <location filename="../qthelper.cpp" line="813"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../dive.c" line="341"/> + <location filename="../dive.c" line="342"/> <location filename="../qthelper.cpp" line="801"/> <location filename="../qthelper.cpp" line="811"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1558"/> + <location filename="../dive.c" line="1559"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> <location filename="../divelist.c" line="482"/> <location filename="../equipment.c" line="81"/> - <location filename="../planner.c" line="1391"/> - <location filename="../planner.c" line="1394"/> + <location filename="../planner.c" line="1398"/> + <location filename="../planner.c" line="1401"/> <source>air</source> <translation>luft</translation> </message> @@ -7816,6 +7846,7 @@ Snitt</translation> </translation> </message> <message> + <location filename="../load-git.c" line="189"/> <location filename="../parse-xml.c" line="1240"/> <source>multiple GPS locations for this dive site; also %s </source> @@ -7838,179 +7869,179 @@ Snitt</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="1014"/> - <location filename="../planner.c" line="1165"/> + <location filename="../planner.c" line="1021"/> + <location filename="../planner.c" line="1172"/> <source>Can't find gas %s</source> <translation>Finner ikke gassen %s</translation> </message> <message> - <location filename="../planner.c" line="365"/> + <location filename="../planner.c" line="372"/> <source>Too many gas mixes</source> <translation>For mange gassmikser</translation> </message> <message> - <location filename="../planner.c" line="564"/> + <location filename="../planner.c" line="571"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Kalkulering av dekompresjon tok for lang tid, og er avbrutt</translation> </message> <message> - <location filename="../planner.c" line="588"/> + <location filename="../planner.c" line="595"/> <source>Subsurface dive plan</source> <translation>Subsurface dykkeplan</translation> </message> <message> - <location filename="../planner.c" line="592"/> + <location filename="../planner.c" line="599"/> <source>depth</source> <translation>dybde</translation> </message> <message> - <location filename="../planner.c" line="598"/> + <location filename="../planner.c" line="605"/> <source>runtime</source> <translation>løpetid</translation> </message> <message> - <location filename="../planner.c" line="595"/> + <location filename="../planner.c" line="602"/> <source>duration</source> <translation>lengde</translation> </message> <message> - <location filename="../planner.c" line="550"/> + <location filename="../planner.c" line="557"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>Advarsel: Dette er en ny implementasjon av %s og er en dykkeplan-implementasjon som bare har sett begrenset med testing. Vi anbefaler å ikke planlegge dykk utelukkende på bakgrunn av disse resultatene.</translation> </message> <message> - <location filename="../planner.c" line="576"/> - <source>based on Buhlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation>basert på Buhlmann ZHL-16B med GFlow = %d og GFhigh = %d</translation> - </message> - <message> - <location filename="../planner.c" line="584"/> - <source>recreational mode based on Buhlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation>rekreasjonsmodus basert på Bühlmann ZHL-16B med GFlow = %d og GFhigh = %d</translation> - </message> - <message> - <location filename="../planner.c" line="601"/> + <location filename="../planner.c" line="608"/> <source>gas</source> <translation>gass</translation> </message> <message> - <location filename="../planner.c" line="644"/> + <location filename="../planner.c" line="651"/> <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="../planner.c" line="652"/> + <location filename="../planner.c" line="659"/> <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="../planner.c" line="665"/> + <location filename="../planner.c" line="672"/> <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="../planner.c" line="672"/> + <location filename="../planner.c" line="679"/> <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="../planner.c" line="705"/> + <location filename="../planner.c" line="712"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="708"/> - <location filename="../planner.c" line="712"/> + <location filename="../planner.c" line="715"/> + <location filename="../planner.c" line="719"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="721"/> - <location filename="../planner.c" line="733"/> + <location filename="../planner.c" line="728"/> + <location filename="../planner.c" line="740"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="756"/> + <location filename="../planner.c" line="763"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Bytt gass til %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../planner.c" line="758"/> + <location filename="../planner.c" line="765"/> <source>Switch gas to %s</source> <translation>Bytt til gass %s</translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="783"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="778"/> + <location filename="../planner.c" line="785"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="789"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gassforbruk (CCR-etapper ekskludert):</translation> </message> <message> - <location filename="../planner.c" line="784"/> + <location filename="../planner.c" line="791"/> <source>Gas consumption:</source> <translation>Gassforbruk:</translation> </message> <message> - <location filename="../planner.c" line="566"/> - <location filename="../planner.c" line="804"/> - <location filename="../planner.c" line="809"/> - <location filename="../planner.c" line="834"/> - <location filename="../planner.c" line="844"/> + <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="811"/> + <location filename="../planner.c" line="816"/> + <location filename="../planner.c" line="841"/> + <location filename="../planner.c" line="851"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> <message> - <location filename="../planner.c" line="580"/> + <location filename="../planner.c" line="583"/> + <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="587"/> <source>based on VPM-B at nominal conservatism</source> <translation>basert på VPM-B med standard konservatisme</translation> </message> <message> - <location filename="../planner.c" line="582"/> + <location filename="../planner.c" line="589"/> <source>based on VPM-B at +%d conservatism</source> <translation>basert på VPM-B med +%d konservatisme</translation> </message> <message> - <location filename="../planner.c" line="805"/> + <location filename="../planner.c" line="591"/> + <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="812"/> <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="../planner.c" line="810"/> + <location filename="../planner.c" line="817"/> <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="../planner.c" line="812"/> + <location filename="../planner.c" line="819"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s i planlagt oppstigning)</translation> </message> <message> - <location filename="../planner.c" line="814"/> + <location filename="../planner.c" line="821"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planlagt oppstigning) av %s</translation> </message> <message> - <location filename="../planner.c" line="831"/> + <location filename="../planner.c" line="838"/> <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="../planner.c" line="841"/> + <location filename="../planner.c" line="848"/> <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="../planner.c" line="1399"/> + <location filename="../planner.c" line="1406"/> <source>ean</source> <translation>ean</translation> </message> @@ -8299,34 +8330,34 @@ EADD: %d%s <translation>%1 %2 (1 dykk)</translation> </message> <message> - <location filename="../dive.c" line="22"/> + <location filename="../dive.c" line="23"/> <source>boat</source> <translation>båt</translation> </message> <message> - <location filename="../dive.c" line="22"/> + <location filename="../dive.c" line="23"/> <source>shore</source> <translation>landdykk</translation> </message> <message> <location filename="../datatrak.c" line="450"/> - <location filename="../dive.c" line="22"/> + <location filename="../dive.c" line="23"/> <source>drift</source> <translation>strømdykk</translation> </message> <message> - <location filename="../dive.c" line="23"/> + <location filename="../dive.c" line="24"/> <source>deep</source> <translation>dypdykk</translation> </message> <message> - <location filename="../dive.c" line="23"/> + <location filename="../dive.c" line="24"/> <source>cavern</source> <translation>hule</translation> </message> <message> <location filename="../datatrak.c" line="434"/> - <location filename="../dive.c" line="23"/> + <location filename="../dive.c" line="24"/> <source>ice</source> <translation>isdykk</translation> </message> @@ -8337,40 +8368,40 @@ EADD: %d%s </message> <message> <location filename="../datatrak.c" line="446"/> - <location filename="../dive.c" line="24"/> + <location filename="../dive.c" line="25"/> <source>wreck</source> <translation>vrakdykk</translation> </message> <message> <location filename="../datatrak.c" line="432"/> - <location filename="../dive.c" line="24"/> + <location filename="../dive.c" line="25"/> <source>cave</source> <translation>grotte</translation> </message> <message> - <location filename="../dive.c" line="24"/> + <location filename="../dive.c" line="25"/> <source>altitude</source> <translation>høydedykk</translation> </message> <message> - <location filename="../dive.c" line="25"/> + <location filename="../dive.c" line="26"/> <source>pool</source> <translation>basseng</translation> </message> <message> - <location filename="../dive.c" line="25"/> + <location filename="../dive.c" line="26"/> <source>lake</source> <translation>innsjø</translation> </message> <message> <location filename="../datatrak.c" line="448"/> - <location filename="../dive.c" line="25"/> + <location filename="../dive.c" line="26"/> <source>river</source> <translation>elv</translation> </message> <message> <location filename="../datatrak.c" line="430"/> - <location filename="../dive.c" line="26"/> + <location filename="../dive.c" line="27"/> <source>night</source> <translation>nattdykk</translation> </message> @@ -8456,7 +8487,7 @@ EADD: %d%s </message> <message> <location filename="../datatrak.c" line="395"/> - <location filename="../dive.c" line="26"/> + <location filename="../dive.c" line="27"/> <source>fresh</source> <translation>ferskvann</translation> </message> @@ -8516,53 +8547,53 @@ EADD: %d%s <translation>Feil: Ikke noe dykk</translation> </message> <message> - <location filename="../dive.c" line="26"/> + <location filename="../dive.c" line="27"/> <source>student</source> <translation>elev</translation> </message> <message> <location filename="../datatrak.c" line="452"/> - <location filename="../dive.c" line="27"/> + <location filename="../dive.c" line="28"/> <source>photo</source> <translation>foto</translation> </message> <message> - <location filename="../dive.c" line="27"/> + <location filename="../dive.c" line="28"/> <source>video</source> <translation>video</translation> </message> <message> <location filename="../datatrak.c" line="426"/> - <location filename="../dive.c" line="27"/> + <location filename="../dive.c" line="28"/> <source>instructor</source> <translation>instruktør</translation> </message> <message> <location filename="../datatrak.c" line="389"/> - <location filename="../dive.c" line="28"/> + <location filename="../dive.c" line="29"/> <source>deco</source> <translation>deko</translation> </message> <message> - <location filename="../dive.c" line="32"/> + <location filename="../dive.c" line="33"/> <source>OC-gas</source> <translation>OC-gass</translation> </message> <message> - <location filename="../dive.c" line="32"/> + <location filename="../dive.c" line="33"/> <source>diluent</source> <translation>diluent</translation> </message> <message> - <location filename="../dive.c" line="32"/> + <location filename="../dive.c" line="33"/> <location filename="../equipment.c" line="85"/> - <location filename="../planner.c" line="1395"/> - <location filename="../planner.c" line="1398"/> + <location filename="../planner.c" line="1402"/> + <location filename="../planner.c" line="1405"/> <source>oxygen</source> <translation>oksygen</translation> </message> <message> - <location filename="../dive.c" line="239"/> + <location filename="../dive.c" line="240"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -8709,17 +8740,17 @@ EADD: %d%s <message> <location filename="../libdivecomputer.c" line="154"/> <location filename="../parse-xml.c" line="3182"/> - <location filename="../uemis-downloader.c" line="123"/> + <location filename="../uemis-downloader.c" line="131"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../uemis-downloader.c" line="454"/> + <location filename="../uemis-downloader.c" line="462"/> <source>data</source> <translation>data</translation> </message> <message> - <location filename="../uemis-downloader.c" line="434"/> + <location filename="../uemis-downloader.c" line="442"/> <source>%s %s</source> <translation>%s %s</translation> </message> @@ -8750,82 +8781,82 @@ Is the Uemis Zurich plugged in correctly?</source> Er Uemis Zurich plugget i ordentlig?</translation> </message> <message> - <location filename="../uemis-downloader.c" line="482"/> + <location filename="../uemis-downloader.c" line="490"/> <source>divelog #</source> <translation>logg # </translation> </message> <message> - <location filename="../uemis-downloader.c" line="484"/> + <location filename="../uemis-downloader.c" line="492"/> <source>divespot #</source> <translation>dykkested # </translation> </message> <message> - <location filename="../uemis-downloader.c" line="486"/> + <location filename="../uemis-downloader.c" line="494"/> <source>details for #</source> <translation>detaljer for # </translation> </message> <message> - <location filename="../uemis-downloader.c" line="687"/> + <location filename="../uemis-downloader.c" line="695"/> <source>wetsuit</source> <translation>våtdrakt</translation> </message> <message> - <location filename="../uemis-downloader.c" line="687"/> + <location filename="../uemis-downloader.c" line="695"/> <source>semidry</source> <translation>semidry</translation> </message> <message> - <location filename="../uemis-downloader.c" line="687"/> + <location filename="../uemis-downloader.c" line="695"/> <source>drysuit</source> <translation>tørrdrakt</translation> </message> <message> - <location filename="../uemis-downloader.c" line="688"/> + <location filename="../uemis-downloader.c" line="696"/> <source>shorty</source> <translation>shorty</translation> </message> <message> - <location filename="../uemis-downloader.c" line="688"/> + <location filename="../uemis-downloader.c" line="696"/> <source>vest</source> <translation>vest</translation> </message> <message> - <location filename="../uemis-downloader.c" line="688"/> + <location filename="../uemis-downloader.c" line="696"/> <source>long john</source> <translation>ermeløs våtdrakt</translation> </message> <message> - <location filename="../uemis-downloader.c" line="688"/> + <location filename="../uemis-downloader.c" line="696"/> <source>jacket</source> <translation>overdel</translation> </message> <message> - <location filename="../uemis-downloader.c" line="688"/> + <location filename="../uemis-downloader.c" line="696"/> <source>full suit</source> <translation>hel drakt</translation> </message> <message> - <location filename="../uemis-downloader.c" line="688"/> + <location filename="../uemis-downloader.c" line="696"/> <source>2 pcs full suit</source> <translation>todelt drakt</translation> </message> <message> - <location filename="../uemis-downloader.c" line="689"/> + <location filename="../uemis-downloader.c" line="697"/> <source>membrane</source> <translation>skalldrakt</translation> </message> <message> - <location filename="../uemis-downloader.c" line="1170"/> + <location filename="../uemis-downloader.c" line="1193"/> <source>Initialise communication</source> <translation>Start kommunikasjon</translation> </message> <message> - <location filename="../uemis-downloader.c" line="1173"/> + <location filename="../uemis-downloader.c" line="1196"/> <source>Uemis init failed</source> <translation>Klarer ikke å lese fra Uemis</translation> </message> <message> - <location filename="../uemis-downloader.c" line="1185"/> + <location filename="../uemis-downloader.c" line="1208"/> <source>Start download</source> <translation>Start nedlasting</translation> </message> @@ -9262,84 +9293,65 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>V</translation> </message> <message> - <location filename="../git-access.c" line="252"/> - <location filename="../git-access.c" line="256"/> - <source>Remote storage and local data diverged. Error: can't get commit (%s)</source> - <translation>Skylager og lokal data avviker. Feil: Kan ikke hente commit (%s)</translation> - </message> - <message> - <location filename="../git-access.c" line="254"/> - <source>Remote storage and local data diverged. Error: failed local tree lookup (%s)</source> - <translation>Skylager og lokal data avviker. Feil: failed local tree lookup (%s)</translation> - </message> - <message> - <location filename="../git-access.c" line="258"/> - <source>Remote storage and local data diverged. Error: failed remote tree lookup (%s)</source> - <translation>Skylager og lokal data avviker. Feil: failed remote tree lookup (%s)</translation> + <location filename="../git-access.c" line="294"/> + <source>Remote storage and local data diverged. Error: merge failed (%s)</source> + <translation>Skylager og lokal data avviker. Feil: merge failed (%s)</translation> </message> <message> - <location filename="../git-access.c" line="260"/> - <source>Remote storage and local data diverged. Error: can't get commit: (%s)</source> - <translation>Skylager og lokal data avviker. Feil: Kan ikke hente commit (%s)</translation> + <location filename="../git-access.c" line="119"/> + <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> + <translation type="unfinished"/> </message> <message> - <location filename="../git-access.c" line="262"/> - <source>Remote storage and local data diverged. Error: failed base tree lookup: (%s)</source> - <translation>Skylager og lokal data avviker. Feil: failed base tree lookup: (%s)</translation> + <location filename="../git-access.c" line="139"/> + <location filename="../git-access.c" line="159"/> + <source>Could not update local cache to newer remote data</source> + <translation type="unfinished"/> </message> <message> - <location filename="../git-access.c" line="264"/> - <source>Remote storage and local data diverged. Error: merge failed (%s)</source> - <translation>Skylager og lokal data avviker. Feil: merge failed (%s)</translation> + <location filename="../git-access.c" line="152"/> + <source>Subsurface cloud storage corrupted</source> + <translation type="unfinished"/> </message> <message> - <location filename="../git-access.c" line="293"/> - <source>Remote storage and local data diverged. Error: merge conflict - manual intervention needed</source> - <translation>Skylager og lokal data avviker. Feil: merge conflict - manual intervention needed (%s)</translation> + <location filename="../git-access.c" line="235"/> + <source>Could not update Subsurface cloud storage, try again later</source> + <translation type="unfinished"/> </message> <message> - <location filename="../git-access.c" line="301"/> - <source>Remote storage and local data diverged. Error: writing the tree failed (%s)</source> - <translation>Skylager og lokal data avviker. Feil: writing the tree failed (%s)</translation> + <location filename="../git-access.c" line="324"/> + <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../git-access.c" line="303"/> - <source>Remote storage and local data diverged. Error: tree lookup failed (%s)</source> - <translation>Skylager og lokal data avviker. Feil: tree lookup failed (%s)</translation> + <location filename="../git-access.c" line="357"/> + <source>Remote storage and local data diverged</source> + <translation type="unfinished"/> </message> <message> - <location filename="../git-access.c" line="305"/> - <source>Failed to get author: (%s)</source> - <translation>Kunne ikke hente forfatter: (%s)</translation> + <location filename="../git-access.c" line="360"/> + <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../git-access.c" line="307"/> - <source>Remote storage and local data diverged. Error: git commit create failed (%s)</source> - <translation>Skylager og lokal data avviker. Feil: git commit create failed (%s)</translation> + <location filename="../git-access.c" line="420"/> + <location filename="../git-access.c" line="432"/> + <location filename="../git-access.c" line="526"/> + <location filename="../git-access.c" line="645"/> + <source>Problems with local cache of Subsurface cloud data</source> + <translation type="unfinished"/> </message> <message> - <location filename="../git-access.c" line="309"/> - <source>Error: could not lookup the merge commit I just created (%s)</source> - <translation>Feil: could not lookup the merge commit I just created (%s)</translation> - </message> - <message> - <location filename="../git-access.c" line="555"/> + <location filename="../git-access.c" line="618"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Klarte ikke å koble til skylager for Subsurface</translation> </message> <message> - <location filename="../git-access.c" line="558"/> + <location filename="../git-access.c" line="621"/> <source>git clone of %s failed (%s)</source> <translation>git clone of %s failed (%s)</translation> </message> <message> - <location filename="../load-git.c" line="189"/> - <source>multiple gps locations for this dive site; also %s -</source> - <translation>multiple gps-lokasjoner for dette dykket; også %s -</translation> - </message> - <message> <location filename="../load-git.c" line="216"/> <location filename="../parse-xml.c" line="1302"/> <source>additional name for site: %s @@ -9467,11 +9479,6 @@ p, li { white-space: pre-wrap; } <translation>VPM-B deko</translation> </message> <message> - <location filename="../qt-ui/plannerSettings.ui" line="268"/> - <source>Buehlmann deco</source> - <translation>Bühlmann deco</translation> - </message> - <message> <location filename="../qt-ui/plannerSettings.ui" line="278"/> <location filename="../build/ui_plannerSettings.h" line="445"/> <source>Reserve gas</source> @@ -9618,6 +9625,11 @@ p, li { white-space: pre-wrap; } <translation>6m til overflaten</translation> </message> <message> + <location filename="../qt-ui/plannerSettings.ui" line="268"/> + <source>Bühlmann deco</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/plannerSettings.ui" line="370"/> <location filename="../build/ui_plannerSettings.h" line="453"/> <source>min</source> |