summaryrefslogtreecommitdiffstats
path: root/translations/subsurface_nb_NO.ts
diff options
context:
space:
mode:
Diffstat (limited to 'translations/subsurface_nb_NO.ts')
-rw-r--r--translations/subsurface_nb_NO.ts2034
1 files changed, 1146 insertions, 888 deletions
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index ed8f18825..3d5f09f6b 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -1,153 +1,75 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb_NO" version="2.0">
<context>
- <name>CSVImportDialog</name>
- <message>
- <location filename="../qt-ui/csvimportdialog.ui" line="31"/>
- <source>Import File (CSV)</source>
- <translation>Importer fil (CSV)</translation>
- </message>
- <message>
- <location filename="../qt-ui/csvimportdialog.ui" line="40"/>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
- <location filename="../qt-ui/csvimportdialog.ui" line="135"/>
- <source>PO2</source>
- <translation>pO₂</translation>
- </message>
- <message>
- <location filename="../qt-ui/csvimportdialog.ui" line="209"/>
- <source>Field Separator</source>
- <translation>Feltseparator</translation>
- </message>
- <message>
- <location filename="../qt-ui/csvimportdialog.ui" line="65"/>
- <source>Field Configuration</source>
- <translation>Feltkonfigurasjon</translation>
- </message>
- <message>
- <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
- <source>Import CSV file</source>
- <translation>Importer CSV-fil</translation>
- </message>
- <message>
- <location filename="../qt-ui/csvimportdialog.ui" line="81"/>
- <source>Time</source>
- <translation>Tid</translation>
- </message>
- <message>
- <location filename="../qt-ui/csvimportdialog.ui" line="98"/>
- <source>Depth</source>
- <translation>Dybde</translation>
- </message>
- <message>
- <location filename="../qt-ui/csvimportdialog.ui" line="115"/>
- <source>Temp</source>
- <translation>Temp</translation>
- </message>
- <message>
- <location filename="../qt-ui/csvimportdialog.ui" line="155"/>
- <source>Cns</source>
- <translation>CNS</translation>
- </message>
- <message>
- <location filename="../qt-ui/csvimportdialog.ui" line="175"/>
- <source>Stopdepth</source>
- <translation>Stoppdybde</translation>
- </message>
- <message>
- <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
- <source>Pre-configured imports</source>
- <translation>Prekonfigurerte importer</translation>
- </message>
- <message>
- <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
- <source>Open CSV Log File</source>
- <translation>Åpne CSV-loggfil</translation>
- </message>
- <message>
- <location filename="../qt-ui/csvimportdialog.cpp" line="70"/>
- <source>CSV Files (*.csv);;All Files(*)</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>CylindersModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="68"/>
+ <location filename="../qt-ui/models.cpp" line="69"/>
<source>Type</source>
<translation>Type</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="68"/>
+ <location filename="../qt-ui/models.cpp" line="69"/>
<source>Size</source>
<translation>Størrelse</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="68"/>
+ <location filename="../qt-ui/models.cpp" line="69"/>
<source>WorkPress</source>
<translation>Trykk</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="68"/>
+ <location filename="../qt-ui/models.cpp" line="69"/>
<source>StartPress</source>
<translation>Starttrykk</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="68"/>
+ <location filename="../qt-ui/models.cpp" line="69"/>
<source>EndPress</source>
<translation>Sluttrykk</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="68"/>
- <source>Switch at</source>
- <translation>Gassbytte ved</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="68"/>
+ <location filename="../qt-ui/models.cpp" line="69"/>
<source>He%</source>
<translation>He%</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="68"/>
+ <location filename="../qt-ui/models.cpp" line="69"/>
<source>O</source>
<translation>O</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="151"/>
+ <location filename="../qt-ui/models.cpp" line="158"/>
<source>Clicking here will remove this cylinder.</source>
<translation>Klikk her for å fjerne denne flaska.</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="331"/>
+ <location filename="../qt-ui/models.cpp" line="341"/>
<source>Cylinder cannot be removed</source>
<translation>Flaska kan ikke fjernes</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="332"/>
+ <location filename="../qt-ui/models.cpp" line="342"/>
<source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
<translation>Denne gassen er i bruk. Du kan bare fjerne flasker som ikke er i bruk.</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="478"/>
+ <location filename="../qt-ui/models.cpp" line="488"/>
<source>psi</source>
- <translation type="unfinished"/>
+ <translation>psi</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="479"/>
+ <location filename="../qt-ui/models.cpp" line="489"/>
<source>bar</source>
- <translation type="unfinished"/>
+ <translation>bar</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="502"/>
+ <location filename="../qt-ui/models.cpp" line="512"/>
<source>l</source>
- <translation type="unfinished"/>
+ <translation>l</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="503"/>
+ <location filename="../qt-ui/models.cpp" line="513"/>
<source>cuft</source>
- <translation type="unfinished"/>
+ <translation>ft³</translation>
</message>
</context>
<context>
@@ -172,35 +94,78 @@
<context>
<name>DiveComputerModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1298"/>
+ <location filename="../qt-ui/models.cpp" line="1413"/>
<source>Model</source>
<translation>Modell</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1298"/>
+ <location filename="../qt-ui/models.cpp" line="1413"/>
<source>Device ID</source>
<translation>Enhets-ID</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1298"/>
+ <location filename="../qt-ui/models.cpp" line="1413"/>
<source>Nickname</source>
<translation>Navn</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1320"/>
+ <location filename="../qt-ui/models.cpp" line="1444"/>
<source>Clicking here will remove this divecomputer.</source>
<translation>Klikk her for å fjerne denne computeren.</translation>
</message>
</context>
<context>
+ <name>DiveEventItem</name>
+ <message>
+ <location filename="../qt-ui/profile/diveeventitem.cpp" line="86"/>
+ <source>air</source>
+ <translation>luft</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveeventitem.cpp" line="88"/>
+ <source>EAN%1</source>
+ <translation>EAN%1</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveeventitem.cpp" line="95"/>
+ <source>Bailing out to OC</source>
+ <translation>Bytter til OC</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveeventitem.cpp" line="97"/>
+ <source> begin</source>
+ <comment>Starts with space!</comment>
+ <translation> start</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+ <source> end</source>
+ <comment>Starts with space!</comment>
+ <translation> slutt</translation>
+ </message>
+</context>
+<context>
+ <name>DiveGasPressureItem</name>
+ <message>
+ <location filename="../qt-ui/profile/diveprofileitem.cpp" line="456"/>
+ <source>air</source>
+ <translation>luft</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveprofileitem.cpp" line="457"/>
+ <source>EAN%1</source>
+ <translation>EAN%1</translation>
+ </message>
+</context>
+<context>
<name>DiveItem</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1159"/>
+ <location filename="../qt-ui/models.cpp" line="1241"/>
<source> l/min</source>
<translation>l/min</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1161"/>
+ <location filename="../qt-ui/models.cpp" line="1243"/>
<source> cuft/min</source>
<translation>ft³/min</translation>
</message>
@@ -208,102 +173,261 @@
<context>
<name>DiveListView</name>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="43"/>
+ <location filename="../qt-ui/divelistview.cpp" line="48"/>
<source>Show Search Box</source>
<translation>Vis søkeboks</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="705"/>
+ <location filename="../qt-ui/divelistview.cpp" line="710"/>
<source>expand all</source>
<translation>vis alle turer</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="706"/>
+ <location filename="../qt-ui/divelistview.cpp" line="711"/>
<source>collapse all</source>
<translation>slå sammen alle turer</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="707"/>
+ <location filename="../qt-ui/divelistview.cpp" line="712"/>
<source>collapse others</source>
<translation>slå sammen andre turer</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="709"/>
+ <location filename="../qt-ui/divelistview.cpp" line="714"/>
<source>remove dive(s) from trip</source>
<translation>fjern dykk fra tur</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="710"/>
+ <location filename="../qt-ui/divelistview.cpp" line="715"/>
<source>create new trip above</source>
<translation>legg til ny tur over denne</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="711"/>
+ <location filename="../qt-ui/divelistview.cpp" line="716"/>
<source>add dive(s) to trip immediately above</source>
<translation>legg dykk til turen over</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="714"/>
+ <location filename="../qt-ui/divelistview.cpp" line="719"/>
<source>merge trip with trip above</source>
<translation>slå sammen tur med turen over</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="715"/>
+ <location filename="../qt-ui/divelistview.cpp" line="720"/>
<source>merge trip with trip below</source>
<translation>slå sammen tur med turen under</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="719"/>
+ <location filename="../qt-ui/divelistview.cpp" line="724"/>
<source>delete dive(s)</source>
<translation>slett dykk</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="721"/>
+ <location filename="../qt-ui/divelistview.cpp" line="726"/>
<source>mark dive(s) invalid</source>
<translation>merk dykk som skjult</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="727"/>
+ <location filename="../qt-ui/divelistview.cpp" line="732"/>
<source>save As</source>
<translation>lagre som</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="728"/>
+ <location filename="../qt-ui/divelistview.cpp" line="733"/>
<source>export As UDDF</source>
<translation>eksporter som UDDF</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="729"/>
+ <location filename="../qt-ui/divelistview.cpp" line="734"/>
<source>shift times</source>
<translation>forskyvning av tidspunkter</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="732"/>
+ <location filename="../qt-ui/divelistview.cpp" line="735"/>
+ <source>load images</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelistview.cpp" line="738"/>
<source>upload dive(s) to divelogs.de</source>
<translation>last opp til divelogs.de</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="758"/>
+ <location filename="../qt-ui/divelistview.cpp" line="764"/>
<source>Save Dives As...</source>
<translation>Lagre dykk som...</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="777"/>
+ <location filename="../qt-ui/divelistview.cpp" line="783"/>
<source>Save File as</source>
<translation>Lagre som</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="778"/>
+ <location filename="../qt-ui/divelistview.cpp" line="784"/>
<source>UDDF files (*.uddf *.UDDF)</source>
<translation>UDDF-filer (*.uddf *.UDDF)</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="725"/>
+ <location filename="../qt-ui/divelistview.cpp" line="801"/>
+ <source>Open Image Files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelistview.cpp" line="801"/>
+ <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelistview.cpp" line="730"/>
<source>merge selected dives</source>
<translation>slå sammen valgte dykk</translation>
</message>
</context>
<context>
+ <name>DiveLogImportDialog</name>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+ <source>Import dive log file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="36"/>
+ <source>Import CSV Dive Log Files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="50"/>
+ <source>CSV options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="62"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="651"/>
+ <source>Field Separator</source>
+ <translation>Feltseparator</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="86"/>
+ <source>Pre-configured imports</source>
+ <translation>Prekonfigurerte importer</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="114"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="290"/>
+ <source>Field Configuration</source>
+ <translation>Feltkonfigurasjon</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="153"/>
+ <source>Depth</source>
+ <translation>Dybde</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
+ <source>Stopdepth</source>
+ <translation>Stoppdybde</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="180"/>
+ <source>PO2</source>
+ <translation>pO₂</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="187"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="328"/>
+ <source>Time</source>
+ <translation>Tid</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="194"/>
+ <source>Temp</source>
+ <translation>Temp</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="224"/>
+ <source>Cns</source>
+ <translation>CNS</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="252"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="674"/>
+ <source>Units</source>
+ <translation>Enheter</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="265"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="687"/>
+ <source>Metric</source>
+ <translation>Metrisk</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="270"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="692"/>
+ <source>Imperial</source>
+ <translation>Britiske mål</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="278"/>
+ <source>Manual dives</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
+ <source>Dive #</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="315"/>
+ <source>Date</source>
+ <translation>Dato</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="341"/>
+ <source>Duration</source>
+ <translation>Varighet</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="354"/>
+ <source>Tags</source>
+ <translation>Emner</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="367"/>
+ <source>Location</source>
+ <translation>Sted</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="380"/>
+ <source>Gps</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="393"/>
+ <source>Max depth</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="406"/>
+ <source>Mean depth</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+ <source>Buddy</source>
+ <translation>Buddy</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="432"/>
+ <source>Notes</source>
+ <translation>Notater</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="445"/>
+ <source>Weight</source>
+ <translation>Vekt</translation>
+ </message>
+</context>
+<context>
<name>DivePlanner</name>
<message>
<location filename="../qt-ui/diveplanner.ui" line="71"/>
@@ -344,22 +468,22 @@
<context>
<name>DivePlannerGraphics</name>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="117"/>
<source>10m</source>
<translation>10m</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="134"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="119"/>
<source>30ft</source>
<translation>30ft</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="384"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="364"/>
<source>Handler Position Error</source>
<translation>Handler Position-feil</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="385"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="365"/>
<source>One or more of your stops will be lost with this operations,
Please, remove them first.</source>
<translation>En eller flere av stoppene dine vil bli tapt hvis du fortsetter.
@@ -369,37 +493,37 @@ Fjern dem før du gjør dette.</translation>
<context>
<name>DivePlannerPointsModel</name>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="468"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="446"/>
<source>AIR</source>
<translation>Luft</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="1097"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="1085"/>
<source>Final Depth</source>
<translation>Dybde</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="1098"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="1087"/>
<source>Duration</source>
<translation>Varighet</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="1099"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="1089"/>
<source>Used Gas</source>
<translation>Gass</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="1100"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="1091"/>
<source>CC Set Point</source>
<translation>CC setpoint</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="1305"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="1297"/>
<source>Discard the Plan?</source>
<translation>Forkaste planen?</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="1306"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="1298"/>
<source>You are about to discard your plan.</source>
<translation>Du er i ferd med å forkaste planen.</translation>
</message>
@@ -407,85 +531,158 @@ Fjern dem før du gjør dette.</translation>
<context>
<name>DivePlannerWidget</name>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="955"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="933"/>
<source>Dive Planner Points</source>
<translation>Punkter i dykkeplan</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="958"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="936"/>
<source>Available Gases</source>
<translation>Tilgjengelige gasser</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="954"/>
<source>add dive data point</source>
<translation>legg til datapunkt</translation>
</message>
</context>
<context>
+ <name>DivePlotDataModel</name>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="95"/>
+ <source>Depth</source>
+ <translation>Dybde</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="97"/>
+ <source>Time</source>
+ <translation>Tid</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="99"/>
+ <source>Pressure</source>
+ <translation>Trykk</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="101"/>
+ <source>Temperature</source>
+ <translation>Temperatur</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+ <source>Color</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+ <source>User Entered</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+ <source>Cylinder Index</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+ <source>Pressure S</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+ <source>Pressure I</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+ <source>Ceiling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+ <source>SAC</source>
+ <translation>SAC</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+ <source>PN2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+ <source>PHE</source>
+ <translation>pHe</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+ <source>PO2</source>
+ <translation>pO₂</translation>
+ </message>
+</context>
+<context>
<name>DiveTripModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1202"/>
+ <location filename="../qt-ui/models.cpp" line="1288"/>
<source>#</source>
<translation>#</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1203"/>
+ <location filename="../qt-ui/models.cpp" line="1291"/>
<source>date</source>
<translation>dato</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1205"/>
+ <location filename="../qt-ui/models.cpp" line="1297"/>
<source>m</source>
<translation>m</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1205"/>
+ <location filename="../qt-ui/models.cpp" line="1297"/>
<source>ft</source>
<translation>ft</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1206"/>
+ <location filename="../qt-ui/models.cpp" line="1300"/>
<source>min</source>
<translation>min</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1208"/>
+ <location filename="../qt-ui/models.cpp" line="1306"/>
<source>kg</source>
<translation>kg</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1208"/>
+ <location filename="../qt-ui/models.cpp" line="1306"/>
<source>lbs</source>
<translation>pund</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1209"/>
+ <location filename="../qt-ui/models.cpp" line="1309"/>
<source>suit</source>
<translation>drakt</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1210"/>
+ <location filename="../qt-ui/models.cpp" line="1312"/>
<source>cyl</source>
<translation>flaske</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1215"/>
+ <location filename="../qt-ui/models.cpp" line="1327"/>
<source>location</source>
<translation>sted</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1212"/>
+ <location filename="../qt-ui/models.cpp" line="1318"/>
<source>SAC</source>
<translation>SAC</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1213"/>
+ <location filename="../qt-ui/models.cpp" line="1321"/>
<source>OTU</source>
<translation>OTU</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1214"/>
+ <location filename="../qt-ui/models.cpp" line="1324"/>
<source>maxCNS</source>
<translation>maks CNS</translation>
</message>
@@ -493,115 +690,115 @@ Fjern dem før du gjør dette.</translation>
<context>
<name>DivelogsDeWebServices</name>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="498"/>
<source>Invalid response from server</source>
<translation>Ugyldig svar fra tjener</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
<source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
<translation>Forventet XML-tag &apos;DiveDateReader&apos;, men fikk &apos;%1</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="534"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="552"/>
<source>Expected XML tag &apos;DiveDates&apos; not found</source>
<translation>Fant ikke XML-tag &apos;DiveDates&apos; som forventet</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="541"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="559"/>
<source>Malformed XML response. Line %1: %2</source>
<translation>Feil formattert XML-svar. Linje %1: %2</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="110"/>
<source>no dives were selected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="129"/>
<source>failed to create zip file for upload: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="154"/>
<source>cannot create temporary file: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="164"/>
<source>internal error: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="180"/>
<source>internal error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="616"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/>
<source>Done</source>
<translation>Ferdig</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="642"/>
<source>Uploading dive list...</source>
<translation>Laster opp liste over dykk...</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="673"/>
<source>Downloading dive list...</source>
<translation>Laster ned liste over dykk...</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="721"/>
<source>Downloading %1 dives...</source>
<translation>Laster ned %1 dykk...</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
<source>Download finished - %1</source>
<translation>Nedlasting er ferdig - %1</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="781"/>
<source>Corrupted download</source>
<translation>Nedlastingen er skadet</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="782"/>
<source>The archive could not be opened:
%1</source>
<translation>Arkivet kunne ikke åpnes:
%1</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
<source>Upload failed</source>
<translation>Opplasting feilet</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="824"/>
<source>Upload successful</source>
<translation>Ferdig å laste opp</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="827"/>
<source>Login failed</source>
<translation>Innlogging feilet</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="830"/>
<source>Cannot parse response</source>
<translation>Kan ikke lese svar</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="841"/>
<source>Error: %1</source>
<translation>Feil: %1</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/>
<source>Upload finished</source>
<translation>Opplasting er ferdig</translation>
</message>
@@ -609,48 +806,54 @@ Fjern dem før du gjør dette.</translation>
<context>
<name>DownloadFromDCWidget</name>
<message>
- <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="117"/>
- <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="134"/>
+ <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="118"/>
+ <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
+ <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="160"/>
<source>Error</source>
<translation>Feil</translation>
</message>
<message>
- <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="152"/>
+ <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
+ <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
<source>Retry</source>
<translation>Prøv igjen</translation>
</message>
<message>
- <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/>
+ <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="249"/>
+ <source>Find Uemis dive computer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="317"/>
<source>Choose file for divecomputer download logfile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/>
+ <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
<source>Log files (*.log)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/>
+ <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="334"/>
<source>Warning</source>
<translation>Advarsel</translation>
</message>
<message>
- <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/>
+ <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="335"/>
<source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/>
+ <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
<source>Choose file for divecomputer binary dump file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/>
+ <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
<source>Dump files (*.bin)</source>
<translation type="unfinished"/>
</message>
@@ -718,7 +921,7 @@ Fjern dem før du gjør dette.</translation>
<context>
<name>GlobeGPS</name>
<message>
- <location filename="../qt-ui/globe.cpp" line="100"/>
+ <location filename="../qt-ui/globe.cpp" line="103"/>
<source>Edit Selected Dive Locations</source>
<translation>Rediger valgte steder</translation>
</message>
@@ -727,13 +930,13 @@ Fjern dem før du gjør dette.</translation>
<name>MainTab</name>
<message>
<location filename="../qt-ui/maintab.ui" line="18"/>
- <location filename="../qt-ui/maintab.cpp" line="431"/>
+ <location filename="../qt-ui/maintab.cpp" line="444"/>
<source>Dive Notes</source>
<translation>Dykk</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="120"/>
- <location filename="../qt-ui/maintab.cpp" line="455"/>
+ <location filename="../qt-ui/maintab.cpp" line="468"/>
<source>Location</source>
<translation>Sted</translation>
</message>
@@ -759,11 +962,13 @@ Fjern dem før du gjør dette.</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="72"/>
+ <location filename="../qt-ui/maintab.cpp" line="235"/>
<source>Air temp</source>
<translation>Lufttemp.</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="79"/>
+ <location filename="../qt-ui/maintab.cpp" line="236"/>
<source>Water temp</source>
<translation>Vanntemp.</translation>
</message>
@@ -789,7 +994,7 @@ Fjern dem før du gjør dette.</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="208"/>
- <location filename="../qt-ui/maintab.cpp" line="456"/>
+ <location filename="../qt-ui/maintab.cpp" line="469"/>
<source>Notes</source>
<translation>Notater</translation>
</message>
@@ -900,92 +1105,102 @@ Fjern dem før du gjør dette.</translation>
<translation>Dykk</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="75"/>
+ <location filename="../qt-ui/maintab.cpp" line="78"/>
<source>Cylinders</source>
<translation>Flasker</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="76"/>
+ <location filename="../qt-ui/maintab.cpp" line="79"/>
<source>Add Cylinder</source>
<translation>Legg til flaske</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="79"/>
+ <location filename="../qt-ui/maintab.cpp" line="82"/>
<source>Weights</source>
<translation>Vekter</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="80"/>
+ <location filename="../qt-ui/maintab.cpp" line="83"/>
<source>Add Weight System</source>
<translation>Legg til vektsystem</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="424"/>
+ <location filename="../qt-ui/maintab.cpp" line="437"/>
<source>Trip Location</source>
<translation>Tursted</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="402"/>
- <location filename="../qt-ui/maintab.cpp" line="426"/>
+ <location filename="../qt-ui/maintab.cpp" line="415"/>
+ <location filename="../qt-ui/maintab.cpp" line="439"/>
<source>Trip Notes</source>
<translation>Turnotater</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="39"/>
+ <location filename="../qt-ui/maintab.cpp" line="42"/>
<source>Save</source>
<translation>Lagre</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="43"/>
+ <location filename="../qt-ui/maintab.cpp" line="46"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="244"/>
+ <location filename="../qt-ui/maintab.cpp" line="232"/>
+ <source>Air temp [%1]</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.cpp" line="233"/>
+ <source>Water temp [%1]</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.cpp" line="258"/>
<source>This trip is being edited.</source>
<translation>Denne turen redigeres.</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="250"/>
+ <location filename="../qt-ui/maintab.cpp" line="264"/>
<source>Multiple dives are being edited.</source>
<translation>Flere dykk redigeres.</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="252"/>
+ <location filename="../qt-ui/maintab.cpp" line="266"/>
<source>This dive is being edited.</source>
<translation>Dette dykket redigeres.</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="478"/>
- <location filename="../qt-ui/maintab.cpp" line="486"/>
- <location filename="../qt-ui/maintab.cpp" line="515"/>
- <location filename="../qt-ui/maintab.cpp" line="516"/>
- <location filename="../qt-ui/maintab.cpp" line="517"/>
+ <location filename="../qt-ui/maintab.cpp" line="491"/>
+ <location filename="../qt-ui/maintab.cpp" line="499"/>
+ <location filename="../qt-ui/maintab.cpp" line="528"/>
+ <location filename="../qt-ui/maintab.cpp" line="529"/>
+ <location filename="../qt-ui/maintab.cpp" line="530"/>
<source>/min</source>
<translation>/min</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="480"/>
+ <location filename="../qt-ui/maintab.cpp" line="493"/>
<source>unknown</source>
<translation>ukjent</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="989"/>
+ <location filename="../qt-ui/maintab.cpp" line="1006"/>
<source>N</source>
<translation>N</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="989"/>
+ <location filename="../qt-ui/maintab.cpp" line="1006"/>
<source>S</source>
<translation>S</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="990"/>
+ <location filename="../qt-ui/maintab.cpp" line="1007"/>
<source>E</source>
<translation>Ø</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="990"/>
+ <location filename="../qt-ui/maintab.cpp" line="1007"/>
<source>W</source>
<translation>V</translation>
</message>
@@ -993,428 +1208,518 @@ Fjern dem før du gjør dette.</translation>
<context>
<name>MainWindow</name>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="184"/>
+ <location filename="../qt-ui/mainwindow.ui" line="594"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="143"/>
+ <location filename="../qt-ui/mainwindow.ui" line="545"/>
<source>&amp;File</source>
<translation>&amp;Fil</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="158"/>
+ <location filename="../qt-ui/mainwindow.ui" line="566"/>
<source>&amp;Log</source>
<translation>&amp;Logg</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="169"/>
+ <location filename="../qt-ui/mainwindow.ui" line="578"/>
<source>&amp;View</source>
<translation>&amp;Vis</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="190"/>
+ <location filename="../qt-ui/mainwindow.ui" line="600"/>
<source>&amp;Help</source>
<translation>&amp;Hjelp</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="197"/>
+ <location filename="../qt-ui/mainwindow.ui" line="607"/>
<source>&amp;Import</source>
<translation>&amp;Importer</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="214"/>
+ <location filename="../qt-ui/mainwindow.ui" line="623"/>
<source>&amp;New logbook</source>
<translation>&amp;Ny loggbok</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="217"/>
+ <location filename="../qt-ui/mainwindow.ui" line="626"/>
<source>New</source>
<translation>Ny</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="220"/>
+ <location filename="../qt-ui/mainwindow.ui" line="629"/>
<source>Ctrl+N</source>
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="225"/>
+ <location filename="../qt-ui/mainwindow.ui" line="634"/>
<source>&amp;Open logbook</source>
<translation>Åpne l&amp;oggbok</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="228"/>
+ <location filename="../qt-ui/mainwindow.ui" line="637"/>
<source>Open</source>
<translation>Åpne</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="231"/>
+ <location filename="../qt-ui/mainwindow.ui" line="640"/>
<source>Ctrl+O</source>
<translation>Ctrl+O</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="236"/>
+ <location filename="../qt-ui/mainwindow.ui" line="645"/>
<source>&amp;Save</source>
<translation>Lagre</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="239"/>
+ <location filename="../qt-ui/mainwindow.ui" line="648"/>
<source>Save</source>
<translation>Lagre</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="242"/>
+ <location filename="../qt-ui/mainwindow.ui" line="651"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="247"/>
- <location filename="../qt-ui/mainwindow.ui" line="250"/>
+ <location filename="../qt-ui/mainwindow.ui" line="656"/>
+ <location filename="../qt-ui/mainwindow.ui" line="659"/>
<source>Save as</source>
<translation>Lagre som</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="253"/>
+ <location filename="../qt-ui/mainwindow.ui" line="662"/>
<source>Ctrl+Shift+S</source>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="258"/>
- <location filename="../qt-ui/mainwindow.ui" line="261"/>
+ <location filename="../qt-ui/mainwindow.ui" line="667"/>
+ <location filename="../qt-ui/mainwindow.ui" line="670"/>
<source>Close</source>
<translation>Lukk</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="264"/>
+ <location filename="../qt-ui/mainwindow.ui" line="673"/>
<source>Ctrl+W</source>
<translation>Ctrl+W</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="269"/>
- <location filename="../qt-ui/mainwindow.ui" line="272"/>
- <location filename="../qt-ui/mainwindow.cpp" line="172"/>
- <source>Import Files</source>
- <translation>Importer filer</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="275"/>
+ <location filename="../qt-ui/mainwindow.ui" line="865"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="280"/>
+ <location filename="../qt-ui/mainwindow.ui" line="678"/>
<source>Export &amp;UDDF</source>
<translation>Eksporter &amp;UDDF</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="283"/>
+ <location filename="../qt-ui/mainwindow.ui" line="138"/>
+ <source>Enable the pN2 Graph</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="164"/>
+ <source>Enable the pHe graph</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="326"/>
+ <source>Enable EAD, END, and EADD</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="352"/>
+ <source>Show NDL / TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="430"/>
+ <source>Rescale depth axis</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="681"/>
<source>Ctrl+U</source>
<translation>Ctrl+U</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="288"/>
+ <location filename="../qt-ui/mainwindow.ui" line="686"/>
<source>&amp;Print</source>
<translation>Skriv ut</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="299"/>
+ <location filename="../qt-ui/mainwindow.ui" line="697"/>
<source>Ctrl+,</source>
<translation>Ctrl+,</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="307"/>
+ <location filename="../qt-ui/mainwindow.ui" line="705"/>
<source>&amp;Quit</source>
<translation>Avslutt</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="318"/>
+ <location filename="../qt-ui/mainwindow.ui" line="716"/>
<source>Import from &amp;dive computer</source>
<translation>Importer fra &amp;dykkecomputer</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="326"/>
+ <location filename="../qt-ui/mainwindow.ui" line="724"/>
<source>Import &amp;GPS data from Subsurface Service</source>
<translation>Importer &amp;GPS-data fra Subsurface-tjenesten</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="329"/>
+ <location filename="../qt-ui/mainwindow.ui" line="727"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="334"/>
+ <location filename="../qt-ui/mainwindow.ui" line="732"/>
<source>&amp;Edit Device Names</source>
<translation>Rediger &amp;enhetsnavn</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="342"/>
+ <location filename="../qt-ui/mainwindow.ui" line="740"/>
<source>Ctrl++</source>
<translation>Ctrl++</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="347"/>
+ <location filename="../qt-ui/mainwindow.ui" line="745"/>
<source>&amp;Renumber</source>
<translation>Nummere&amp;r på nytt</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="350"/>
+ <location filename="../qt-ui/mainwindow.ui" line="748"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="363"/>
- <source>Toggle &amp;Zoom</source>
- <translation>Bytt &amp;zoom</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="368"/>
+ <location filename="../qt-ui/mainwindow.ui" line="761"/>
<source>&amp;Yearly Statistics</source>
<translation>Årlig statistikk</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="371"/>
+ <location filename="../qt-ui/mainwindow.ui" line="764"/>
<source>Ctrl+Y</source>
<translation>Ctrl+Y</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="376"/>
+ <location filename="../qt-ui/mainwindow.ui" line="769"/>
<source>Dive List</source>
<translation>Liste over dykk</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="384"/>
+ <location filename="../qt-ui/mainwindow.ui" line="777"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="392"/>
+ <location filename="../qt-ui/mainwindow.ui" line="785"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="400"/>
+ <location filename="../qt-ui/mainwindow.ui" line="793"/>
<source>All</source>
<translation>Alle</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="442"/>
+ <location filename="../qt-ui/mainwindow.ui" line="835"/>
<source>User &amp;Manual</source>
<translation>Bruker&amp;manual</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="450"/>
+ <location filename="../qt-ui/mainwindow.ui" line="843"/>
<source>Globe</source>
<translation>Globus</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="458"/>
+ <location filename="../qt-ui/mainwindow.ui" line="851"/>
<source>P&amp;lan Dive</source>
<translation>P&amp;lanlegg dykk</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="461"/>
+ <location filename="../qt-ui/mainwindow.ui" line="854"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="466"/>
- <source>Import CSV</source>
- <translation>Importer CSV</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="469"/>
- <source>Import CS&amp;V</source>
- <translation>Importer CS&amp;V</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="474"/>
+ <location filename="../qt-ui/mainwindow.ui" line="870"/>
<source>Import from Divelogs.de</source>
<translation>Importer fra divelogs.de</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="291"/>
+ <location filename="../qt-ui/mainwindow.ui" line="689"/>
<source>Ctrl+P</source>
<translation>Ctrl+P</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="296"/>
+ <location filename="../qt-ui/mainwindow.ui" line="112"/>
+ <source>Enable the pO2 Graph</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="115"/>
+ <location filename="../qt-ui/mainwindow.ui" line="141"/>
+ <location filename="../qt-ui/mainwindow.ui" line="167"/>
+ <location filename="../qt-ui/mainwindow.ui" line="196"/>
+ <location filename="../qt-ui/mainwindow.ui" line="225"/>
+ <location filename="../qt-ui/mainwindow.ui" line="251"/>
+ <location filename="../qt-ui/mainwindow.ui" line="277"/>
+ <location filename="../qt-ui/mainwindow.ui" line="303"/>
+ <location filename="../qt-ui/mainwindow.ui" line="329"/>
+ <location filename="../qt-ui/mainwindow.ui" line="355"/>
+ <location filename="../qt-ui/mainwindow.ui" line="381"/>
+ <location filename="../qt-ui/mainwindow.ui" line="407"/>
+ <location filename="../qt-ui/mainwindow.ui" line="433"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="300"/>
+ <source>Enable MOD</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="193"/>
+ <source>Show the DC Reported Ceiling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="222"/>
+ <source>Show the Calculated Ceiling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="274"/>
+ <source>Show Calculated Ceiling with 3m Increments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="248"/>
+ <source>Calculate All Tissues</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="378"/>
+ <source>Show SAC Rate</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="404"/>
+ <source>Enable / Disable the Ruler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="694"/>
<source>Preferences</source>
<translation>Valg</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="310"/>
+ <location filename="../qt-ui/mainwindow.ui" line="708"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="321"/>
+ <location filename="../qt-ui/mainwindow.ui" line="719"/>
<source>Ctrl+D</source>
<translation>Ctrl+D</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="339"/>
+ <location filename="../qt-ui/mainwindow.ui" line="737"/>
<source>Add Dive</source>
<translation>Nytt dyk</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="358"/>
+ <location filename="../qt-ui/mainwindow.ui" line="756"/>
<source>Auto Group</source>
<translation>Autogruppering</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="379"/>
+ <location filename="../qt-ui/mainwindow.ui" line="772"/>
<source>Ctrl+2</source>
<translation>Ctrl+2</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="387"/>
+ <location filename="../qt-ui/mainwindow.ui" line="780"/>
<source>Ctrl+3</source>
<translation>Ctrl+3</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="395"/>
+ <location filename="../qt-ui/mainwindow.ui" line="788"/>
<source>Ctrl+4</source>
<translation>Ctrl+4</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="403"/>
+ <location filename="../qt-ui/mainwindow.ui" line="796"/>
<source>Ctrl+1</source>
<translation>Ctrl+1</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="408"/>
+ <location filename="../qt-ui/mainwindow.ui" line="801"/>
<source>Prev DC</source>
<translation>Forrige DC</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="411"/>
+ <location filename="../qt-ui/mainwindow.ui" line="804"/>
<source>Left</source>
<translation>Venstre</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="416"/>
+ <location filename="../qt-ui/mainwindow.ui" line="809"/>
<source>Next DC</source>
<translation>Neste DC</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="419"/>
+ <location filename="../qt-ui/mainwindow.ui" line="812"/>
<source>Right</source>
<translation>Høyre</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="424"/>
+ <location filename="../qt-ui/mainwindow.ui" line="817"/>
<source>Select Events</source>
<translation>Velg hendelser</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="429"/>
+ <location filename="../qt-ui/mainwindow.ui" line="822"/>
<source>Input Plan</source>
<translation>Legg inn plan</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="434"/>
+ <location filename="../qt-ui/mainwindow.ui" line="827"/>
<source>About Subsurface</source>
<translation>Om Subsurface</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="445"/>
+ <location filename="../qt-ui/mainwindow.ui" line="838"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="453"/>
+ <location filename="../qt-ui/mainwindow.ui" line="846"/>
<source>Ctrl+5</source>
<translation>Ctrl+5</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="114"/>
+ <location filename="../qt-ui/mainwindow.ui" line="859"/>
+ <source>Import Log Files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="862"/>
+ <source>Import divelog files from other applications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="878"/>
+ <source>&amp;Full Screen</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="881"/>
+ <source>Toggle Full Screen</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="884"/>
+ <source>F11</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.cpp" line="143"/>
<source>Open File</source>
<translation>Åpne fil</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="149"/>
- <location filename="../qt-ui/mainwindow.cpp" line="255"/>
- <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="665"/>
<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="228"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="276"/>
<source>Please save or cancel the current dive edit before trying to plan a dive.</source>
<translation>Lagre eller avbryt redigeringa før du planlegger et dykk.</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="291"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="342"/>
<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="503"/>
- <source>User Manual</source>
- <translation>Brukermanual</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.cpp" line="507"/>
- <source>Cannot find the Subsurface manual</source>
- <translation>Finner ikke manualen</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.cpp" line="544"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="564"/>
<source>Do you want to save the changes you made in the file %1?</source>
<translation>Vil du lagre endringene i %1?</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="546"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="566"/>
<source>Do you want to save the changes you made in the datafile?</source>
<translation>Vil du lagre endringene?</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="551"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="571"/>
<source>Save Changes?</source>
<translation>Lagre endringer?</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="552"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="572"/>
<source>Changes will be lost if you don&apos;t save them.</source>
<translation>Endringer vil gå tapt hvis du ikke lagrer.</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="878"/>
- <source>First finish the current edition before trying to do another.</source>
- <translation>Avslutt redigeringa før du redigerer et nytt.</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.cpp" line="201"/>
- <location filename="../qt-ui/mainwindow.cpp" line="756"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="247"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="870"/>
<source>Save File as</source>
<translation>Lagre som</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="111"/>
- <location filename="../qt-ui/mainwindow.cpp" line="149"/>
- <location filename="../qt-ui/mainwindow.cpp" line="228"/>
- <location filename="../qt-ui/mainwindow.cpp" line="255"/>
- <location filename="../qt-ui/mainwindow.cpp" line="291"/>
- <location filename="../qt-ui/mainwindow.cpp" line="709"/>
- <location filename="../qt-ui/mainwindow.cpp" line="878"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="140"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="200"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="276"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="303"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="342"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="665"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
<source>Warning</source>
<translation>Advarsel</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="111"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="140"/>
<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="202"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="248"/>
<source>UDDF files (*.uddf *.UDDF)</source>
<translation>UDDF-filer (*.uddf *.UDDF)</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="757"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="395"/>
+ <source>Yearly Statistics</source>
+ <translation>Årsstatistikk</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.cpp" line="871"/>
<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="990"/>
+ <source>Open Dive Log File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.cpp" line="990"/>
+ <source>Dive Log Files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Files (*.xml);;UDDF/UDCF Files(*.uddf *.udcf);;JDiveLog Files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.cpp" line="1013"/>
+ <source>Please, first finish the current edition before trying to do another.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>PreferencesDialog</name>
@@ -1484,209 +1789,187 @@ Fjern dem før du gjør dette.</translation>
<translation>Bruk standardflaske</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="256"/>
+ <location filename="../qt-ui/preferences.ui" line="237"/>
+ <source>Animations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="243"/>
+ <source>Speed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="289"/>
<source>System</source>
<translation>System</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="263"/>
+ <location filename="../qt-ui/preferences.ui" line="296"/>
<source>Metric</source>
<translation>Metrisk</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="273"/>
+ <location filename="../qt-ui/preferences.ui" line="306"/>
<source>Imperial</source>
<translation>Britiske mål</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="283"/>
+ <location filename="../qt-ui/preferences.ui" line="316"/>
<source>Personalize</source>
<translation>Personaliser</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="307"/>
+ <location filename="../qt-ui/preferences.ui" line="340"/>
<source>Depth</source>
<translation>Dybde</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="314"/>
+ <location filename="../qt-ui/preferences.ui" line="347"/>
<source>meter</source>
<translation>meter</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="324"/>
+ <location filename="../qt-ui/preferences.ui" line="357"/>
<source>feet</source>
<translation>fot</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="341"/>
+ <location filename="../qt-ui/preferences.ui" line="374"/>
<source>bar</source>
<translation>bar</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="351"/>
+ <location filename="../qt-ui/preferences.ui" line="384"/>
<source>psi</source>
<translation>psi</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="368"/>
+ <location filename="../qt-ui/preferences.ui" line="401"/>
<source>liter</source>
<translation>liter</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="378"/>
+ <location filename="../qt-ui/preferences.ui" line="411"/>
<source>cu ft</source>
<translation>ft³</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="395"/>
+ <location filename="../qt-ui/preferences.ui" line="428"/>
<source>celsius</source>
<translation>celsius</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="405"/>
+ <location filename="../qt-ui/preferences.ui" line="438"/>
<source>fahrenheit</source>
<translation>fahrenheit</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="422"/>
+ <location filename="../qt-ui/preferences.ui" line="455"/>
<source>kg</source>
<translation>kg</translation>
</message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="523"/>
+ <source>Show units in text labels</source>
+ <translation type="unfinished"/>
+ </message>
<message utf8="true">
- <location filename="../qt-ui/preferences.ui" line="510"/>
- <source>pO₂</source>
- <translation>pO₂</translation>
+ <location filename="../qt-ui/preferences.ui" line="560"/>
+ <source>threshold when showing pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message utf8="true">
+ <location filename="../qt-ui/preferences.ui" line="581"/>
+ <source>threshold when showing pN₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="602"/>
+ <source>threshold when showing pHe</source>
+ <translation type="unfinished"/>
</message>
<message utf8="true">
- <location filename="../qt-ui/preferences.ui" line="551"/>
- <source>pN₂</source>
- <translation>pN₂</translation>
+ <location filename="../qt-ui/preferences.ui" line="623"/>
+ <source>max ppO₂ when showing MOD</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="644"/>
+ <source>draw dive computer reported ceiling red</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="837"/>
+ <location filename="../qt-ui/preferences.ui" line="655"/>
+ <source>unused tanks</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="723"/>
<source>System Default</source>
<translation>Standard for system</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="857"/>
+ <location filename="../qt-ui/preferences.ui" line="743"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="334"/>
+ <location filename="../qt-ui/preferences.ui" line="367"/>
<source>Pressure</source>
<translation>Trykk</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="361"/>
+ <location filename="../qt-ui/preferences.ui" line="394"/>
<source>Volume</source>
<translation>Volum</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="388"/>
+ <location filename="../qt-ui/preferences.ui" line="421"/>
<source>Temperature</source>
<translation>Temperatur</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="415"/>
+ <location filename="../qt-ui/preferences.ui" line="448"/>
<source>Weight</source>
<translation>Vekt</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="432"/>
+ <location filename="../qt-ui/preferences.ui" line="465"/>
<source>lbs</source>
<translation>pund</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="447"/>
+ <location filename="../qt-ui/preferences.ui" line="480"/>
<source>Time units</source>
<translation>Tidsenheter</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="453"/>
+ <location filename="../qt-ui/preferences.ui" line="486"/>
<source>Ascent/Descent speed denominator</source>
<translation>Enhet for opp-/nedstigningshastighet</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="460"/>
+ <location filename="../qt-ui/preferences.ui" line="493"/>
<source>Minutes</source>
<translation>Minutter</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="470"/>
+ <location filename="../qt-ui/preferences.ui" line="503"/>
<source>Seconds</source>
<translation>Sekunder</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="502"/>
+ <location filename="../qt-ui/preferences.ui" line="549"/>
<source>Show</source>
<translation>Vis</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="533"/>
- <location filename="../qt-ui/preferences.ui" line="574"/>
- <location filename="../qt-ui/preferences.ui" line="615"/>
- <source>threshold</source>
- <translation>grenseverdi</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="592"/>
- <source>pHe</source>
- <translation>pHe</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="633"/>
- <source>MOD</source>
- <translation>MOD</translation>
- </message>
- <message utf8="true">
- <location filename="../qt-ui/preferences.ui" line="656"/>
- <source>max ppO₂</source>
- <translation>maks ppO₂</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="672"/>
- <source>EAD END EADD</source>
- <translation>EAD END EADD</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="681"/>
- <source>Dive computer reported ceiling</source>
- <translation>Tak fra dykkecomputer</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="704"/>
- <source>draw ceiling red</source>
- <translation>vis tak med rød farge</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="715"/>
- <source>Calculated ceiling</source>
- <translation>Kalkulert tak</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="738"/>
- <source>show all tissues</source>
- <translation>vis alle vev</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="748"/>
- <source>3m increments</source>
- <translation>3-meterstrinn</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="758"/>
- <source>Calculate NDL/TTS</source>
- <translation>Regn ut NDL/TTS</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="821"/>
+ <location filename="../qt-ui/preferences.ui" line="707"/>
<source>GFLow at max depth</source>
<translation>GF lav ved maksdybde</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="781"/>
+ <location filename="../qt-ui/preferences.ui" line="667"/>
<source>Misc</source>
<translation>Ymse</translation>
</message>
@@ -1696,37 +1979,32 @@ Fjern dem før du gjør dette.</translation>
<translation>Valg</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="769"/>
- <source>SAC</source>
- <translation>SAC</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="787"/>
+ <location filename="../qt-ui/preferences.ui" line="673"/>
<source>GFLow</source>
<translation>GF lav</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="804"/>
+ <location filename="../qt-ui/preferences.ui" line="690"/>
<source>GFHigh</source>
<translation>GF høy</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.cpp" line="196"/>
+ <location filename="../qt-ui/preferences.cpp" line="219"/>
<source>Restart required</source>
<translation>Programmet må startes på nytt</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.cpp" line="197"/>
+ <location filename="../qt-ui/preferences.cpp" line="220"/>
<source>To correctly load a new language you must restart Subsurface.</source>
<translation>For å bytte språk må du starte Subsurface på nytt.</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.cpp" line="230"/>
+ <location filename="../qt-ui/preferences.cpp" line="328"/>
<source>Open Default Log File</source>
<translation>Åpne standardlogg</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.cpp" line="230"/>
+ <location filename="../qt-ui/preferences.cpp" line="328"/>
<source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
<translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
</message>
@@ -1734,22 +2012,22 @@ Fjern dem før du gjør dette.</translation>
<context>
<name>PrintDialog</name>
<message>
- <location filename="../qt-ui/printdialog.cpp" line="39"/>
+ <location filename="../qt-ui/printdialog.cpp" line="32"/>
<source>&amp;Preview</source>
<translation>Forhåndsvisning</translation>
</message>
<message>
- <location filename="../qt-ui/printdialog.cpp" line="43"/>
+ <location filename="../qt-ui/printdialog.cpp" line="36"/>
<source>P&amp;rint</source>
<translation>Skriv ut</translation>
</message>
<message>
- <location filename="../qt-ui/printdialog.cpp" line="47"/>
+ <location filename="../qt-ui/printdialog.cpp" line="40"/>
<source>&amp;Close</source>
<translation>Lukk</translation>
</message>
<message>
- <location filename="../qt-ui/printdialog.cpp" line="61"/>
+ <location filename="../qt-ui/printdialog.cpp" line="55"/>
<source>Print</source>
<translation>Skriv ut</translation>
</message>
@@ -1873,215 +2151,115 @@ Fjern dem før du gjør dette.</translation>
</message>
</context>
<context>
- <name>ProfileGraphicsView</name>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="134"/>
- <source>Add Gas Change</source>
- <translation>Legg til gassbytte</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="145"/>
- <source>Add Bookmark</source>
- <translation>Legg til bokmerke</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="153"/>
- <source>Remove Event</source>
- <translation>Fjern hendelse</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="158"/>
- <source>Hide similar events</source>
- <translation>Skjul lignende hendelser</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="172"/>
- <source>Unhide all events</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="212"/>
- <source>Hide events</source>
- <translation>Skjul hendelser</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="213"/>
- <source>Hide all %1 events?</source>
- <translation>Skjul alle %1 hendelser?</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="242"/>
- <source>Remove the selected event?</source>
- <translation>Fjern den valgte hendelsen?</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="243"/>
- <source>%1 @ %2:%3</source>
- <translation>%1 @ %2:%3</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="406"/>
- <location filename="../qt-ui/profilegraphics.cpp" line="408"/>
- <source>unknown divecomputer</source>
- <translation>ukjent dykkecomputer</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="486"/>
- <source>Set Duration: 10 minutes</source>
- <translation>Varighet: 10 minutter</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="528"/>
- <source>Scale</source>
- <translation>Målestokk</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="529"/>
- <source>Ruler</source>
- <translation>Linjal</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="531"/>
- <source>Measure properties of dive segments</source>
- <translation>Mål egenskaper ved dykk</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="532"/>
- <source>Scale your dive to screen size</source>
- <translation>Skaler dykket til skjermstørrelsen</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="545"/>
- <source>Edit</source>
- <translation>Rediger</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="631"/>
- <source>pN</source>
- <translation>pN</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="657"/>
- <source>pHe</source>
- <translation>pHe</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="681"/>
- <source>pO</source>
- <translation>pO</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="769"/>
- <location filename="../qt-ui/profilegraphics.cpp" line="1025"/>
- <source>air</source>
- <translation>luft</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="771"/>
- <location filename="../qt-ui/profilegraphics.cpp" line="1027"/>
- <source>EAN%1</source>
- <translation>EAN%1</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="1035"/>
- <source>Bailing out to OC</source>
- <translation>Bytter til OC</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="1037"/>
- <source> begin</source>
- <comment>Starts with space!</comment>
- <translation> start</translation>
- </message>
- <message>
- <location filename="../qt-ui/profilegraphics.cpp" line="1038"/>
- <source> end</source>
- <comment>Starts with space!</comment>
- <translation> slutt</translation>
- </message>
-</context>
-<context>
<name>ProfilePrintModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1671"/>
+ <location filename="../qt-ui/models.cpp" line="1881"/>
<source>unknown</source>
<translation>ukjent</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1676"/>
+ <location filename="../qt-ui/models.cpp" line="1886"/>
<source>Dive #%1 - %2</source>
<translation>Dykk nr. %1- %2</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1679"/>
+ <location filename="../qt-ui/models.cpp" line="1889"/>
<source>Max depth: %1 %2</source>
<translation>Max dybde: %1 %2</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1686"/>
+ <location filename="../qt-ui/models.cpp" line="1896"/>
<source>Duration: %1 min</source>
<translation>Varighet: %1 min</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1691"/>
+ <location filename="../qt-ui/models.cpp" line="1901"/>
<source>Gas Used:</source>
<translation>Gass brukt:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1693"/>
+ <location filename="../qt-ui/models.cpp" line="1903"/>
<source>SAC:</source>
<translation>SAC:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1695"/>
+ <location filename="../qt-ui/models.cpp" line="1905"/>
<source>Max. CNS:</source>
<translation>Mac. CNS:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1697"/>
+ <location filename="../qt-ui/models.cpp" line="1907"/>
<source>Weights:</source>
<translation>Vekter:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1702"/>
+ <location filename="../qt-ui/models.cpp" line="1912"/>
<source>Notes:</source>
<translation>Notater:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1709"/>
+ <location filename="../qt-ui/models.cpp" line="1919"/>
<source>Divemaster:</source>
<translation>Dykkeleder:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1711"/>
+ <location filename="../qt-ui/models.cpp" line="1921"/>
<source>Buddy:</source>
<translation>Buddy:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1713"/>
+ <location filename="../qt-ui/models.cpp" line="1923"/>
<source>Suit:</source>
<translation>Drakt:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1715"/>
+ <location filename="../qt-ui/models.cpp" line="1925"/>
<source>Viz:</source>
<translation>Sikt:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1717"/>
+ <location filename="../qt-ui/models.cpp" line="1927"/>
<source>Rating:</source>
<translation>Vurdering:</translation>
</message>
</context>
<context>
+ <name>ProfileWidget2</name>
+ <message>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="661"/>
+ <source>Add Gas Change</source>
+ <translation>Legg til gassbytte</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="672"/>
+ <source>Add Bookmark</source>
+ <translation>Legg til bokmerke</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="680"/>
+ <source>Remove Event</source>
+ <translation>Fjern hendelse</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+ <source>Hide similar events</source>
+ <translation>Skjul lignende hendelser</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="699"/>
+ <source>Unhide all events</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>QObject</name>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="35"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="36"/>
<source>AIR</source>
<translation>Luft</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="734"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="706"/>
<source>Remove this Point</source>
<translation>Fjern dette punktet</translation>
</message>
@@ -2091,22 +2269,22 @@ Fjern dem før du gjør dette.</translation>
<translation>Lukk</translation>
</message>
<message>
- <location filename="../qt-ui/simplewidgets.cpp" line="27"/>
+ <location filename="../qt-ui/simplewidgets.cpp" line="32"/>
<source>Average</source>
<translation>Gjennomsnitt</translation>
</message>
<message>
- <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+ <location filename="../qt-ui/simplewidgets.cpp" line="35"/>
<source>Minimum</source>
<translation>Minimum</translation>
</message>
<message>
- <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+ <location filename="../qt-ui/simplewidgets.cpp" line="38"/>
<source>Maximum</source>
<translation>Maksimum</translation>
</message>
<message>
- <location filename="../qt-ui/globe.cpp" line="238"/>
+ <location filename="../qt-ui/globe.cpp" line="239"/>
<source>Move the map and double-click to set the dive location</source>
<translation>Finn sted i kartet og dobbeltklikk for å sette posisjon</translation>
</message>
@@ -2125,6 +2303,59 @@ Fjern dem før du gjør dette.</translation>
</message>
</context>
<context>
+ <name>ShiftImageTimesDialog</name>
+ <message>
+ <location filename="../qt-ui/shiftimagetimes.ui" line="20"/>
+ <source>Shift selected times</source>
+ <translation>Flytt valgte tidspunkter</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/shiftimagetimes.ui" line="31"/>
+ <source>Shift times of image(s) by</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/shiftimagetimes.ui" line="99"/>
+ <source>earlier</source>
+ <translation>tidligere</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/shiftimagetimes.ui" line="106"/>
+ <source>later</source>
+ <translation>senere</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/shiftimagetimes.ui" line="142"/>
+ <source>To compute the offset between the clocks of your dive computer and your camera use your camera to take a picture of your dive compuer displaying the current time. Download that image to your computer and press this button.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/shiftimagetimes.ui" line="152"/>
+ <source>Determine camera time offset</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/shiftimagetimes.ui" line="155"/>
+ <source>Select image of divecomputer showing time</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+ <source>Which date and time are displayed on the image?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/simplewidgets.cpp" line="181"/>
+ <source>Open Image File</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/simplewidgets.cpp" line="183"/>
+ <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>ShiftTimesDialog</name>
<message>
<location filename="../qt-ui/shifttimes.ui" line="20"/>
@@ -2160,20 +2391,25 @@ Fjern dem før du gjør dette.</translation>
<translation>Om Subsurface</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="19"/>
- <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013&lt;/span&gt;</source>
- <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multiplattform dykkelogg&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel med flere, 2011, 2012, 2013&lt;/span&gt;</translation>
- </message>
- <message>
- <location filename="../qt-ui/about.cpp" line="23"/>
+ <location filename="../qt-ui/about.ui" line="80"/>
<source>&amp;License</source>
<translation>&amp;Lisens</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="24"/>
+ <location filename="../qt-ui/about.ui" line="87"/>
<source>&amp;Website</source>
<translation>&amp;Webside</translation>
</message>
+ <message>
+ <location filename="../qt-ui/about.ui" line="94"/>
+ <source>&amp;Close</source>
+ <translation>Lukk</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/about.cpp" line="12"/>
+ <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2014&lt;/span&gt;</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>SubsurfaceWebServices</name>
@@ -2183,37 +2419,37 @@ Fjern dem før du gjør dette.</translation>
<translation>Nettjeneste</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="380"/>
<source>Connecting...</source>
<translation>Kobler til...</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="399"/>
<source>Download finished</source>
<translation>Nedlasting er ferdig</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
<source>Download error: %1</source>
<translation>Feil ved nedlasting: %1</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="423"/>
<source>Connection Error: </source>
<translation>Feil med forbindelse</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
<source>Invalid user identifier!</source>
<translation>Ugyldig bruker-ID!</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="413"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
<source>Cannot parse response!</source>
<translation>Kan ikke lese svar!</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="414"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="432"/>
<source>Download Success!</source>
<translation>Ferdig å laste ned</translation>
</message>
@@ -2229,17 +2465,17 @@ Fjern dem før du gjør dette.</translation>
<context>
<name>TankInfoModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="824"/>
+ <location filename="../qt-ui/models.cpp" line="835"/>
<source>Description</source>
<translation>Beskrivelse</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="824"/>
+ <location filename="../qt-ui/models.cpp" line="835"/>
<source>ml</source>
<translation>ml</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="824"/>
+ <location filename="../qt-ui/models.cpp" line="835"/>
<source>bar</source>
<translation>bar</translation>
</message>
@@ -2247,20 +2483,33 @@ Fjern dem før du gjør dette.</translation>
<context>
<name>ToolTipItem</name>
<message>
- <location filename="../qt-ui/profilegraphics.cpp" line="1568"/>
+ <location filename="../qt-ui/profile/divetooltipitem.cpp" line="128"/>
<source>Information</source>
<translation>Informasjon</translation>
</message>
</context>
<context>
+ <name>UserManual</name>
+ <message>
+ <location filename="../qt-ui/usermanual.cpp" line="23"/>
+ <source>User Manual</source>
+ <translation>Brukermanual</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/usermanual.cpp" line="31"/>
+ <source>Cannot find the Subsurface manual</source>
+ <translation>Finner ikke manualen</translation>
+ </message>
+</context>
+<context>
<name>WSInfoModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="696"/>
+ <location filename="../qt-ui/models.cpp" line="706"/>
<source>Description</source>
<translation>Beskrivelse</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="696"/>
+ <location filename="../qt-ui/models.cpp" line="706"/>
<source>kg</source>
<translation>kg</translation>
</message>
@@ -2283,32 +2532,32 @@ Fjern dem før du gjør dette.</translation>
<translation>Skriv ID-en din her</translation>
</message>
<message>
- <location filename="../qt-ui/webservices.ui" line="39"/>
+ <location filename="../qt-ui/webservices.ui" line="44"/>
<source>Download</source>
<translation>Last ned</translation>
</message>
<message>
- <location filename="../qt-ui/webservices.ui" line="63"/>
+ <location filename="../qt-ui/webservices.ui" line="68"/>
<source>User ID</source>
<translation>Bruker-ID</translation>
</message>
<message>
- <location filename="../qt-ui/webservices.ui" line="80"/>
+ <location filename="../qt-ui/webservices.ui" line="85"/>
<source>Password</source>
<translation>Passord</translation>
</message>
<message>
- <location filename="../qt-ui/webservices.ui" line="94"/>
+ <location filename="../qt-ui/webservices.ui" line="99"/>
<source>Upload</source>
<translation>Last opp</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="257"/>
<source>Operation timed out</source>
<translation>Handlingen fikk tidsavbrudd</translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="278"/>
<source>Transfering data...</source>
<translation>Overfører data...</translation>
</message>
@@ -2316,117 +2565,117 @@ Fjern dem før du gjør dette.</translation>
<context>
<name>WeightModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="346"/>
+ <location filename="../qt-ui/models.cpp" line="356"/>
<source>Type</source>
<translation>Type</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="346"/>
+ <location filename="../qt-ui/models.cpp" line="356"/>
<source>Weight</source>
<translation>Vekt</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="406"/>
+ <location filename="../qt-ui/models.cpp" line="416"/>
<source>Clicking here will remove this weigthsystem.</source>
<translation>Klikk her for å fjerne dette vektsystemet</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="431"/>
+ <location filename="../qt-ui/models.cpp" line="441"/>
<source>kg</source>
- <translation type="unfinished"/>
+ <translation>kg</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="432"/>
+ <location filename="../qt-ui/models.cpp" line="442"/>
<source>lbs</source>
- <translation type="unfinished"/>
+ <translation>pund</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="455"/>
+ <location filename="../qt-ui/models.cpp" line="465"/>
<source>ft</source>
- <translation type="unfinished"/>
+ <translation>ft</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="456"/>
+ <location filename="../qt-ui/models.cpp" line="466"/>
<source>m</source>
- <translation type="unfinished"/>
+ <translation>m</translation>
</message>
</context>
<context>
<name>YearlyStatisticsModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1474"/>
+ <location filename="../qt-ui/models.cpp" line="1639"/>
<source>Year
&gt; Month / Trip</source>
<translation>År
&gt; Måned / Tur</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1475"/>
+ <location filename="../qt-ui/models.cpp" line="1642"/>
<source>#</source>
<translation>#</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1476"/>
+ <location filename="../qt-ui/models.cpp" line="1645"/>
<source>Duration
Total</source>
<translation>Varighet
Total</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1477"/>
+ <location filename="../qt-ui/models.cpp" line="1648"/>
<source>
Average</source>
<translation>
Snitt</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1478"/>
+ <location filename="../qt-ui/models.cpp" line="1651"/>
<source>
Shortest</source>
<translation>
Kortest</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1479"/>
+ <location filename="../qt-ui/models.cpp" line="1654"/>
<source>
Longest</source>
<translation>
Lengst</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1480"/>
+ <location filename="../qt-ui/models.cpp" line="1657"/>
<source>Depth (%1)
Average</source>
<translation>Dybde (%1)
Snitt</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1481"/>
- <location filename="../qt-ui/models.cpp" line="1484"/>
- <location filename="../qt-ui/models.cpp" line="1487"/>
+ <location filename="../qt-ui/models.cpp" line="1660"/>
+ <location filename="../qt-ui/models.cpp" line="1669"/>
+ <location filename="../qt-ui/models.cpp" line="1678"/>
<source>
Minimum</source>
<translation>
Minimum</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1482"/>
- <location filename="../qt-ui/models.cpp" line="1485"/>
- <location filename="../qt-ui/models.cpp" line="1488"/>
+ <location filename="../qt-ui/models.cpp" line="1663"/>
+ <location filename="../qt-ui/models.cpp" line="1672"/>
+ <location filename="../qt-ui/models.cpp" line="1681"/>
<source>
Maximum</source>
<translation>
Maksimum</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1483"/>
+ <location filename="../qt-ui/models.cpp" line="1666"/>
<source>SAC (%1)
Average</source>
<translation>SAC (%1)
Snitt</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1486"/>
+ <location filename="../qt-ui/models.cpp" line="1675"/>
<source>Temp. (%1)
Average</source>
<translation>Temp. (%1)
@@ -2442,25 +2691,25 @@ Snitt</translation>
</message>
<message>
<location filename="../dive.c" line="62"/>
- <location filename="../qt-gui.cpp" line="350"/>
+ <location filename="../qt-gui.cpp" line="348"/>
<source>bar</source>
<translation>bar</translation>
</message>
<message>
<location filename="../dive.c" line="66"/>
- <location filename="../qt-gui.cpp" line="353"/>
+ <location filename="../qt-gui.cpp" line="351"/>
<source>psi</source>
<translation>psi</translation>
</message>
<message>
<location filename="../dive.c" line="103"/>
- <location filename="../qt-gui.cpp" line="329"/>
+ <location filename="../qt-gui.cpp" line="327"/>
<source>l</source>
<translation>l</translation>
</message>
<message>
<location filename="../dive.c" line="108"/>
- <location filename="../qt-gui.cpp" line="334"/>
+ <location filename="../qt-gui.cpp" line="332"/>
<source>cuft</source>
<translation>ft³</translation>
</message>
@@ -2493,17 +2742,17 @@ Snitt</translation>
<translation>kg</translation>
</message>
<message>
- <location filename="../dive.c" line="1055"/>
+ <location filename="../dive.c" line="1104"/>
<source>(%s) or (%s)</source>
<translation>(%s) eller (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="491"/>
- <location filename="../planner.c" line="97"/>
- <location filename="../planner.c" line="776"/>
- <location filename="../planner.c" line="777"/>
- <location filename="../statistics.c" line="356"/>
- <location filename="../statistics.c" line="367"/>
+ <location filename="../divelist.c" line="492"/>
+ <location filename="../planner.c" line="95"/>
+ <location filename="../planner.c" line="779"/>
+ <location filename="../planner.c" line="782"/>
+ <location filename="../statistics.c" line="358"/>
+ <location filename="../statistics.c" line="368"/>
<source>air</source>
<translation>luft</translation>
</message>
@@ -2535,20 +2784,16 @@ Snitt</translation>
<message>
<location filename="../file.c" line="107"/>
<location filename="../file.c" line="109"/>
- <location filename="../file.c" line="315"/>
- <location filename="../file.c" line="317"/>
+ <location filename="../file.c" line="378"/>
+ <location filename="../file.c" line="380"/>
<source>Failed to read &apos;%s&apos;</source>
<translation>Kunne ikke åpne &apos;%s&apos;</translation>
</message>
<message>
- <location filename="../file.c" line="269"/>
- <location filename="../file.c" line="271"/>
- <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
- <translation>Klarte ikke å lese &apos;%s&apos;. Bruk CSV-importen isteden.</translation>
- </message>
- <message>
- <location filename="../file.c" line="355"/>
- <location filename="../file.c" line="357"/>
+ <location filename="../file.c" line="419"/>
+ <location filename="../file.c" line="421"/>
+ <location filename="../file.c" line="498"/>
+ <location filename="../file.c" line="500"/>
<source>Maximum number of supported columns on CSV import is %d</source>
<translation>Maks antall kolonner i CSV-importen er %d</translation>
</message>
@@ -2690,17 +2935,17 @@ Snitt</translation>
<translation>ugyldig hendelsesnummer</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="401"/>
+ <location filename="../libdivecomputer.c" line="403"/>
<source>Unable to create parser for %s %s</source>
<translation>Kunne ikke lage parser for %s %s</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="407"/>
+ <location filename="../libdivecomputer.c" line="409"/>
<source>Error registering the data</source>
<translation>Feil ved registrering av data</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="416"/>
+ <location filename="../libdivecomputer.c" line="417"/>
<source>Error parsing the datetime</source>
<translation>Feil ved lesing av dato</translation>
</message>
@@ -2715,133 +2960,158 @@ Snitt</translation>
<translation>Feil ved lesing av dykketid</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="448"/>
+ <location filename="../libdivecomputer.c" line="447"/>
<source>Error parsing the maxdepth</source>
<translation>Feil ved lesing av maksdybde</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="458"/>
+ <location filename="../libdivecomputer.c" line="456"/>
<source>Error parsing the gas mix count</source>
<translation>Feil ved lesing av gassmiksantall</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="471"/>
+ <location filename="../libdivecomputer.c" line="468"/>
<source>Error obtaining water salinity</source>
<translation>Feil ved lesing av salthetsgrad</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="480"/>
+ <location filename="../libdivecomputer.c" line="476"/>
<source>Error obtaining surface pressure</source>
<translation>Klarte ikke å hente overflatetrykk</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="489"/>
+ <location filename="../libdivecomputer.c" line="484"/>
<source>Error parsing the gas mix</source>
<translation>Feil ved lesing av gassmiks</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="497"/>
+ <location filename="../libdivecomputer.c" line="491"/>
<source>Error parsing the samples</source>
<translation>Feil ved lesing av detaljer</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="619"/>
+ <location filename="../libdivecomputer.c" line="621"/>
<source>Event: waiting for user action</source>
<translation>Hendelse: Venter på bruker</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="627"/>
+ <location filename="../libdivecomputer.c" line="629"/>
<source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
<translation>modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="687"/>
+ <location filename="../libdivecomputer.c" line="689"/>
<source>Error registering the event handler.</source>
<translation>Feil ved registrering av hendelseshåndterer.</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="692"/>
+ <location filename="../libdivecomputer.c" line="694"/>
<source>Error registering the cancellation handler.</source>
<translation>Feil ved registrering av avbruddshåndterer.</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="712"/>
+ <location filename="../libdivecomputer.c" line="715"/>
<source>Dive data import error</source>
<translation>Feil ved import av dykkedata</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="750"/>
+ <location filename="../libdivecomputer.c" line="754"/>
<source>Unable to create libdivecomputer context</source>
<translation>Kunne ikke opprette kontekst for libdivecomputer</translation>
</message>
<message>
- <location filename="../libdivecomputer.c" line="757"/>
+ <location filename="../libdivecomputer.c" line="761"/>
<source>Unable to open %s %s (%s)</source>
<translation>Fikk ikke åpnet %s %s (%s)</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="479"/>
+ <location filename="../parse-xml.c" line="484"/>
<source>Strange percentage reading %s
</source>
<translation>Rar lesing av prosent %s
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1616"/>
+ <location filename="../parse-xml.c" line="1625"/>
<source>Failed to parse '%s'.
</source>
<translation>Kunne ikke lese &apos;%s&apos;.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1617"/>
+ <location filename="../parse-xml.c" line="1626"/>
<source>Failed to parse &apos;%s&apos;</source>
<translation>Kunne ikke lese &apos;%s&apos;</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1815"/>
+ <location filename="../parse-xml.c" line="1845"/>
<source>Database query get_events failed.
</source>
<translation>Databasespørring get_events feilet.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1850"/>
+ <location filename="../parse-xml.c" line="1852"/>
+ <source>Database query get_tags failed.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../file.c" line="176"/>
<source>Database connection failed '%s'.
</source>
<translation>Databaseforbindelse feilet &apos;%s&apos;.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1857"/>
+ <location filename="../parse-xml.c" line="1886"/>
+ <location filename="../parse-xml.c" line="2033"/>
<source>Database query failed '%s'.
</source>
<translation>Databasespørring feilet &apos;%s&apos;.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1917"/>
+ <location filename="../parse-xml.c" line="1997"/>
+ <source>Database query get_cylinders failed.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../parse-xml.c" line="2004"/>
+ <source>Database query get_changes failed.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../parse-xml.c" line="2011"/>
+ <source>Database query get_profile_sample failed.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../parse-xml.c" line="2102"/>
<source>Can&apos;t open stylesheet %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../planner.c" line="99"/>
- <location filename="../statistics.c" line="360"/>
+ <location filename="../planner.c" line="97"/>
+ <location filename="../statistics.c" line="361"/>
<source>EAN%d</source>
<translation>EAN%d</translation>
</message>
<message>
- <location filename="../planner.c" line="134"/>
+ <location filename="../planner.c" line="132"/>
<source>Can&apos;t find gas %d/%d</source>
<translation>Finner ikke gassen %d/%d</translation>
</message>
<message>
- <location filename="../planner.c" line="321"/>
+ <location filename="../planner.c" line="324"/>
<source>Too many gas mixes</source>
<translation>For mange gassmikser</translation>
</message>
<message>
- <location filename="../planner.c" line="501"/>
+ <location filename="../planner.c" line="504"/>
<source>%s
Subsurface dive plan
based on GFlow = %.0f and GFhigh = %.0f
@@ -2854,274 +3124,262 @@ basert på GF lav = %.0f og GF høy = %.0f
</translation>
</message>
<message>
- <location filename="../planner.c" line="542"/>
+ <location filename="../planner.c" line="545"/>
<source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
</source>
<translation>Overgang til %.*f %s i %d:%02d min - kjøretid %d:%02u på %s
</translation>
</message>
<message>
- <location filename="../planner.c" line="551"/>
+ <location filename="../planner.c" line="554"/>
<source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s
</source>
<translation>Bli ved %.*f %s i %d:%02d min - kjøretid %d:%02u på %s
</translation>
</message>
<message>
- <location filename="../planner.c" line="562"/>
+ <location filename="../planner.c" line="565"/>
<source>Switch gas to %s
</source>
<translation>Bytt gass til %s
</translation>
</message>
<message>
- <location filename="../planner.c" line="570"/>
+ <location filename="../planner.c" line="573"/>
<source>Gas consumption:
</source>
<translation>Gasskonsum:
</translation>
</message>
<message>
- <location filename="../planner.c" line="581"/>
+ <location filename="../planner.c" line="584"/>
<source>%.0f%s of %s
</source>
<translation>%.0f%s på %s
</translation>
</message>
<message>
- <location filename="../planner.c" line="778"/>
+ <location filename="../planner.c" line="783"/>
<source>ean</source>
<translation>ean</translation>
</message>
<message>
- <location filename="../profile.c" line="1210"/>
- <source>%s
-P:%d %s</source>
- <translation>%s
-P:%d %s</translation>
+ <location filename="../profile.c" line="1231"/>
+ <source>@: %d:%02d
+D: %.1f%s
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1215"/>
- <source>%s
-T:%.1f %s</source>
- <translation>%s
-T:%.1f %s</translation>
+ <location filename="../profile.c" line="1234"/>
+ <source>P: %d%s
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1222"/>
- <source>%s
-V:%.2f %s</source>
- <translation>%s
-V:%.2f %s</translation>
+ <location filename="../profile.c" line="1238"/>
+ <source>T: %.1f%s
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1308"/>
- <source>%s
-Calculated ceiling %.0f %s</source>
- <translation>%s
-Kalkulert tak %.0f %s</translation>
+ <location filename="../profile.c" line="1244"/>
+ <source>V: %.1f%s
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1315"/>
- <source>%s
-Tissue %.0fmin: %.0f %s</source>
- <translation>%s
-Vev %.0fmin: %.0f %s</translation>
+ <location filename="../profile.c" line="1247"/>
+ <source>SAC: %2.1fl/min
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1262"/>
- <source>%s
-Safetystop:%umin @ %.0f %s</source>
- <translation>%s
-Sikkerhetsstopp:%umin @ %.0f %s</translation>
+ <location filename="../profile.c" line="1249"/>
+ <source>CNS: %u%%
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1206"/>
- <source>@:%d:%02d
-D:%.1f %s</source>
- <translation>@:%d:%02d
-D:%.1f %s</translation>
+ <location filename="../profile.c" line="1251"/>
+ <source>pO%s: %.2fbar
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1226"/>
- <source>%s
-SAC:%2.1fl/min</source>
- <translation>%s
-SAC:%2.1fl/min</translation>
+ <location filename="../profile.c" line="1253"/>
+ <source>pN%s: %.2fbar
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1265"/>
- <source>%s
-Safetystop:unkn time @ %.0f %s</source>
- <translation>%s
-Sikkerhetsstopp: ukjent tid @ %.0f %s</translation>
+ <location filename="../profile.c" line="1255"/>
+ <source>pHe: %.2fbar
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1270"/>
- <source>%s
-Deco:%umin @ %.0f %s</source>
- <translation>%s
-Deko:%umin @ %.0f %s</translation>
+ <location filename="../profile.c" line="1258"/>
+ <source>MOD: %d%s
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1273"/>
- <source>%s
-Deco:unkn time @ %.0f %s</source>
- <translation>%s
-Deko:ukjent tid @ %.0f %s</translation>
+ <location filename="../profile.c" line="1264"/>
+ <source>EAD: %d%s
+END: %d%s
+EADD: %d%s
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../profile.c" line="1271"/>
+ <source>Safetystop: %umin @ %.0f%s
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../profile.c" line="1274"/>
+ <source>Safetystop: unkn time @ %.0f%s
+</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../profile.c" line="1279"/>
- <source>%s
-In deco</source>
- <translation>%s
-I deko</translation>
+ <source>Deco: %umin @ %.0f%s
+</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../profile.c" line="1282"/>
- <source>%s
-NDL:%umin</source>
- <translation>%s
-NDL:%umin</translation>
+ <source>Deco: unkn time @ %.0f%s
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1230"/>
- <source>%s
-CNS:%u%%</source>
- <translation>%s
-CNS:%u%%</translation>
+ <location filename="../profile.c" line="1286"/>
+ <source>In deco
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1234"/>
- <source>%s
-pO%s:%.2fbar</source>
- <translation>%s
-pO%s:%.2fbar</translation>
+ <location filename="../profile.c" line="1288"/>
+ <source>NDL: %umin
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1238"/>
- <source>%s
-pN%s:%.2fbar</source>
- <translation>%s
-pN%s:%.2fbar</translation>
+ <location filename="../profile.c" line="1292"/>
+ <source>Deco: %umin @ %.0f%s (calc)
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1242"/>
- <source>%s
-pHe:%.2fbar</source>
- <translation>%s
-pHe:%.2fbar</translation>
+ <location filename="../profile.c" line="1300"/>
+ <source>In deco (calc)
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1247"/>
- <source>%s
-MOD:%d%s</source>
- <translation>%s
-MOD:%d%s</translation>
+ <location filename="../profile.c" line="1302"/>
+ <source>NDL: %umin (calc)
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1254"/>
- <source>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</source>
- <translation>%s
-EAD:%d%s
-END:%d%s
-EADD:%d%s</translation>
+ <location filename="../profile.c" line="1305"/>
+ <source>TTS: %umin (calc)
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1287"/>
- <source>%s
-Deco:%umin @ %.0f %s (calc)</source>
- <translation>%s
-Deko:%umin @ %.0f %s (kalk.)</translation>
+ <location filename="../profile.c" line="1308"/>
+ <source>Calculated ceiling %.0f%s
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1296"/>
- <source>%s
-In deco (calc)</source>
- <translation>%s
-I deko (kalk.)</translation>
+ <location filename="../profile.c" line="1314"/>
+ <source>Tissue %.0fmin: %.0f%s
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1299"/>
- <source>%s
-NDL:%umin (calc)</source>
- <translation>%s
-NDL:%umin (kalk.)</translation>
+ <location filename="../profile.c" line="1320"/>
+ <source>heartbeat: %d
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1303"/>
- <source>%s
-TTS:%umin (calc)</source>
- <translation>%s
-TTS:%umin (kalk.)</translation>
+ <location filename="../profile.c" line="1322"/>
+ <source>bearing: %d
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../profile.c" line="1412"/>
+ <location filename="../profile.c" line="1414"/>
<source>%sT: %d:%02d min</source>
<translation>%sT: %d:%02d min</translation>
</message>
<message>
- <location filename="../profile.c" line="1416"/>
- <location filename="../profile.c" line="1420"/>
- <location filename="../profile.c" line="1424"/>
+ <location filename="../profile.c" line="1418"/>
+ <location filename="../profile.c" line="1422"/>
+ <location filename="../profile.c" line="1426"/>
<source>%s %sD:%.1f%s</source>
<translation>%s %sD:%.1f%s</translation>
</message>
<message>
- <location filename="../profile.c" line="1428"/>
+ <location filename="../profile.c" line="1430"/>
<source>%s %sD:%.1f%s
</source>
<translation>%s %sD:%.1f%s
</translation>
</message>
<message>
- <location filename="../profile.c" line="1432"/>
+ <location filename="../profile.c" line="1434"/>
<source>%s%sV:%.2f%s</source>
<translation>%s%sV:%.2f%s</translation>
</message>
<message>
- <location filename="../profile.c" line="1436"/>
- <location filename="../profile.c" line="1440"/>
+ <location filename="../profile.c" line="1438"/>
+ <location filename="../profile.c" line="1442"/>
<source>%s %sV:%.2f%s</source>
<translation>%s %sV:%.2f%s</translation>
</message>
<message>
- <location filename="../profile.c" line="1447"/>
+ <location filename="../profile.c" line="1449"/>
<source>%s %sP:%d %s</source>
<translation>%s %sP:%d %s</translation>
</message>
<message>
- <location filename="../qt-gui.cpp" line="309"/>
+ <location filename="../qt-gui.cpp" line="308"/>
<source>C</source>
<translation>C</translation>
</message>
<message>
- <location filename="../qt-gui.cpp" line="313"/>
+ <location filename="../qt-gui.cpp" line="311"/>
<source>F</source>
<translation>F</translation>
</message>
<message>
- <location filename="../qt-gui.cpp" line="495"/>
+ <location filename="../qt-gui.cpp" line="498"/>
<source>%1, %2 %3, %4 %5:%6</source>
<translation>%1, %2 %3, %4 %5:%6</translation>
</message>
<message>
- <location filename="../qt-gui.cpp" line="508"/>
+ <location filename="../qt-gui.cpp" line="511"/>
<source>%1 %2, %3
%4:%5</source>
<translation>%1 %2, %3
%4:%5</translation>
</message>
<message>
- <location filename="../qt-gui.cpp" line="521"/>
+ <location filename="../qt-gui.cpp" line="524"/>
<source>%1 %2 (%3 dives)</source>
<translation>%1 %2 (%3 dykk)</translation>
</message>
<message>
- <location filename="../qt-gui.cpp" line="526"/>
+ <location filename="../qt-gui.cpp" line="529"/>
<source>%1 %2 (1 dive)</source>
<translation>%1 %2 (1 dykk)</translation>
</message>
@@ -3221,142 +3479,142 @@ TTS:%umin (kalk.)</translation>
<translation>deko</translation>
</message>
<message>
- <location filename="../statistics.c" line="214"/>
+ <location filename="../statistics.c" line="216"/>
<source>more than %d days</source>
<translation>mer enn %d dager</translation>
</message>
<message>
- <location filename="../statistics.c" line="220"/>
+ <location filename="../statistics.c" line="222"/>
<source>%dd %dh %dmin</source>
<translation>%dt %dt %dmin</translation>
</message>
<message>
- <location filename="../statistics.c" line="222"/>
+ <location filename="../statistics.c" line="224"/>
<source>%dh %dmin</source>
<translation>%dt %dmin</translation>
</message>
<message>
- <location filename="../statistics.c" line="233"/>
+ <location filename="../statistics.c" line="235"/>
<source>for dives #</source>
<translation>for dykk #</translation>
</message>
<message>
- <location filename="../statistics.c" line="240"/>
+ <location filename="../statistics.c" line="242"/>
<source>for selected dives</source>
<translation>for valgte dykk</translation>
</message>
<message>
- <location filename="../statistics.c" line="275"/>
+ <location filename="../statistics.c" line="277"/>
<source>for dive #%d</source>
<translation>for dykk #%d</translation>
</message>
<message>
- <location filename="../statistics.c" line="277"/>
+ <location filename="../statistics.c" line="279"/>
<source>for selected dive</source>
<translation>for valgte dykk</translation>
</message>
<message>
- <location filename="../statistics.c" line="279"/>
+ <location filename="../statistics.c" line="281"/>
<source>for all dives</source>
<translation>for alle dykk</translation>
</message>
<message>
- <location filename="../statistics.c" line="281"/>
+ <location filename="../statistics.c" line="283"/>
<source>(no dives)</source>
<translation>(ingen dykk)</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="61"/>
+ <location filename="../subsurfacestartup.c" line="63"/>
<source>Sun</source>
<translation>søn</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="61"/>
+ <location filename="../subsurfacestartup.c" line="63"/>
<source>Mon</source>
<translation>man</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="61"/>
+ <location filename="../subsurfacestartup.c" line="63"/>
<source>Tue</source>
<translation>tir</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="61"/>
+ <location filename="../subsurfacestartup.c" line="63"/>
<source>Wed</source>
<translation>ons</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="61"/>
+ <location filename="../subsurfacestartup.c" line="63"/>
<source>Thu</source>
<translation>tor</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="61"/>
+ <location filename="../subsurfacestartup.c" line="63"/>
<source>Fri</source>
<translation>fre</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="61"/>
+ <location filename="../subsurfacestartup.c" line="63"/>
<source>Sat</source>
<translation>lør</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="70"/>
+ <location filename="../subsurfacestartup.c" line="72"/>
<source>Jan</source>
<translation>jan</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="70"/>
+ <location filename="../subsurfacestartup.c" line="72"/>
<source>Feb</source>
<translation>feb</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="70"/>
+ <location filename="../subsurfacestartup.c" line="72"/>
<source>Mar</source>
<translation>mar</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="70"/>
+ <location filename="../subsurfacestartup.c" line="72"/>
<source>Apr</source>
<translation>apr</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="70"/>
+ <location filename="../subsurfacestartup.c" line="72"/>
<source>May</source>
<translation>mai</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="70"/>
+ <location filename="../subsurfacestartup.c" line="72"/>
<source>Jun</source>
<translation>jun</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="71"/>
+ <location filename="../subsurfacestartup.c" line="73"/>
<source>Jul</source>
<translation>jul</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="71"/>
+ <location filename="../subsurfacestartup.c" line="73"/>
<source>Aug</source>
<translation>aug</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="71"/>
+ <location filename="../subsurfacestartup.c" line="73"/>
<source>Sep</source>
<translation>sep</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="71"/>
+ <location filename="../subsurfacestartup.c" line="73"/>
<source>Oct</source>
<translation>okt</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="71"/>
+ <location filename="../subsurfacestartup.c" line="73"/>
<source>Nov</source>
<translation>nov</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="71"/>
+ <location filename="../subsurfacestartup.c" line="73"/>
<source>Dec</source>
<translation>des</translation>
</message>
@@ -3386,187 +3644,187 @@ Is the Uemis Zurich plugged in correctly?</source>
Er Uemis Zurich plugget i ordentlig?</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="106"/>
+ <location filename="../uemis-downloader.c" line="107"/>
<source>unknown</source>
<translation>ukjent</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="372"/>
+ <location filename="../uemis-downloader.c" line="379"/>
<source>Reading %s %s</source>
<translation>Leser %s %s</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="392"/>
+ <location filename="../uemis-downloader.c" line="399"/>
<source>data</source>
<translation>data</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="413"/>
+ <location filename="../uemis-downloader.c" line="420"/>
<source>divelog entry id</source>
<translation>id for oppføring i logg</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="415"/>
+ <location filename="../uemis-downloader.c" line="422"/>
<source>divespot data id</source>
<translation>id for dykkesteddata</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="417"/>
+ <location filename="../uemis-downloader.c" line="424"/>
<source>more data dive id</source>
<translation>mer data dykke-id</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="597"/>
+ <location filename="../uemis-downloader.c" line="618"/>
<source>wetsuit</source>
<translation>våtdrakt</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="597"/>
+ <location filename="../uemis-downloader.c" line="618"/>
<source>semidry</source>
<translation>semidry</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="597"/>
+ <location filename="../uemis-downloader.c" line="618"/>
<source>drysuit</source>
<translation>tørrdrakt</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="598"/>
+ <location filename="../uemis-downloader.c" line="619"/>
<source>shorty</source>
<translation>shorty</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="598"/>
+ <location filename="../uemis-downloader.c" line="619"/>
<source>vest</source>
<translation>vest</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="598"/>
+ <location filename="../uemis-downloader.c" line="619"/>
<source>long john</source>
<translation>ermeløs våtdrakt</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="598"/>
+ <location filename="../uemis-downloader.c" line="619"/>
<source>jacket</source>
<translation>overdel</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="598"/>
+ <location filename="../uemis-downloader.c" line="619"/>
<source>full suit</source>
<translation>hel drakt</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="598"/>
+ <location filename="../uemis-downloader.c" line="619"/>
<source>2 pcs full suit</source>
<translation>todelt drakt</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="599"/>
+ <location filename="../uemis-downloader.c" line="620"/>
<source>membrane</source>
<translation>skalldrakt</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="781"/>
+ <location filename="../uemis-downloader.c" line="802"/>
<source>Init Communication</source>
<translation>Start kommunikasjon</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="783"/>
+ <location filename="../uemis-downloader.c" line="804"/>
<source>Uemis init failed</source>
<translation>Klarer ikke å lese fra Uemis</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="794"/>
+ <location filename="../uemis-downloader.c" line="815"/>
<source>Start download</source>
<translation>Start nedlasting</translation>
</message>
<message>
- <location filename="../uemis.c" line="194"/>
+ <location filename="../uemis.c" line="196"/>
<source>Safety Stop Violation</source>
<translation>Brudd på sikkerhetsstopp</translation>
</message>
<message>
- <location filename="../uemis.c" line="196"/>
+ <location filename="../uemis.c" line="198"/>
<source>Speed Alarm</source>
<translation>Alarm: oppstigningshastighet</translation>
</message>
<message>
- <location filename="../uemis.c" line="199"/>
+ <location filename="../uemis.c" line="201"/>
<source>Speed Warning</source>
<translation>Advarsel: oppstigningshastighet</translation>
</message>
<message>
- <location filename="../uemis.c" line="201"/>
+ <location filename="../uemis.c" line="203"/>
<source>PO2 Green Warning</source>
<translation>Advarsel: grønn / pO₂</translation>
</message>
<message>
- <location filename="../uemis.c" line="204"/>
+ <location filename="../uemis.c" line="206"/>
<source>PO2 Ascend Warning</source>
<translation>Advarsel: oppstigning / pO₂</translation>
</message>
<message>
- <location filename="../uemis.c" line="206"/>
+ <location filename="../uemis.c" line="208"/>
<source>PO2 Ascend Alarm</source>
<translation>Alarm: oppstigning / pO₂</translation>
</message>
<message>
- <location filename="../uemis.c" line="210"/>
+ <location filename="../uemis.c" line="212"/>
<source>Tank Pressure Info</source>
<translation>Info: tanktrykk</translation>
</message>
<message>
- <location filename="../uemis.c" line="212"/>
+ <location filename="../uemis.c" line="214"/>
<source>RGT Warning</source>
<translation>Advarsel: gjenværende gasstid</translation>
</message>
<message>
- <location filename="../uemis.c" line="214"/>
+ <location filename="../uemis.c" line="216"/>
<source>RGT Alert</source>
<translation>Alarm: gjenværende gasstid</translation>
</message>
<message>
- <location filename="../uemis.c" line="216"/>
+ <location filename="../uemis.c" line="218"/>
<source>Tank Change Suggested</source>
<translation>Tankbytte foreslått</translation>
</message>
<message>
- <location filename="../uemis.c" line="218"/>
+ <location filename="../uemis.c" line="220"/>
<source>Depth Limit Exceeded</source>
<translation>Maksgrense for dybde overskredet</translation>
</message>
<message>
- <location filename="../uemis.c" line="220"/>
+ <location filename="../uemis.c" line="222"/>
<source>Max Deco Time Warning</source>
<translation>Advarsel: maks dekotid</translation>
</message>
<message>
- <location filename="../uemis.c" line="222"/>
+ <location filename="../uemis.c" line="224"/>
<source>Dive Time Info</source>
<translation>Info: dykketid</translation>
</message>
<message>
- <location filename="../uemis.c" line="224"/>
+ <location filename="../uemis.c" line="226"/>
<source>Dive Time Alert</source>
<translation>Alarm: dykketid</translation>
</message>
<message>
- <location filename="../uemis.c" line="226"/>
+ <location filename="../uemis.c" line="228"/>
<source>Marker</source>
<translation>Markering</translation>
</message>
<message>
- <location filename="../uemis.c" line="228"/>
+ <location filename="../uemis.c" line="230"/>
<source>No Tank Data</source>
<translation>Ingen tankinformasjon</translation>
</message>
<message>
- <location filename="../uemis.c" line="230"/>
+ <location filename="../uemis.c" line="232"/>
<source>Low Battery Warning</source>
<translation>Advarsel: dårlig batteri</translation>
</message>
<message>
- <location filename="../uemis.c" line="232"/>
+ <location filename="../uemis.c" line="234"/>
<source>Low Battery Alert</source>
<translation>Alarm: dårlig batteri</translation>
</message>