diff options
Diffstat (limited to 'translations/subsurface_nb_NO.ts')
| -rw-r--r-- | translations/subsurface_nb_NO.ts | 790 |
1 files changed, 422 insertions, 368 deletions
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 3394131a4..4de629717 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Størrelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Trykkrating</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Starttrykk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Sluttrykk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Gassbytte ved</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <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="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Flaska kan ikke fjernes</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Gassen er i bruk. Bare flasker som ikke er i bruk kan fjernes.</translation> </message> @@ -1063,22 +1075,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Enhets-ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Navn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Klikk her for å fjerne denne dykkecomputeren.</translation> </message> @@ -1106,97 +1118,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Sted</translation> </message> @@ -1204,87 +1216,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Fold ut turer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Fold sammen turer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Slå sammen andre</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Fjern dykk fra tur</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Lag ny tur</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>Legg til dykk til turen over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Legg til dykk til turen under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Slå samme tur med turen over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Slå sammen tur med turen under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Marker dykk som ugyldige</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Slå sammen valgte dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Renummerer dykk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Flytt tidspunkter</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Last inn bilder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Åpne bilder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1697,27 +1709,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Høyde over havet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Planlagt dykketid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>ATM-trykk</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1730,37 +1742,37 @@ <translation>ukjent</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Siste dybde</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Løpetid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC settpunkt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Slett planen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Du er i ferd med å forkaste planen.</translation> </message> @@ -1782,6 +1794,11 @@ <source>Add dive data point</source> <translation>Legg til punkt</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1880,7 +1897,7 @@ </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1916,127 +1933,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2258,6 +2275,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2266,8 +2296,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> - <translation>Tekstetikett</translation> + <source>Text label</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> @@ -2312,8 +2342,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2321,7 +2351,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Sted</translation> </message> @@ -2362,27 +2392,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Notater</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Notater</translation> </message> @@ -2432,6 +2462,16 @@ p, li { white-space: pre-wrap; } <translation>Gassforbruk</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2504,91 +2544,91 @@ p, li { white-space: pre-wrap; } <translation>Bilder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Flasker</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Legg til flaske</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Vekter</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Legg til vektsystem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Lagre</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Vanntemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Denne turen redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Flere dykk redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Dette dykket redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Turnotater</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Tursted</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Dypeste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Grunneste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2597,17 +2637,17 @@ fra luft og bruker: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>og</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Slette endringer?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Du er i ferd med å droppe endringene dine.</translation> </message> @@ -2934,18 +2974,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3129,60 +3168,60 @@ p, li { white-space: pre-wrap; } <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vil du lagre endringene i fila %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vil du lagre endrinene i datafila?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Endringer vil gå tapt hvis du ikke lagrer.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <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="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Avslutt denne redigeringa før du starter en ny.</translation> </message> @@ -3190,54 +3229,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Siste stopp ved 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% av snittdybde til 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20ft til overflaten</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Siste stopp ved 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>50% av snittdybde til 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6m til overflaten</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3752,72 +3791,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Dykk nr. %1- %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Max dybde: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Varighet: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Gassforbruk:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Emneord:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Vekter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Notater:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> @@ -3948,42 +3987,42 @@ p, li { white-space: pre-wrap; } <translation>Finn sted i kartet og dobbeltklikk for å sette posisjon</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>ft³</translation> </message> @@ -4264,7 +4303,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4272,17 +4311,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4508,12 +4547,12 @@ OS CPU-arkitektur: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4574,17 +4613,17 @@ OS CPU-arkitektur: %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Klikk her for å fjerne dette vektsystemet.</translation> </message> @@ -4605,79 +4644,79 @@ OS CPU-arkitektur: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>År > Måned / Tur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Varighet Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Kortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Lengst</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Dybde (%1) Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Maksimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4687,29 +4726,29 @@ Snitt</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>ft³</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4717,56 +4756,56 @@ Snitt</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>luft</translation> </message> @@ -4797,31 +4836,31 @@ Snitt</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Kunne ikke åpne '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maks antall kolonner i CSV-importen er %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>ingen</translation> </message> @@ -4829,7 +4868,7 @@ Snitt</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>dekostopp</translation> </message> @@ -4841,52 +4880,52 @@ Snitt</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>oppstigning</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>tak</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>arbeidsbelastning</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>sender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>brudd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>bokmerke</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>overflate</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>sikkerhetsstopp</translation> </message> @@ -4894,202 +4933,212 @@ Snitt</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>gassbytte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>sikkerhetsstopp (frivillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>sikkerhetsstopp (obligatorisk)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>dypstopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>tak (sikkerhetsstopp)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>dykketid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>under tak</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>maksdybde</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>pO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>lufttid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>retning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Advarsel: nivå i vev</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>tid uten stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>ugyldig hendelsesnummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <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="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Feil ved registrering av data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Feil ved lesing av dato</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Dykk %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Feil ved lesing av dykketid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Feil ved lesing av maksdybde</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Feil ved lesing av gassmiksantall</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Feil ved lesing av salthetsgrad</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Klarte ikke å hente overflatetrykk</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Feil ved lesing av gassmiks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <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="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Rar lesing av prosent %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Kunne ikke lese '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Databasespørring get_events feilet. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Databasespørring get_tags feilet. @@ -5103,36 +5152,36 @@ Snitt</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Databasespørring feilet '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Databasespørring get_cylinders feilet. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Databasespørring get_changes feilet. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Databasespørring get_profile_sample feilet. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åpne stilark %s</translation> </message> @@ -5142,7 +5191,7 @@ Snitt</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Finner ikke gassen %s</translation> </message> @@ -5223,15 +5272,20 @@ Snitt</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Gassforbruk:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> @@ -5241,37 +5295,37 @@ Snitt</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>dette er mer gass en det som er tilgjengelig i tanken!</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>ikke nok i reserve til å dele gass under oppstigning!</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s i planlagt oppstigning)</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planlagt oppstigning) av %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>høy pO₂-verdi %.2f ve %d:%02u med gass %s ved dybde %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5280,70 +5334,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5352,7 +5406,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5361,142 +5415,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sikkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>I deko (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Kalkulert tak %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Vev %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>puls: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>retning: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5616,7 +5670,7 @@ EADD: %d%s <translation>deko</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5666,97 +5720,97 @@ EADD: %d%s <translation>(ingen dykk)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>søn</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>man</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>tir</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>ons</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>tor</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>fre</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>lør</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>des</translation> </message> |