aboutsummaryrefslogtreecommitdiffstats
path: root/translations/subsurface_nb_NO.ts
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-07-16 14:24:27 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-07-16 14:24:27 -0700
commita5c9bc1ef24ee9ffc527f0981a4ddb0f0f8fb2b1 (patch)
tree92d68c9fdb7cf366e5d5e5fb75874a5fd67f9be2 /translations/subsurface_nb_NO.ts
parent14cc59898a9b6405ba239919137a5c57e7e6e0d0 (diff)
downloadsubsurface-a5c9bc1ef24ee9ffc527f0981a4ddb0f0f8fb2b1.tar.gz
Pull latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_nb_NO.ts')
-rw-r--r--translations/subsurface_nb_NO.ts2328
1 files changed, 1211 insertions, 1117 deletions
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index d9f13b43e..d39d820e2 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -14,28 +14,28 @@
</message>
<message>
<location filename="../qt-ui/models.cpp" line="69"/>
- <source>WorkPress</source>
- <translation>Trykk</translation>
+ <source>He%</source>
+ <translation>He%</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="69"/>
- <source>StartPress</source>
- <translation>Starttrykk</translation>
+ <source>O</source>
+ <translation>O</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="69"/>
- <source>EndPress</source>
- <translation>Sluttrykk</translation>
+ <source>Work press.</source>
+ <translation>Trykkrating.</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="69"/>
- <source>He%</source>
- <translation>He%</translation>
+ <source>Start press.</source>
+ <translation>Starttrykk.</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="69"/>
- <source>O</source>
- <translation>O</translation>
+ <source>End press.</source>
+ <translation>Sluttrykk.</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="70"/>
@@ -48,47 +48,22 @@
<translation>Klikk her for å fjerne denne flaska.</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="358"/>
+ <location filename="../qt-ui/models.cpp" line="365"/>
<source>Cylinder cannot be removed</source>
<translation>Flaska kan ikke fjernes</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="359"/>
- <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="507"/>
- <source>psi</source>
- <translation>psi</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="508"/>
- <source>bar</source>
- <translation>bar</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="532"/>
- <source>l</source>
- <translation>l</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="533"/>
- <source>cuft</source>
- <translation>ft³</translation>
+ <location filename="../qt-ui/models.cpp" line="366"/>
+ <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>
</context>
<context>
<name>DiveComputerManagementDialog</name>
<message>
- <location filename="../qt-ui/divecomputermanagementdialog.ui" line="17"/>
- <source>Edit Dive Computer Nicknames</source>
- <translation>Rediger navn for dykkecomputer</translation>
- </message>
- <message>
<location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
- <source>Remove the selected Dive Computer?</source>
- <translation>Fjerne den valgte computeren?</translation>
+ <source>Remove the selected dive computer?</source>
+ <translation>Fjern valgte dykkecomputer?</translation>
</message>
<message>
<location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
@@ -96,45 +71,50 @@
remove the selected dive computer?</source>
<translation>Vil du fjerne den valgte computeren?</translation>
</message>
+ <message>
+ <location filename="../qt-ui/divecomputermanagementdialog.ui" line="17"/>
+ <source>Edit dive computer nicknames</source>
+ <translation>Rediger computerens navn</translation>
+ </message>
</context>
<context>
<name>DiveComputerModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1411"/>
+ <location filename="../qt-ui/models.cpp" line="1421"/>
<source>Model</source>
<translation>Modell</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1411"/>
+ <location filename="../qt-ui/models.cpp" line="1421"/>
<source>Device ID</source>
<translation>Enhets-ID</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1411"/>
+ <location filename="../qt-ui/models.cpp" line="1421"/>
<source>Nickname</source>
<translation>Navn</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1442"/>
- <source>Clicking here will remove this divecomputer.</source>
- <translation>Klikk her for å fjerne denne computeren.</translation>
+ <location filename="../qt-ui/models.cpp" line="1452"/>
+ <source>Clicking here will remove this dive computer.</source>
+ <translation>Klikk her for å fjerne denne dykkecomputeren.</translation>
</message>
</context>
<context>
<name>DiveEventItem</name>
<message>
- <location filename="../qt-ui/profile/diveeventitem.cpp" line="96"/>
+ <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/>
<source>Bailing out to OC</source>
<translation>Bytter til OC</translation>
</message>
<message>
- <location filename="../qt-ui/profile/diveeventitem.cpp" line="98"/>
+ <location filename="../qt-ui/profile/diveeventitem.cpp" line="103"/>
<source> begin</source>
<comment>Starts with space!</comment>
<translation> start</translation>
</message>
<message>
- <location filename="../qt-ui/profile/diveeventitem.cpp" line="99"/>
+ <location filename="../qt-ui/profile/diveeventitem.cpp" line="104"/>
<source> end</source>
<comment>Starts with space!</comment>
<translation> slutt</translation>
@@ -143,7 +123,7 @@
<context>
<name>DiveItem</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1243"/>
+ <location filename="../qt-ui/models.cpp" line="1253"/>
<source>/min</source>
<translation>/min</translation>
</message>
@@ -152,191 +132,183 @@
<name>DiveListView</name>
<message>
<location filename="../qt-ui/divelistview.cpp" line="53"/>
- <source>Show Search Box</source>
+ <source>Show search box</source>
<translation>Vis søkeboks</translation>
</message>
<message>
+ <location filename="../qt-ui/divelistview.cpp" line="705"/>
+ <source>Expand all</source>
+ <translation>Fold ut turer</translation>
+ </message>
+ <message>
<location filename="../qt-ui/divelistview.cpp" line="706"/>
- <source>expand all</source>
- <translation>vis alle turer</translation>
+ <source>Collapse all</source>
+ <translation>Fold sammen turer</translation>
</message>
<message>
<location filename="../qt-ui/divelistview.cpp" line="707"/>
- <source>collapse all</source>
- <translation>slå sammen alle turer</translation>
+ <source>Collapse others</source>
+ <translation>Slå sammen andre</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="708"/>
- <source>collapse others</source>
- <translation>slå sammen andre turer</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="709"/>
+ <source>Remove dive(s) from trip</source>
+ <translation>Fjern dykk fra tur</translation>
</message>
<message>
<location filename="../qt-ui/divelistview.cpp" line="710"/>
- <source>remove dive(s) from trip</source>
- <translation>fjern dykk fra tur</translation>
+ <source>Create new trip above</source>
+ <translation>Lag ny tur</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="711"/>
- <source>create new trip above</source>
- <translation>legg til ny tur over denne</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="724"/>
+ <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="725"/>
- <source>add dive(s) to trip immediately above</source>
- <translation>legg dykk til turen over</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="726"/>
+ <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="727"/>
- <source>add dive(s) to trip immediately below</source>
- <translation>legg dykk til turen under denne</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="730"/>
+ <source>Merge trip with trip above</source>
+ <translation>Slå samme tur med turen over</translation>
</message>
<message>
<location filename="../qt-ui/divelistview.cpp" line="731"/>
- <source>merge trip with trip above</source>
- <translation>slå sammen tur med turen over</translation>
- </message>
- <message>
- <location filename="../qt-ui/divelistview.cpp" line="732"/>
- <source>merge trip with trip below</source>
- <translation>slå sammen tur med turen under</translation>
+ <source>Merge trip with trip below</source>
+ <translation>Slå sammen tur med turen under</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="736"/>
- <source>delete dive(s)</source>
- <translation>slett dykk</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="735"/>
+ <source>Delete dive(s)</source>
+ <translation>Slett dykk</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="738"/>
- <source>mark dive(s) invalid</source>
- <translation>merk dykk som skjult</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="737"/>
+ <source>Mark dive(s) invalid</source>
+ <translation>Marker dykk som ugyldige</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="744"/>
- <source>renumber dive(s)</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelistview.cpp" line="741"/>
+ <source>Merge selected dives</source>
+ <translation>Slå sammen valgte dyk</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="745"/>
- <source>shift times</source>
- <translation>forskyvning av tidspunkter</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="743"/>
+ <source>Renumber dive(s)</source>
+ <translation>Renummerer dykk</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="746"/>
- <source>load images</source>
- <translation>last inn bilder</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="744"/>
+ <source>Shift times</source>
+ <translation>Flytt tidspunkter</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="767"/>
- <source>Open Image Files</source>
- <translation>Åpne bildefiler</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="745"/>
+ <source>Load images</source>
+ <translation>Last inn bilder</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="767"/>
- <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
- <translation>Bildefiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="766"/>
+ <source>Open image files</source>
+ <translation>Åpne bilder</translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="742"/>
- <source>merge selected dives</source>
- <translation>slå sammen valgte dykk</translation>
+ <location filename="../qt-ui/divelistview.cpp" line="766"/>
+ <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+ <translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
</message>
</context>
<context>
<name>DiveLogExportDialog</name>
<message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
- <source>Export Dive Log Files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
- <source>General Export</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/divelogexportdialog.ui" line="30"/>
<source>Export format</source>
- <translation type="unfinished"/>
+ <translation>Eksportformat</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="42"/>
<source>Subsurface XML</source>
- <translation type="unfinished"/>
+ <translation>Subsurface XML</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="61"/>
<source>UDDF</source>
- <translation type="unfinished"/>
+ <translation>UDDF</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="74"/>
<source>divelogs.de</source>
- <translation type="unfinished"/>
+ <translation>divelogs.de</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="84"/>
<source>CSV</source>
- <translation type="unfinished"/>
+ <translation>CSV</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="94"/>
<source>Worldmap</source>
- <translation type="unfinished"/>
+ <translation>Verdenskart</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
<source>Selection</source>
- <translation type="unfinished"/>
+ <translation>Valg</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="116"/>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
<source>Selected dives</source>
- <translation type="unfinished"/>
+ <translation>Valgte dykk</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="126"/>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
<source>All dives</source>
- <translation type="unfinished"/>
+ <translation>Alle dyk</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="178"/>
<source>HTML</source>
- <translation type="unfinished"/>
+ <translation>HTML</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
- <source>General Settings</source>
- <translation>Generelle innstillinger</translation>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
+ <source>Minimum Javascript</source>
+ <translation>Minimalt med javascript</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
- <source>Subsurface Numbers</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+ <source>Export dive log files</source>
+ <translation>Eksporter loggfiler</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="203"/>
- <source>Selected Dives</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="24"/>
+ <source>General export</source>
+ <translation>Generell eksport</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="216"/>
- <source>Minimum Javascript</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="184"/>
+ <source>General settings</source>
+ <translation>Generelle innstillinger</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
- <source>All Dives</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelogexportdialog.ui" line="190"/>
+ <source>Subsurface numbers</source>
+ <translation>Subsurface-tall</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="239"/>
- <source>Export List only</source>
- <translation type="unfinished"/>
+ <source>Export list only</source>
+ <translation>Bare eksporter liste</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
- <source>Style Options</source>
- <translation type="unfinished"/>
+ <source>Style options</source>
+ <translation>Stilvalg</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="264"/>
@@ -351,7 +323,7 @@
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
<source>8</source>
- <translation type="unfinished"/>
+ <translation>8</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
@@ -361,88 +333,113 @@
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
<source>12</source>
- <translation type="unfinished"/>
+ <translation>12</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
<source>14</source>
- <translation type="unfinished"/>
+ <translation>14</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
<source>16</source>
- <translation type="unfinished"/>
+ <translation>16</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
<source>18</source>
- <translation type="unfinished"/>
+ <translation>18</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
<source>20</source>
- <translation type="unfinished"/>
+ <translation>20</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="323"/>
<source>Theme</source>
- <translation type="unfinished"/>
+ <translation>Tema</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
<source>Light</source>
- <translation type="unfinished"/>
+ <translation>Lys</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
<source>Sand</source>
- <translation type="unfinished"/>
+ <translation>Sand</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
- <source>Export UDDF File as</source>
- <translation>Eksporter UDDF-fil som</translation>
- </message>
- <message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="154"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="158"/>
<source>UDDF files (*.uddf *.UDDF)</source>
<translation>UDDF-filer (*.uddf *.UDDF)</translation>
</message>
<message>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
+ <source>CSV files (*.csv *.CSV)</source>
+ <translation>CSV-filer (*.csv *.CSV)</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="58"/>
+ <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
+ <translation>Generelt format som brukes til datautveksling mellom en mengde dykkerelaterte programmer.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="60"/>
+ <source>Comma separated values that include the most relevant information of the dive profile.</source>
+ <translation>Kommaseparerte verdier som inkluderer mesteparten av informasjonen fra dykkeprofilen.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="62"/>
+ <source>Send the dive data to divelogs.de website.</source>
+ <translation>Send dataene til divelogs.de.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="64"/>
+ <source>HTML export of the dive locations, visualized on a world map.</source>
+ <translation>HTML-eksport av dykkestedene, visualisert på et verdenskart.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="66"/>
+ <source>Subsurface native XML format.</source>
+ <translation>Subsurface sitt eget XML-format.</translation>
+ </message>
+ <message>
<location filename="../qt-ui/divelogexportdialog.cpp" line="157"/>
- <source>Export CSV File as</source>
- <translation>Eksporter CSV-fil som</translation>
+ <source>Export UDDF file as</source>
+ <translation>Eksporter UDDF-filer som</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="158"/>
- <source>CSV files (*.csv *.CSV)</source>
- <translation>CSV-filer (*.csv *.CSV)</translation>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="161"/>
+ <source>Export CSV file as</source>
+ <translation>Eksporter CSV-file som</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/>
- <source>Export World Map</source>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="166"/>
+ <source>Export world map</source>
<translation>Eksporter verdenskart</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="181"/>
<source>HTML files (*.html)</source>
<translation>HTML-filer (*.html)</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="171"/>
<source>Export Subsurface XML</source>
- <translation type="unfinished"/>
+ <translation>Eksporter Subsurface XML</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="172"/>
<source>XML files (*.xml *.ssrf)</source>
- <translation type="unfinished"/>
+ <translation>XML-filer (*.xml *.ssrf)</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="176"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="180"/>
<source>Export HTML files as</source>
- <translation type="unfinished"/>
+ <translation>Eksporter HTML-filer som</translation>
</message>
</context>
<context>
@@ -458,128 +455,143 @@
<translation>CSV-valg</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="173"/>
- <location filename="../qt-ui/divelogimportdialog.ui" line="490"/>
- <source>Field Separator</source>
- <translation>Feltseparator</translation>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="191"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="243"/>
<source>Pre-configured imports</source>
<translation>Prekonfigurerte importer</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="41"/>
- <location filename="../qt-ui/divelogimportdialog.ui" line="277"/>
- <source>Field Configuration</source>
- <translation>Feltkonfigurasjon</translation>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="80"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="74"/>
<source>Depth</source>
<translation>Dybde</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="100"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="94"/>
<source>Stopdepth</source>
<translation>Stoppdybde</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="107"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="114"/>
+ <source>Pressure</source>
+ <translation>Trykk</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
<source>PO2</source>
<translation>pO₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="114"/>
- <location filename="../qt-ui/divelogimportdialog.ui" line="351"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="128"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="399"/>
<source>Time</source>
<translation>Tid</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="121"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="135"/>
<source>Temp</source>
<translation>Temp</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="151"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="165"/>
+ <source>NDL</source>
+ <translation>NDL</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="185"/>
+ <source>TTS</source>
+ <translation>TTS</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="205"/>
<source>Cns</source>
<translation>CNS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="207"/>
- <location filename="../qt-ui/divelogimportdialog.ui" line="254"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="231"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="538"/>
+ <source>Field separator</source>
+ <translation>Feltseparator</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="259"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="302"/>
<source>Units</source>
<translation>Enheter</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="220"/>
- <location filename="../qt-ui/divelogimportdialog.ui" line="261"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="266"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="309"/>
<source>Metric</source>
<translation>Metrisk</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="225"/>
- <location filename="../qt-ui/divelogimportdialog.ui" line="266"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="271"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="314"/>
<source>Imperial</source>
<translation>Britiske mål</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="248"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="296"/>
<source>Manual dives</source>
<translation>Manuelle dykk</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="283"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="331"/>
<source>Dive #</source>
<translation>Dykk #</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="317"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="365"/>
<source>Date</source>
<translation>Dato</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="385"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="433"/>
<source>Duration</source>
<translation>Varighet</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="470"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="518"/>
<source>Tags</source>
<translation>Emner</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="419"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="467"/>
<source>Location</source>
<translation>Sted</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="453"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="501"/>
<source>Gps</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="300"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="348"/>
<source>Max depth</source>
<translation>Maksdybde</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="334"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="325"/>
+ <source>Field configuration</source>
+ <translation>Feltvalg</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="382"/>
<source>Mean depth</source>
<translation>Snittdybde</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="368"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="416"/>
<source>Buddy</source>
<translation>Buddy</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="402"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="450"/>
<source>Notes</source>
<translation>Notater</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.ui" line="436"/>
+ <location filename="../qt-ui/divelogimportdialog.ui" line="484"/>
<source>Weight</source>
<translation>Vekt</translation>
</message>
@@ -587,27 +599,27 @@
<context>
<name>DivePlanner</name>
<message>
- <location filename="../qt-ui/diveplanner.ui" line="106"/>
- <source>Planned Dive Time</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/diveplanner.ui" line="134"/>
<source>Altitude</source>
- <translation type="unfinished"/>
+ <translation>Høyde over havet</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/diveplanner.ui" line="106"/>
+ <source>Planned dive time</source>
+ <translation>Planlagt dykketid</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.ui" line="141"/>
- <source>ATM Pressure</source>
- <translation>Atmosfæretrykk</translation>
+ <source>ATM pressure</source>
+ <translation>ATM-trykk</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.ui" line="148"/>
<source>mbar</source>
- <translation type="unfinished"/>
+ <translation>mbar</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.ui" line="158"/>
+ <location filename="../qt-ui/diveplanner.ui" line="161"/>
<source>m</source>
<translation>m</translation>
</message>
@@ -620,37 +632,37 @@
<translation>ukjent</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="586"/>
- <source>Final Depth</source>
- <translation>Dybde</translation>
+ <location filename="../qt-ui/diveplanner.cpp" line="622"/>
+ <source>Final depth</source>
+ <translation>Siste dybde</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="588"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="624"/>
<source>Run time</source>
<translation>Løpetid</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="590"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="626"/>
<source>Duration</source>
<translation>Varighet</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="592"/>
- <source>Used Gas</source>
- <translation>Gass</translation>
+ <location filename="../qt-ui/diveplanner.cpp" line="628"/>
+ <source>Used gas</source>
+ <translation>Gassforbruk</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="594"/>
- <source>CC Set Point</source>
- <translation>CC setpoint</translation>
+ <location filename="../qt-ui/diveplanner.cpp" line="630"/>
+ <source>CC set point</source>
+ <translation>CC settpunkt</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="887"/>
- <source>Discard the Plan?</source>
- <translation>Forkaste planen?</translation>
+ <location filename="../qt-ui/diveplanner.cpp" line="925"/>
+ <source>Discard the plan?</source>
+ <translation>Slett planen?</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="888"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="926"/>
<source>You are about to discard your plan.</source>
<translation>Du er i ferd med å forkaste planen.</translation>
</message>
@@ -658,19 +670,19 @@
<context>
<name>DivePlannerWidget</name>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="252"/>
- <source>Dive Planner Points</source>
- <translation>Punkter i dykkeplan</translation>
+ <location filename="../qt-ui/diveplanner.cpp" line="255"/>
+ <source>Dive planner points</source>
+ <translation>Punkter i dykkplan</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="256"/>
- <source>Available Gases</source>
+ <location filename="../qt-ui/diveplanner.cpp" line="259"/>
+ <source>Available gases</source>
<translation>Tilgjengelige gasser</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="279"/>
- <source>add dive data point</source>
- <translation>legg til datapunkt</translation>
+ <location filename="../qt-ui/diveplanner.cpp" line="282"/>
+ <source>Add dive data point</source>
+ <translation>Legg til punkt</translation>
</message>
</context>
<context>
@@ -701,19 +713,9 @@
<translation>Farge</translation>
</message>
<message>
- <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
- <source>User Entered</source>
- <translation>Bruker la inn</translation>
- </message>
- <message>
- <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
- <source>Cylinder Index</source>
- <translation>Flaskeindeks</translation>
- </message>
- <message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
<source>Pressure S</source>
- <translation type="unfinished"/>
+ <translation>Trykk S</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
@@ -736,6 +738,16 @@
<translation>Trykk I</translation>
</message>
<message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+ <source>User entered</source>
+ <translation>Brukeren la inn</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+ <source>Cylinder index</source>
+ <translation>Flaskeindeks</translation>
+ </message>
+ <message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
<source>Ceiling</source>
<translation>Tak</translation>
@@ -749,94 +761,74 @@
<context>
<name>DiveTripModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1286"/>
+ <location filename="../qt-ui/models.cpp" line="1296"/>
<source>#</source>
<translation>#</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1289"/>
- <source>date</source>
- <translation>dato</translation>
+ <location filename="../qt-ui/models.cpp" line="1299"/>
+ <source>Date</source>
+ <translation>Dato</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1295"/>
+ <location filename="../qt-ui/models.cpp" line="1305"/>
<source>m</source>
<translation>m</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1295"/>
+ <location filename="../qt-ui/models.cpp" line="1305"/>
<source>ft</source>
<translation>ft</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1298"/>
- <source>min</source>
- <translation>min</translation>
+ <location filename="../qt-ui/models.cpp" line="1308"/>
+ <source>Mins</source>
+ <translation>Min</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1304"/>
- <source>kg</source>
- <translation>kg</translation>
+ <location filename="../qt-ui/models.cpp" line="1317"/>
+ <source>Suit</source>
+ <translation>Drakt</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1304"/>
- <source>lbs</source>
- <translation>pund</translation>
+ <location filename="../qt-ui/models.cpp" line="1320"/>
+ <source>Cyl</source>
+ <translation>Flaske</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1307"/>
- <source>suit</source>
- <translation>drakt</translation>
+ <location filename="../qt-ui/models.cpp" line="1332"/>
+ <source>Max CNS</source>
+ <translation>Maks CNS</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1310"/>
- <source>cyl</source>
- <translation>flaske</translation>
+ <location filename="../qt-ui/models.cpp" line="1335"/>
+ <source>Location</source>
+ <translation>Sted</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1325"/>
- <source>location</source>
- <translation>sted</translation>
+ <location filename="../qt-ui/models.cpp" line="1314"/>
+ <source>kg</source>
+ <translation>kg</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="1314"/>
+ <source>lbs</source>
+ <translation>pund</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1316"/>
+ <location filename="../qt-ui/models.cpp" line="1326"/>
<source>SAC</source>
<translation>SAC</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1319"/>
+ <location filename="../qt-ui/models.cpp" line="1329"/>
<source>OTU</source>
<translation>OTU</translation>
</message>
- <message>
- <location filename="../qt-ui/models.cpp" line="1322"/>
- <source>maxCNS</source>
- <translation>maks CNS</translation>
- </message>
</context>
<context>
<name>DivelogsDeWebServices</name>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/>
- <source>Invalid response from server</source>
- <translation>Ugyldig svar fra tjener</translation>
- </message>
- <message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/>
- <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="574"/>
- <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="581"/>
- <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="111"/>
<source>no dives were selected</source>
<translation>ingen dykk valgt</translation>
@@ -988,26 +980,26 @@
<context>
<name>DownloadFromDiveComputer</name>
<message>
- <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
- <source>Download From Dive Computer</source>
- <translation>Last ned fra dykkecomputer</translation>
- </message>
- <message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
<source>Vendor</source>
<translation>Leverandør</translation>
</message>
<message>
- <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
- <source>Dive Computer</source>
- <translation>Dykkecomputer</translation>
+ <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
+ <source>Download from dive computer</source>
+ <translation>Last ned fra dykkecomputer</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
- <source>Device or Mount Point</source>
+ <source>Device or mount point</source>
<translation>Enhet eller disk</translation>
</message>
<message>
+ <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+ <source>Dive computer</source>
+ <translation>Dykkecomputer</translation>
+ </message>
+ <message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
@@ -1049,21 +1041,15 @@
<name>GlobeGPS</name>
<message>
<location filename="../qt-ui/globe.cpp" line="120"/>
- <source>Edit Selected Dive Locations</source>
+ <source>Edit selected dive locations</source>
<translation>Rediger valgte steder</translation>
</message>
</context>
<context>
<name>MainTab</name>
<message>
- <location filename="../qt-ui/maintab.ui" line="18"/>
- <location filename="../qt-ui/maintab.cpp" line="416"/>
- <source>Dive Notes</source>
- <translation>Dykk</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="134"/>
- <location filename="../qt-ui/maintab.cpp" line="440"/>
+ <location filename="../qt-ui/maintab.cpp" line="439"/>
<source>Location</source>
<translation>Sted</translation>
</message>
@@ -1083,18 +1069,6 @@
<translation>Buddy</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="72"/>
- <location filename="../qt-ui/maintab.cpp" line="245"/>
- <source>Air temp</source>
- <translation>Lufttemp.</translation>
- </message>
- <message>
- <location filename="../qt-ui/maintab.ui" line="79"/>
- <location filename="../qt-ui/maintab.cpp" line="246"/>
- <source>Water temp</source>
- <translation>Vanntemp.</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="176"/>
<source>Tags</source>
<translation>Emner</translation>
@@ -1115,8 +1089,28 @@
<translation>Drakt</translation>
</message>
<message>
+ <location filename="../qt-ui/maintab.ui" line="18"/>
+ <location filename="../qt-ui/maintab.cpp" line="415"/>
+ <source>Dive notes</source>
+ <translation>Notater</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="72"/>
+ <location filename="../qt-ui/maintab.ui" line="607"/>
+ <location filename="../qt-ui/maintab.cpp" line="244"/>
+ <source>Air temp.</source>
+ <translation>Lufttemp.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="79"/>
+ <location filename="../qt-ui/maintab.ui" line="626"/>
+ <location filename="../qt-ui/maintab.cpp" line="245"/>
+ <source>Water temp.</source>
+ <translation>Vanntemp.</translation>
+ </message>
+ <message>
<location filename="../qt-ui/maintab.ui" line="88"/>
- <location filename="../qt-ui/maintab.cpp" line="441"/>
+ <location filename="../qt-ui/maintab.cpp" line="440"/>
<source>Notes</source>
<translation>Notater</translation>
</message>
@@ -1126,9 +1120,39 @@
<translation>Utstyr</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="391"/>
- <source>Dive Info</source>
- <translation>Informasjon</translation>
+ <location filename="../qt-ui/maintab.ui" line="474"/>
+ <source>Gases used</source>
+ <translation>Brukte gasser</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="493"/>
+ <source>Gas consumed</source>
+ <translation>Gassforbruk</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="531"/>
+ <source>Max. depth</source>
+ <translation>Maksdybde</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="588"/>
+ <source>Air pressure</source>
+ <translation>Lufttrykk</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="645"/>
+ <source>Dive time</source>
+ <translation>Dykketid</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="816"/>
+ <source>Total time</source>
+ <translation>Totaltid</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.ui" line="874"/>
+ <source>Gas consumption</source>
+ <translation>Gassforbruk</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="299"/>
@@ -1142,34 +1166,24 @@
<translation>Tid</translation>
</message>
<message>
+ <location filename="../qt-ui/maintab.ui" line="391"/>
+ <source>Dive info</source>
+ <translation>Dykkeinfo</translation>
+ </message>
+ <message>
<location filename="../qt-ui/maintab.ui" line="455"/>
<source>Interval</source>
<translation>Intervall</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="474"/>
- <source>Gases Used</source>
- <translation>Gasser</translation>
- </message>
- <message>
- <location filename="../qt-ui/maintab.ui" line="493"/>
- <source>Gas Consumed</source>
- <translation>Gasskonsum</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="512"/>
<location filename="../qt-ui/maintab.ui" line="770"/>
<source>SAC</source>
<translation>SAC</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="531"/>
- <source>Max. Depth</source>
- <translation>Maksdybde</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="550"/>
- <source>Ave. Depth</source>
+ <source>Avg. depth</source>
<translation>Snittdybde</translation>
</message>
<message>
@@ -1178,26 +1192,6 @@
<translation>OTU</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="588"/>
- <source>Air Pressure</source>
- <translation>Lufttrykk</translation>
- </message>
- <message>
- <location filename="../qt-ui/maintab.ui" line="607"/>
- <source>Air Temperature</source>
- <translation>Lufttemperatur</translation>
- </message>
- <message>
- <location filename="../qt-ui/maintab.ui" line="626"/>
- <source>Water Temperature</source>
- <translation>Vanntemperatur</translation>
- </message>
- <message>
- <location filename="../qt-ui/maintab.ui" line="645"/>
- <source>Dive Time</source>
- <translation>Dykketid</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="664"/>
<source>Salinity</source>
<translation>Saltholdighet</translation>
@@ -1223,57 +1217,36 @@
<translation>Varighet</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="816"/>
- <source>Total Time</source>
- <translation>Total tid</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="835"/>
<source>Dives</source>
<translation>Dykk</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="874"/>
- <source>Gas Consumption</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/maintab.ui" line="919"/>
<source>Photos</source>
- <translation type="unfinished"/>
+ <translation>Bilder</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="89"/>
+ <location filename="../qt-ui/maintab.cpp" line="88"/>
<source>Cylinders</source>
<translation>Flasker</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="90"/>
+ <location filename="../qt-ui/maintab.cpp" line="89"/>
<source>Add Cylinder</source>
<translation>Legg til flaske</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="93"/>
+ <location filename="../qt-ui/maintab.cpp" line="92"/>
<source>Weights</source>
<translation>Vekter</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="94"/>
+ <location filename="../qt-ui/maintab.cpp" line="93"/>
<source>Add Weight System</source>
<translation>Legg til vektsystem</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="409"/>
- <source>Trip Location</source>
- <translation>Tursted</translation>
- </message>
- <message>
- <location filename="../qt-ui/maintab.cpp" line="387"/>
- <location filename="../qt-ui/maintab.cpp" line="411"/>
- <source>Trip Notes</source>
- <translation>Turnotater</translation>
- </message>
- <message>
<location filename="../qt-ui/maintab.cpp" line="48"/>
<source>Save</source>
<translation>Lagre</translation>
@@ -1284,300 +1257,352 @@
<translation>Avbryt</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="242"/>
- <source>Air temp [%1]</source>
+ <location filename="../qt-ui/maintab.cpp" line="241"/>
+ <source>Air temp. [%1]</source>
<translation>Lufttemp. [%1]</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="243"/>
- <source>Water temp [%1]</source>
- <translation>Vanntemp. [%1]</translation>
+ <location filename="../qt-ui/maintab.cpp" line="242"/>
+ <source>Water temp. [%1]</source>
+ <translation>Vantemp. [%1]</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="278"/>
+ <location filename="../qt-ui/maintab.cpp" line="277"/>
<source>This trip is being edited.</source>
<translation>Denne turen redigeres.</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="285"/>
+ <location filename="../qt-ui/maintab.cpp" line="284"/>
<source>Multiple dives are being edited.</source>
<translation>Flere dykk redigeres.</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="287"/>
+ <location filename="../qt-ui/maintab.cpp" line="286"/>
<source>This dive is being edited.</source>
<translation>Dette dykket redigeres.</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="462"/>
- <location filename="../qt-ui/maintab.cpp" line="470"/>
+ <location filename="../qt-ui/maintab.cpp" line="386"/>
+ <location filename="../qt-ui/maintab.cpp" line="410"/>
+ <source>Trip notes</source>
+ <translation>Turnotater</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.cpp" line="408"/>
+ <source>Trip location</source>
+ <translation>Tursted</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.cpp" line="461"/>
+ <location filename="../qt-ui/maintab.cpp" line="469"/>
+ <location filename="../qt-ui/maintab.cpp" line="502"/>
<location filename="../qt-ui/maintab.cpp" line="503"/>
<location filename="../qt-ui/maintab.cpp" line="504"/>
- <location filename="../qt-ui/maintab.cpp" line="505"/>
<source>/min</source>
<translation>/min</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="464"/>
+ <location filename="../qt-ui/maintab.cpp" line="463"/>
<source>unknown</source>
<translation>ukjent</translation>
</message>
<message>
+ <location filename="../qt-ui/maintab.cpp" line="500"/>
+ <source>Deepest dive</source>
+ <translation>Dypeste dyk</translation>
+ </message>
+ <message>
<location filename="../qt-ui/maintab.cpp" line="501"/>
- <source>Deepest Dive</source>
- <translation type="unfinished"/>
+ <source>Shallowest dive</source>
+ <translation>Grunneste dyk</translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="502"/>
- <source>Shallowest Dive</source>
+ <location filename="../qt-ui/maintab.cpp" line="545"/>
+ <source>These gases could be
+mixed from Air and using:
+</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="794"/>
- <source>Discard the Changes?</source>
+ <location filename="../qt-ui/maintab.cpp" line="549"/>
+ <source> and </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="795"/>
+ <location filename="../qt-ui/maintab.cpp" line="797"/>
+ <source>Discard the changes?</source>
+ <translation>Slette endringer?</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/maintab.cpp" line="798"/>
<source>You are about to discard your changes.</source>
- <translation type="unfinished"/>
+ <translation>Du er i ferd med å droppe endringene dine.</translation>
</message>
</context>
<context>
<name>MainWindow</name>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="695"/>
- <source>Filter</source>
- <translation>Filter</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="646"/>
+ <location filename="../qt-ui/mainwindow.ui" line="672"/>
<source>&amp;File</source>
<translation>&amp;Fil</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="567"/>
+ <location filename="../qt-ui/mainwindow.ui" line="128"/>
+ <source>Toggle pHe graph</source>
+ <translation>Skru pHe-graf av/på</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="154"/>
+ <source>Toggle calculating all tissues</source>
+ <translation>Skru av/på utregning av vev</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="183"/>
+ <source>Toggle DC reported ceiling</source>
+ <translation>Skru av/på dekograf fra computer</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="212"/>
+ <source>Toggle calculated ceiling</source>
+ <translation>Skru av/på dekograf</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="238"/>
+ <source>Toggle NDL, TTS</source>
+ <translation>Skru av/på NDL, TTS</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="264"/>
+ <source>Toggle calculated ceiling with 3m increments</source>
+ <translation>Skru av/på 3m-inkrementer for dekotak</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="290"/>
+ <source>Toggle heart rate</source>
+ <translation>Skru av/på hjertefrekvens</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="316"/>
+ <source>Toggle MOD</source>
+ <translation>Skru av/på MOD</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="342"/>
+ <source>Toggle EAD, END, EADD</source>
+ <translation>Skru av/på EAD, END, EADD</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="368"/>
+ <source>Toggle SAC rate</source>
+ <translation>Skru av/på SAC</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="420"/>
+ <source>Toggle ruler</source>
+ <translation>Skru av/på linjal</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="501"/>
+ <source>Toggle viewing picture thumbnails</source>
+ <translation>Skru av/på minibilder</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="593"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Detaljer for dykkeplan&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="583"/>
+ <location filename="../qt-ui/mainwindow.ui" line="609"/>
<source>Print</source>
<translation>Skriv ut</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="616"/>
+ <location filename="../qt-ui/mainwindow.ui" line="642"/>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Courier&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="667"/>
+ <location filename="../qt-ui/mainwindow.ui" line="693"/>
<source>&amp;Log</source>
<translation>&amp;Logg</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="679"/>
+ <location filename="../qt-ui/mainwindow.ui" line="705"/>
<source>&amp;View</source>
<translation>&amp;Vis</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="701"/>
+ <location filename="../qt-ui/mainwindow.ui" line="721"/>
<source>&amp;Help</source>
<translation>&amp;Hjelp</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="709"/>
+ <location filename="../qt-ui/mainwindow.ui" line="729"/>
<source>&amp;Import</source>
<translation>&amp;Importer</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="725"/>
+ <location filename="../qt-ui/mainwindow.ui" line="744"/>
<source>&amp;New logbook</source>
<translation>&amp;Ny loggbok</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="728"/>
+ <location filename="../qt-ui/mainwindow.ui" line="747"/>
<source>New</source>
<translation>Ny</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="731"/>
+ <location filename="../qt-ui/mainwindow.ui" line="750"/>
<source>Ctrl+N</source>
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="736"/>
+ <location filename="../qt-ui/mainwindow.ui" line="755"/>
<source>&amp;Open logbook</source>
<translation>Åpne l&amp;oggbok</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="739"/>
+ <location filename="../qt-ui/mainwindow.ui" line="758"/>
<source>Open</source>
<translation>Åpne</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="742"/>
+ <location filename="../qt-ui/mainwindow.ui" line="761"/>
<source>Ctrl+O</source>
<translation>Ctrl+O</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="747"/>
+ <location filename="../qt-ui/mainwindow.ui" line="766"/>
<source>&amp;Save</source>
<translation>Lagre</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="750"/>
+ <location filename="../qt-ui/mainwindow.ui" line="769"/>
<source>Save</source>
<translation>Lagre</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="753"/>
+ <location filename="../qt-ui/mainwindow.ui" line="772"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="758"/>
+ <location filename="../qt-ui/mainwindow.ui" line="777"/>
<source>Sa&amp;ve as</source>
- <translation type="unfinished"/>
+ <translation>Lagre som</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="761"/>
+ <location filename="../qt-ui/mainwindow.ui" line="780"/>
<source>Save as</source>
<translation>Lagre som</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="764"/>
+ <location filename="../qt-ui/mainwindow.ui" line="783"/>
<source>Ctrl+Shift+S</source>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="769"/>
+ <location filename="../qt-ui/mainwindow.ui" line="788"/>
<source>&amp;Close</source>
<translation>Lukk</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="772"/>
+ <location filename="../qt-ui/mainwindow.ui" line="791"/>
<source>Close</source>
<translation>Lukk</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="775"/>
+ <location filename="../qt-ui/mainwindow.ui" line="794"/>
<source>Ctrl+W</source>
<translation>Ctrl+W</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="788"/>
+ <location filename="../qt-ui/mainwindow.ui" line="807"/>
<source>P&amp;references</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="831"/>
- <source>&amp;Add Dive</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="850"/>
- <source>Auto &amp;Group</source>
- <translation type="unfinished"/>
+ <translation>Valg</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="863"/>
- <source>&amp;Dive List</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/mainwindow.ui" line="837"/>
+ <source>Import &amp;GPS data from Subsurface web service</source>
+ <translation>Importer &amp;GPS-data fra Subsurface webtjeneste</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="871"/>
+ <location filename="../qt-ui/mainwindow.ui" line="890"/>
<source>&amp;Profile</source>
- <translation type="unfinished"/>
+ <translation>&amp;Profil</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="879"/>
+ <location filename="../qt-ui/mainwindow.ui" line="898"/>
<source>&amp;Info</source>
- <translation type="unfinished"/>
+ <translation>&amp;Info</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="887"/>
+ <location filename="../qt-ui/mainwindow.ui" line="906"/>
<source>&amp;All</source>
- <translation type="unfinished"/>
+ <translation>&amp;Alle</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="895"/>
- <source>P&amp;rev DC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="903"/>
+ <location filename="../qt-ui/mainwindow.ui" line="922"/>
<source>&amp;Next DC</source>
- <translation type="unfinished"/>
+ <translation>&amp;Neste computer</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="911"/>
- <source>&amp;Select Events</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="921"/>
+ <location filename="../qt-ui/mainwindow.ui" line="930"/>
<source>&amp;About Subsurface</source>
- <translation type="unfinished"/>
+ <translation>Om Subsurf&amp;ace</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="937"/>
+ <location filename="../qt-ui/mainwindow.ui" line="946"/>
<source>&amp;Globe</source>
- <translation type="unfinished"/>
+ <translation>&amp;Globus</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="953"/>
- <source>&amp;Import Log Files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="959"/>
+ <location filename="../qt-ui/mainwindow.ui" line="968"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="1008"/>
- <source>&amp;Export</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/mainwindow.ui" line="973"/>
+ <source>Import &amp;from divelogs.de</source>
+ <translation>Importer &amp;fra divelogs.de</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="1011"/>
- <source>Export Dive Logs</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="1014"/>
- <source>Ctrl+E</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/mainwindow.ui" line="981"/>
+ <source>&amp;Full screen</source>
+ <translation>&amp;Fullskjerm</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="472"/>
- <source>Enable the pN2 Graph</source>
- <translation>Skru på pN₂-graf</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="984"/>
+ <source>Toggle full screen</source>
+ <translation>Fullskjerm av/på</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="128"/>
- <source>Enable the pHe graph</source>
- <translation>Skru på pHe-graf</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+ <source>&amp;Check for updates</source>
+ <translation>Se etter oppdateringer</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="290"/>
- <source>Show/hide heart rate</source>
- <translation>Vis/skjul puls</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+ <source>&amp;Export</source>
+ <translation>&amp;Eksport</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="342"/>
- <source>Enable EAD, END, and EADD</source>
- <translation>Skru på EAD, END og EADD</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+ <source>Export Dive Logs</source>
+ <translation>Eksporter dykkelogg</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="238"/>
- <source>Show NDL / TTS</source>
- <translation>Vis NDL / TTS</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+ <source>Ctrl+E</source>
+ <translation>Ctrl+E</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.ui" line="394"/>
@@ -1585,96 +1610,61 @@ p, li { white-space: pre-wrap; }
<translation>Skaler dybdeakse på nytt</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="780"/>
+ <location filename="../qt-ui/mainwindow.ui" line="799"/>
<source>&amp;Print</source>
<translation>Skriv ut</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="791"/>
+ <location filename="../qt-ui/mainwindow.ui" line="810"/>
<source>Ctrl+,</source>
<translation>Ctrl+,</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="799"/>
+ <location filename="../qt-ui/mainwindow.ui" line="818"/>
<source>&amp;Quit</source>
<translation>Avslutt</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="810"/>
+ <location filename="../qt-ui/mainwindow.ui" line="829"/>
<source>Import from &amp;dive computer</source>
<translation>Importer fra &amp;dykkecomputer</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="818"/>
- <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="821"/>
+ <location filename="../qt-ui/mainwindow.ui" line="840"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="826"/>
- <source>&amp;Edit Device Names</source>
- <translation>Rediger &amp;enhetsnavn</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="834"/>
+ <location filename="../qt-ui/mainwindow.ui" line="853"/>
<source>Ctrl++</source>
<translation>Ctrl++</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="839"/>
+ <location filename="../qt-ui/mainwindow.ui" line="858"/>
<source>&amp;Renumber</source>
<translation>Nummere&amp;r på nytt</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="842"/>
+ <location filename="../qt-ui/mainwindow.ui" line="861"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="855"/>
- <source>&amp;Yearly Statistics</source>
- <translation>Årlig statistikk</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="858"/>
+ <location filename="../qt-ui/mainwindow.ui" line="877"/>
<source>Ctrl+Y</source>
<translation>Ctrl+Y</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="929"/>
- <source>User &amp;Manual</source>
- <translation>Bruker&amp;manual</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="945"/>
- <source>P&amp;lan Dive</source>
- <translation>P&amp;lanlegg dykk</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="948"/>
+ <location filename="../qt-ui/mainwindow.ui" line="957"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="1003"/>
- <source>&amp;Check for Updates</source>
- <translation>Sjekk for oppdateringer</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="783"/>
+ <location filename="../qt-ui/mainwindow.ui" line="802"/>
<source>Ctrl+P</source>
<translation>Ctrl+P</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="446"/>
- <source>Enable the pO2 Graph</source>
- <translation>Skru på pO₂-graf</translation>
- </message>
- <message>
<location filename="../qt-ui/mainwindow.ui" line="131"/>
<location filename="../qt-ui/mainwindow.ui" line="157"/>
<location filename="../qt-ui/mainwindow.ui" line="186"/>
@@ -1688,205 +1678,206 @@ p, li { white-space: pre-wrap; }
<location filename="../qt-ui/mainwindow.ui" line="397"/>
<location filename="../qt-ui/mainwindow.ui" line="423"/>
<location filename="../qt-ui/mainwindow.ui" line="449"/>
- <location filename="../qt-ui/mainwindow.ui" line="475"/>
+ <location filename="../qt-ui/mainwindow.ui" line="478"/>
+ <location filename="../qt-ui/mainwindow.ui" line="504"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="316"/>
- <source>Enable MOD</source>
- <translation>Skru på MOD</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="446"/>
+ <source>Toggle pO₂ Graph</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="183"/>
- <source>Show the DC Reported Ceiling</source>
- <translation>Vis tak fra computer</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="475"/>
+ <source>Toggle pN₂ Graph</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="212"/>
- <source>Show the Calculated Ceiling</source>
- <translation>Vis kalkulert tak</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="821"/>
+ <source>Ctrl+Q</source>
+ <translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="264"/>
- <source>Show Calculated Ceiling with 3m Increments</source>
- <translation>Vis kalkulert tak med tremetersintervaller</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="832"/>
+ <source>Ctrl+D</source>
+ <translation>Ctrl+D</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="154"/>
- <source>Calculate All Tissues</source>
- <translation>Regn ut alle vev</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="845"/>
+ <source>&amp;Edit device names</source>
+ <translation>Rediger &amp;enhetsnavn</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="368"/>
- <source>Show SAC Rate</source>
- <translation>Vis SAC-rate</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="850"/>
+ <source>&amp;Add dive</source>
+ <translation>Legg til dykk</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="420"/>
- <source>Enable / Disable the Ruler</source>
- <translation>Skru på/av linjalen</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="869"/>
+ <source>Auto &amp;group</source>
+ <translation>Auto&amp;grupper</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="802"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="874"/>
+ <source>&amp;Yearly statistics</source>
+ <translation>Årsstatistik</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="813"/>
- <source>Ctrl+D</source>
- <translation>Ctrl+D</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="882"/>
+ <source>&amp;Dive list</source>
+ <translation>&amp;Dykkeliste</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="866"/>
+ <location filename="../qt-ui/mainwindow.ui" line="885"/>
<source>Ctrl+2</source>
<translation>Ctrl+2</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="874"/>
+ <location filename="../qt-ui/mainwindow.ui" line="893"/>
<source>Ctrl+3</source>
<translation>Ctrl+3</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="882"/>
+ <location filename="../qt-ui/mainwindow.ui" line="901"/>
<source>Ctrl+4</source>
<translation>Ctrl+4</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="890"/>
+ <location filename="../qt-ui/mainwindow.ui" line="909"/>
<source>Ctrl+1</source>
<translation>Ctrl+1</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="898"/>
+ <location filename="../qt-ui/mainwindow.ui" line="914"/>
+ <source>P&amp;revious DC</source>
+ <translation>Fo&amp;rrige computer</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.ui" line="917"/>
<source>Left</source>
<translation>Venstre</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="906"/>
+ <location filename="../qt-ui/mainwindow.ui" line="925"/>
<source>Right</source>
<translation>Høyre</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="916"/>
- <source>Input Plan</source>
- <translation>Legg inn plan</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="938"/>
+ <source>User &amp;manual</source>
+ <translation>Bruker&amp;manual</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="932"/>
+ <location filename="../qt-ui/mainwindow.ui" line="941"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="940"/>
+ <location filename="../qt-ui/mainwindow.ui" line="949"/>
<source>Ctrl+5</source>
<translation>Ctrl+5</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="956"/>
- <source>Import divelog files from other applications</source>
- <translation>Importer dykkelogg fra andre programmer</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.ui" line="964"/>
- <source>Import &amp;from Divelogs.de</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/mainwindow.ui" line="954"/>
+ <source>P&amp;lan dive</source>
+ <translation>P&amp;lanlegg dykk</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="972"/>
- <source>&amp;Full Screen</source>
- <translation>&amp;Fullskjerm</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="962"/>
+ <source>&amp;Import log files</source>
+ <translation>&amp;Importer loggfiler</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="975"/>
- <source>Toggle Full Screen</source>
- <translation>Fullskjerm av/på</translation>
+ <location filename="../qt-ui/mainwindow.ui" line="965"/>
+ <source>Import divelog files from other applications</source>
+ <translation>Importer dykkelogg fra andre programmer</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.ui" line="978"/>
+ <location filename="../qt-ui/mainwindow.ui" line="987"/>
<source>F11</source>
<translation>F11</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.cpp" line="191"/>
- <source>Open File</source>
+ <source>Open file</source>
<translation>Åpne fil</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="281"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="283"/>
<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="388"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="390"/>
<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="419"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="421"/>
<source>Print runtime table</source>
- <translation type="unfinished"/>
+ <translation>Skriv ut løpetidstabel</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="710"/>
- <source>Do you want to save the changes you made in the file %1?</source>
- <translation>Vil du lagre endringene i %1?</translation>
+ <location filename="../qt-ui/mainwindow.cpp" line="516"/>
+ <source>Yearly statistics</source>
+ <translation>Årsstatistikk</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="712"/>
- <source>Do you want to save the changes you made in the datafile?</source>
- <translation>Vil du lagre endringene?</translation>
+ <location filename="../qt-ui/mainwindow.cpp" line="701"/>
+ <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="717"/>
- <source>Save Changes?</source>
+ <location filename="../qt-ui/mainwindow.cpp" line="703"/>
+ <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="708"/>
+ <source>Save changes?</source>
<translation>Lagre endringer?</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="718"/>
- <source>Changes will be lost if you don&apos;t save them.</source>
- <translation>Endringer vil gå tapt hvis du ikke lagrer.</translation>
+ <location filename="../qt-ui/mainwindow.cpp" line="1066"/>
+ <source>Save file as</source>
+ <translation>Lagre fil som</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="1075"/>
- <source>Save File as</source>
- <translation>Lagre som</translation>
+ <location filename="../qt-ui/mainwindow.cpp" line="1190"/>
+ <source>Open dive log file</source>
+ <translation>Åpne dykkelogg</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.cpp" line="1191"/>
+ <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>Loggfiler (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML-filer (*.xml);;UDDF/UDCF-filer (*.uddf *.udcf);;JDiveLog-filer (*.jlb);;Suunto-filer (*.sde *.db);;CSV-filer (*.csv);;All Files(*)</translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="249"/>
- <location filename="../qt-ui/mainwindow.cpp" line="388"/>
- <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="709"/>
+ <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="251"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="390"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="1216"/>
<source>Warning</source>
<translation>Advarsel</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.cpp" line="188"/>
- <location filename="../qt-ui/mainwindow.cpp" line="1059"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="1050"/>
<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="514"/>
- <source>Yearly Statistics</source>
- <translation>Årsstatistikk</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.cpp" line="1076"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="1067"/>
<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="1199"/>
- <source>Open Dive Log File</source>
- <translation>Åpne dykkelogg</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.cpp" line="1200"/>
- <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>Dykkeloggfiler (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML-filer (*.xml);;UDDF/UDCF-filer (*.uddf *.udcf);;JDiveLog-filer (*.jlb);;Suunto-filer (*.sde *.db);;CSV-filer (*.csv);;Alle filer (*)</translation>
- </message>
- <message>
- <location filename="../qt-ui/mainwindow.cpp" line="1225"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="1216"/>
<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>
@@ -1894,14 +1885,14 @@ p, li { white-space: pre-wrap; }
<context>
<name>PlannerSettingsWidget</name>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="444"/>
<source>Last stop at 20ft</source>
- <translation type="unfinished"/>
+ <translation>Siste stopp ved 20ft</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="416"/>
+ <location filename="../qt-ui/diveplanner.cpp" line="451"/>
<source>Last stop at 6m</source>
- <translation type="unfinished"/>
+ <translation>Siste stopp ved 6m</translation>
</message>
</context>
<context>
@@ -1929,12 +1920,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/preferences.ui" line="125"/>
<source>Network</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="151"/>
- <source>Lists and Tables</source>
- <translation>Lister og tabeller</translation>
+ <translation>Nettverk</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="157"/>
@@ -1952,31 +1938,11 @@ p, li { white-space: pre-wrap; }
<translation>Dykk</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="186"/>
- <source>Default Dive file</source>
- <translation>Standard dykkelogg</translation>
- </message>
- <message>
<location filename="../qt-ui/preferences.ui" line="198"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="207"/>
- <source>Display Invalid</source>
- <translation>Vis skjulte</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="224"/>
- <source>Default Cylinder</source>
- <translation>Standardflaske</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="230"/>
- <source>Use Default Cylinder</source>
- <translation>Bruk standardflaske</translation>
- </message>
- <message>
<location filename="../qt-ui/preferences.ui" line="247"/>
<source>Animations</source>
<translation>Animasjoner</translation>
@@ -1987,29 +1953,14 @@ p, li { white-space: pre-wrap; }
<translation>Hastighet</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="280"/>
- <source>Subsurface Webservice</source>
- <translation>Subsurface webservice</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="286"/>
- <source>Default User ID</source>
- <translation>Bruker-ID</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="296"/>
- <source>Save User ID locally?</source>
- <translation>Lagre bruker-ID lokalt?</translation>
- </message>
- <message>
<location filename="../qt-ui/preferences.ui" line="306"/>
<source>Clear all settings</source>
- <translation type="unfinished"/>
+ <translation>Slett alle valg</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="312"/>
<source>Reset all settings to their default value</source>
- <translation type="unfinished"/>
+ <translation>Tilbakestill valg til standardverdier</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="341"/>
@@ -2082,49 +2033,39 @@ p, li { white-space: pre-wrap; }
<translation>kg</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="598"/>
- <source>threshold when showing pO₂</source>
- <translation>terskel for visning av pO₂</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="619"/>
- <source>threshold when showing pN₂</source>
- <translation>terskel for visning av pN₂</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="640"/>
- <source>threshold when showing pHe</source>
- <translation>terskel for visning av pHe</translation>
+ <location filename="../qt-ui/preferences.ui" line="772"/>
+ <source>System default</source>
+ <translation>Systemstandard</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="811"/>
<source>Proxy</source>
- <translation type="unfinished"/>
+ <translation>Proxy</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="817"/>
<source>Proxy type</source>
- <translation type="unfinished"/>
+ <translation>Proxytype</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="830"/>
<source>Host</source>
- <translation type="unfinished"/>
+ <translation>Tjener</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="856"/>
<source>Port</source>
- <translation type="unfinished"/>
+ <translation>Port</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="882"/>
<source>Requires authentication</source>
- <translation type="unfinished"/>
+ <translation>Krever autentisering</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="902"/>
<source>Username</source>
- <translation type="unfinished"/>
+ <translation>Brukernavn</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="925"/>
@@ -2132,16 +2073,6 @@ p, li { white-space: pre-wrap; }
<translation>Passord</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="682"/>
- <source>draw dive computer reported ceiling red</source>
- <translation>vis tak fra dykkecomputer i rødt</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="772"/>
- <source>System Default</source>
- <translation>Standard for system</translation>
- </message>
- <message>
<location filename="../qt-ui/preferences.ui" line="792"/>
<source>Filter</source>
<translation>Filter</translation>
@@ -2152,6 +2083,46 @@ p, li { white-space: pre-wrap; }
<translation>Trykk</translation>
</message>
<message>
+ <location filename="../qt-ui/preferences.ui" line="151"/>
+ <source>Lists and tables</source>
+ <translation>Lister og tabeller</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="186"/>
+ <source>Default dive log file</source>
+ <translation>Standard loggfil</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="207"/>
+ <source>Display invalid</source>
+ <translation>Vis ugyldige</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="224"/>
+ <source>Default cylinder</source>
+ <translation>Standardflaske</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="230"/>
+ <source>Use default cylinder</source>
+ <translation>Bruk standardflaske</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="280"/>
+ <source>Subsurface web service</source>
+ <translation>Subsurface webtjeneste</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="286"/>
+ <source>Default user ID</source>
+ <translation>Standard bruker-ID</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="296"/>
+ <source>Save user ID locally?</source>
+ <translation>Lagre bruker-ID lokalt?</translation>
+ </message>
+ <message>
<location filename="../qt-ui/preferences.ui" line="446"/>
<source>Volume</source>
<translation>Volum</translation>
@@ -2177,11 +2148,6 @@ p, li { white-space: pre-wrap; }
<translation>Tidsenheter</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="538"/>
- <source>Ascent/Descent speed denominator</source>
- <translation>Enhet for opp-/nedstigningshastighet</translation>
- </message>
- <message>
<location filename="../qt-ui/preferences.ui" line="545"/>
<source>Minutes</source>
<translation>Minutter</translation>
@@ -2197,21 +2163,6 @@ p, li { white-space: pre-wrap; }
<translation>Vis</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="661"/>
- <source>max pO₂ when showing MOD</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="693"/>
- <source>Show non-used cylinders in Equipment Tab</source>
- <translation>Vis ubrukte flasker i utstyrsfanen</translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="704"/>
- <source>show average depth</source>
- <translation>vis snittdybde</translation>
- </message>
- <message>
<location filename="../qt-ui/preferences.ui" line="756"/>
<source>GFLow at max depth</source>
<translation>GF lav ved maksdybde</translation>
@@ -2227,6 +2178,46 @@ p, li { white-space: pre-wrap; }
<translation>Valg</translation>
</message>
<message>
+ <location filename="../qt-ui/preferences.ui" line="538"/>
+ <source>Ascent/descent speed denominator</source>
+ <translation>Tidsenhet for opp- og nedstigning</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="598"/>
+ <source>Threshold when showing pO₂</source>
+ <translation>Grense når pO₂ vises</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="619"/>
+ <source>Threshold when showing pN₂</source>
+ <translation>Grense når pN₂ vises</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="640"/>
+ <source>Threshold when showing pHe</source>
+ <translation>Grense når pHe vises</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="661"/>
+ <source>Max pO₂ when showing MOD</source>
+ <translation>Maks pO₂ når MOD vises</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="682"/>
+ <source>Draw dive computer reported ceiling red</source>
+ <translation>Farg dekograf fra dykkecomputer i rødt</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="693"/>
+ <source>Show unused cylinders in Equipment tab</source>
+ <translation>Vis ubrukte flasker i utstyrsfanen</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="704"/>
+ <source>Show average depth</source>
+ <translation>Vis snittdybde</translation>
+ </message>
+ <message>
<location filename="../qt-ui/preferences.ui" line="722"/>
<source>GFLow</source>
<translation>GF lav</translation>
@@ -2239,22 +2230,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/preferences.cpp" line="23"/>
<source>No proxy</source>
- <translation type="unfinished"/>
+ <translation>Ingen proxy</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="24"/>
<source>System proxy</source>
- <translation type="unfinished"/>
+ <translation>System-proxy</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="25"/>
<source>HTTP proxy</source>
- <translation type="unfinished"/>
+ <translation>HTTP-proxy</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="26"/>
<source>SOCKS proxy</source>
- <translation type="unfinished"/>
+ <translation>SOCKS-proxy</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="245"/>
@@ -2267,9 +2258,9 @@ p, li { white-space: pre-wrap; }
<translation>For å bytte språk må du starte Subsurface på nytt.</translation>
</message>
<message>
- <location filename="../qt-ui/preferences.cpp" line="381"/>
- <source>Open Default Log File</source>
- <translation>Åpne standardlogg</translation>
+ <location filename="../qt-ui/preferences.cpp" line="395"/>
+ <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
+ <translation>Hvis du velger OK vil alle innstillinger bli satt til standardverdier. Dette skjer umiddelbart.</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="381"/>
@@ -2277,15 +2268,15 @@ p, li { white-space: pre-wrap; }
<translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
</message>
<message>
+ <location filename="../qt-ui/preferences.cpp" line="381"/>
+ <source>Open default log file</source>
+ <translation>Åpne standardloggfil</translation>
+ </message>
+ <message>
<location filename="../qt-ui/preferences.cpp" line="394"/>
<source>Warning</source>
<translation>Advarsel</translation>
</message>
- <message>
- <location filename="../qt-ui/preferences.cpp" line="395"/>
- <source>If you click OK, all settings of Subsurface are reset to their default values. This will be applied immediately.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>PrintDialog</name>
@@ -2308,37 +2299,37 @@ p, li { white-space: pre-wrap; }
<context>
<name>PrintLayout</name>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="25"/>
+ <location filename="../qt-ui/printlayout.cpp" line="27"/>
<source>Dive#</source>
<translation>Dykk nr.</translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="26"/>
+ <location filename="../qt-ui/printlayout.cpp" line="28"/>
<source>Date</source>
<translation>Dato</translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="27"/>
+ <location filename="../qt-ui/printlayout.cpp" line="29"/>
<source>Depth</source>
<translation>Dybde</translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="28"/>
+ <location filename="../qt-ui/printlayout.cpp" line="30"/>
<source>Duration</source>
<translation>Varighet</translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="29"/>
+ <location filename="../qt-ui/printlayout.cpp" line="31"/>
<source>Master</source>
<translation>Master</translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="30"/>
+ <location filename="../qt-ui/printlayout.cpp" line="32"/>
<source>Buddy</source>
<translation>Buddy</translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="31"/>
+ <location filename="../qt-ui/printlayout.cpp" line="33"/>
<source>Location</source>
<translation>Sted</translation>
</message>
@@ -2426,72 +2417,72 @@ p, li { white-space: pre-wrap; }
<context>
<name>ProfilePrintModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1878"/>
+ <location filename="../qt-ui/models.cpp" line="1901"/>
<source>unknown</source>
<translation>ukjent</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1883"/>
+ <location filename="../qt-ui/models.cpp" line="1906"/>
<source>Dive #%1 - %2</source>
<translation>Dykk nr. %1- %2</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1886"/>
+ <location filename="../qt-ui/models.cpp" line="1909"/>
<source>Max depth: %1 %2</source>
<translation>Max dybde: %1 %2</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1893"/>
+ <location filename="../qt-ui/models.cpp" line="1916"/>
<source>Duration: %1 min</source>
<translation>Varighet: %1 min</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1898"/>
- <source>Gas Used:</source>
- <translation>Gass brukt:</translation>
+ <location filename="../qt-ui/models.cpp" line="1921"/>
+ <source>Gas used:</source>
+ <translation>Gassforbruk:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1900"/>
- <source>SAC:</source>
- <translation>SAC:</translation>
+ <location filename="../qt-ui/models.cpp" line="1923"/>
+ <source>Tags:</source>
+ <translation>Emneord:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1902"/>
- <source>Max. CNS:</source>
- <translation>Mac. CNS:</translation>
+ <location filename="../qt-ui/models.cpp" line="1925"/>
+ <source>SAC:</source>
+ <translation>SAC:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1904"/>
+ <location filename="../qt-ui/models.cpp" line="1927"/>
<source>Weights:</source>
<translation>Vekter:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1909"/>
+ <location filename="../qt-ui/models.cpp" line="1932"/>
<source>Notes:</source>
<translation>Notater:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1916"/>
+ <location filename="../qt-ui/models.cpp" line="1939"/>
<source>Divemaster:</source>
<translation>Dykkeleder:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1918"/>
+ <location filename="../qt-ui/models.cpp" line="1941"/>
<source>Buddy:</source>
<translation>Buddy:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1920"/>
+ <location filename="../qt-ui/models.cpp" line="1943"/>
<source>Suit:</source>
<translation>Drakt:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1922"/>
+ <location filename="../qt-ui/models.cpp" line="1945"/>
<source>Viz:</source>
<translation>Sikt:</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1924"/>
+ <location filename="../qt-ui/models.cpp" line="1947"/>
<source>Rating:</source>
<translation>Vurdering:</translation>
</message>
@@ -2499,77 +2490,77 @@ p, li { white-space: pre-wrap; }
<context>
<name>ProfileWidget2</name>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="525"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="520"/>
<source> (#%1 of %2)</source>
- <translation type="unfinished"/>
+ <translation> (#%1 av %2)</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="898"/>
<source>Make first divecomputer</source>
- <translation type="unfinished"/>
+ <translation>Gjør til første dykkecomputer</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="906"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="900"/>
<source>Delete this divecomputer</source>
- <translation type="unfinished"/>
+ <translation>Slett denne dykkecomputeren</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="913"/>
- <source>Add Gas Change</source>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="907"/>
+ <source>Add gas change</source>
<translation>Legg til gassbytte</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/>
- <source>Add Bookmark</source>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="918"/>
+ <source>Add bookmark</source>
<translation>Legg til bokmerke</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="928"/>
- <source>Remove Event</source>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="922"/>
+ <source>Remove event</source>
<translation>Fjern hendelse</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
<source>Hide similar events</source>
<translation>Skjul lignende hendelser</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="939"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/>
<source>Edit name</source>
<translation>Rediger navn</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="953"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="947"/>
<source>Unhide all events</source>
<translation>Vis alle hendelser</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="987"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/>
<source>Hide events</source>
<translation>Skjul hendelser</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="987"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/>
<source>Hide all %1 events?</source>
<translation>Skjul alle %1 hendelser?</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="1022"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="1016"/>
<source>Remove the selected event?</source>
<translation>Fjern den valgte hendelsen?</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="1023"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="1017"/>
<source>%1 @ %2:%3</source>
<translation>%1 @ %2:%3</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="1073"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
<source>Edit name of bookmark</source>
<translation>Rediger navn på bokmerke</translation>
</message>
<message>
- <location filename="../qt-ui/profile/profilewidget2.cpp" line="1074"/>
+ <location filename="../qt-ui/profile/profilewidget2.cpp" line="1086"/>
<source>Custom name:</source>
<translation>Tilpasset navn:</translation>
</message>
@@ -2582,8 +2573,8 @@ p, li { white-space: pre-wrap; }
<translation>Luft</translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.cpp" line="210"/>
- <source>Remove this Point</source>
+ <location filename="../qt-ui/diveplanner.cpp" line="212"/>
+ <source>Remove this point</source>
<translation>Fjern dette punktet</translation>
</message>
<message>
@@ -2611,6 +2602,66 @@ p, li { white-space: pre-wrap; }
<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>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="472"/>
+ <source>kg</source>
+ <translation>kg</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="473"/>
+ <source>lbs</source>
+ <translation>pund</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="497"/>
+ <source>ft</source>
+ <translation>ft</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="498"/>
+ <source>m</source>
+ <translation>m</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="521"/>
+ <source>psi</source>
+ <translation>psi</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="522"/>
+ <source>bar</source>
+ <translation>bar</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="546"/>
+ <source>l</source>
+ <translation>l</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/models.cpp" line="547"/>
+ <source>cuft</source>
+ <translation>ft³</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/>
+ <source>Invalid response from server</source>
+ <translation>Ugyldig svar fra tjener</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/>
+ <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="574"/>
+ <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="581"/>
+ <source>Malformed XML response. Line %1: %2</source>
+ <translation>Feil formattert XML-svar. Linje %1: %2</translation>
+ </message>
</context>
<context>
<name>RenumberDialog</name>
@@ -2628,7 +2679,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/simplewidgets.cpp" line="126"/>
<source>New number</source>
- <translation type="unfinished"/>
+ <translation>Nytt tall</translation>
</message>
</context>
<context>
@@ -2642,11 +2693,6 @@ p, li { white-space: pre-wrap; }
<context>
<name>ShiftImageTimesDialog</name>
<message>
- <location filename="../qt-ui/shiftimagetimes.ui" line="23"/>
- <source>Shift selected times</source>
- <translation>Flytt valgte tidspunkter</translation>
- </message>
- <message>
<location filename="../qt-ui/shiftimagetimes.ui" line="34"/>
<source>Shift times of image(s) by</source>
<translation>Flytt tidspunkter fra bilder med</translation>
@@ -2657,14 +2703,19 @@ p, li { white-space: pre-wrap; }
<translation>h:mm</translation>
</message>
<message>
+ <location filename="../qt-ui/shiftimagetimes.ui" line="23"/>
+ <source>Shift selected image times</source>
+ <translation>Flytt tid for valgte bilder</translation>
+ </message>
+ <message>
<location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
- <source>earlier</source>
- <translation>tidligere</translation>
+ <source>Earlier</source>
+ <translation>Tidligere</translation>
</message>
<message>
<location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
- <source>later</source>
- <translation>senere</translation>
+ <source>Later</source>
+ <translation>Senere</translation>
</message>
<message>
<location filename="../qt-ui/shiftimagetimes.ui" line="148"/>
@@ -2688,21 +2739,21 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../qt-ui/simplewidgets.cpp" line="224"/>
- <source>Open Image File</source>
- <translation>Åpne bildefil</translation>
+ <source>Open image file</source>
+ <translation>Åpne bilder</translation>
</message>
<message>
<location filename="../qt-ui/simplewidgets.cpp" line="226"/>
- <source>Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
- <translation>Bildefiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
+ <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
+ <translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
</message>
</context>
<context>
<name>ShiftTimesDialog</name>
<message>
<location filename="../qt-ui/shifttimes.ui" line="23"/>
- <source>Shift selected times</source>
- <translation>Flytt valgte tidspunkter</translation>
+ <source>Shift selected dive times</source>
+ <translation>Flytt tid for valgte dykk</translation>
</message>
<message>
<location filename="../qt-ui/shifttimes.ui" line="49"/>
@@ -2732,13 +2783,13 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../qt-ui/shifttimes.ui" line="136"/>
- <source>earlier</source>
- <translation>tidligere</translation>
+ <source>Earlier</source>
+ <translation>Tidligere</translation>
</message>
<message>
<location filename="../qt-ui/shifttimes.ui" line="143"/>
- <source>later</source>
- <translation>senere</translation>
+ <source>Later</source>
+ <translation>Senere</translation>
</message>
</context>
<context>
@@ -2793,8 +2844,13 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/>
- <source>Connection Error: </source>
- <translation>Feil med forbindelse</translation>
+ <source>Connection error: </source>
+ <translation>Forbindelsesfeil:</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
+ <source>Download successful</source>
+ <translation>Nedlasting ferdig</translation>
</message>
<message>
<location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/>
@@ -2806,34 +2862,29 @@ p, li { white-space: pre-wrap; }
<source>Cannot parse response!</source>
<translation>Kan ikke lese svar!</translation>
</message>
- <message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/>
- <source>Download Success!</source>
- <translation>Ferdig å laste ned</translation>
- </message>
</context>
<context>
<name>TableView</name>
<message>
<location filename="../qt-ui/tableview.cpp" line="23"/>
- <source>Add Cylinder</source>
+ <source>Add cylinder</source>
<translation>Legg til flaske</translation>
</message>
</context>
<context>
<name>TankInfoModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="850"/>
+ <location filename="../qt-ui/models.cpp" line="863"/>
<source>Description</source>
<translation>Beskrivelse</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="850"/>
+ <location filename="../qt-ui/models.cpp" line="863"/>
<source>ml</source>
<translation>ml</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="850"/>
+ <location filename="../qt-ui/models.cpp" line="863"/>
<source>bar</source>
<translation>bar</translation>
</message>
@@ -2856,17 +2907,17 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/updatemanager.cpp" line="36"/>
<source>Subsurface was unable to check for updates.</source>
- <translation type="unfinished"/>
+ <translation>Subsurface klarte ikke å se etter oppdateringer.</translation>
</message>
<message>
<location filename="../qt-ui/updatemanager.cpp" line="41"/>
<source>The following error occurred:</source>
- <translation type="unfinished"/>
+ <translation>Den følgende feilen inntraff:</translation>
</message>
<message>
<location filename="../qt-ui/updatemanager.cpp" line="42"/>
<source>Please check your internet connection.</source>
- <translation type="unfinished"/>
+ <translation>Sjekk internettforbindelsen din.</translation>
</message>
<message>
<location filename="../qt-ui/updatemanager.cpp" line="51"/>
@@ -2897,8 +2948,8 @@ p, li { white-space: pre-wrap; }
<translation>Brukermanual</translation>
</message>
<message>
- <location filename="../qt-ui/usermanual.cpp" line="69"/>
- <location filename="../qt-ui/usermanual.cpp" line="75"/>
+ <location filename="../qt-ui/usermanual.cpp" line="70"/>
+ <location filename="../qt-ui/usermanual.cpp" line="76"/>
<source>Cannot find the Subsurface manual</source>
<translation>Finner ikke manualen</translation>
</message>
@@ -2906,136 +2957,137 @@ p, li { white-space: pre-wrap; }
<context>
<name>UserSurvey</name>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="14"/>
- <source>Dialog</source>
- <translation>Dialogboks</translation>
+ <location filename="../qt-ui/usersurvey.ui" line="32"/>
+ <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source>
+ <translation>Vi ønsker å lære mer om brukerne våre, deres valg og bruksmønster. Fyll gjerne ut dette skjemaet og send til Subsurface-teamet. Kryss av alle valg som gjelder deg.</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="47"/>
- <source>Subsurface User Survey</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/usersurvey.ui" line="14"/>
+ <source>User Survey</source>
+ <translation>Brukerundersøkelse</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="60"/>
- <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/usersurvey.ui" line="25"/>
+ <source>Subsurface user survey</source>
+ <translation>Brukerundersøkelse for Subsurface</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="79"/>
- <source>Recreational DIver</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/usersurvey.ui" line="52"/>
+ <source>Recreational diver</source>
+ <translation>Sportsdykker</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="92"/>
- <source>Tech Diver</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/usersurvey.ui" line="45"/>
+ <source>Technical diver</source>
+ <translation>Teknisk dykker</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="105"/>
+ <location filename="../qt-ui/usersurvey.ui" line="59"/>
<source>Interested in dive planning</source>
- <translation type="unfinished"/>
+ <translation>Interessert i dykkeplanlegging</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="118"/>
+ <location filename="../qt-ui/usersurvey.ui" line="66"/>
<source>I am downloading dives from supported dive computer</source>
- <translation type="unfinished"/>
+ <translation>Jeg laster ned dykk fra en støtta dykkecomputer</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="131"/>
+ <location filename="../qt-ui/usersurvey.ui" line="73"/>
<source>I am importing dives from other software / sources</source>
- <translation type="unfinished"/>
+ <translation>Jeg importerer dykk fra annen programvare / andre kilder</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="144"/>
+ <location filename="../qt-ui/usersurvey.ui" line="80"/>
<source>I am manually entering dives</source>
- <translation type="unfinished"/>
+ <translation>Jeg legger inn dykk manuelt</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="167"/>
+ <location filename="../qt-ui/usersurvey.ui" line="87"/>
<source>I use the Android companion app to track dive locations</source>
- <translation type="unfinished"/>
+ <translation>Jeg bruker tilleggsappen for Android for å legge inn dykkelokasjoner</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="190"/>
+ <location filename="../qt-ui/usersurvey.ui" line="94"/>
<source>Please type suggestions (in English) in the following box</source>
- <translation type="unfinished"/>
+ <translation>Skriv forslag (på engelsk) i den følgende boksen</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.ui" line="203"/>
+ <location filename="../qt-ui/usersurvey.ui" line="104"/>
<source>The following information about your system will also be submitted</source>
- <translation type="unfinished"/>
+ <translation>Den følgende informasjonen om systemet ditt blir også lagt ved</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="27"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="28"/>
<source>
Operating System: %1</source>
- <translation type="unfinished"/>
+ <translation>Operativsystem: %1</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="30"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="31"/>
<source>
CPU Architecture: %1</source>
- <translation type="unfinished"/>
+ <translation>Prosessorarktitektur: %1</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="35"/>
- <source>
-OS CPU Architecture %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/usersurvey.cpp" line="39"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="40"/>
<source>
Language: %1</source>
- <translation type="unfinished"/>
+ <translation>Språk: %1</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="73"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="74"/>
<source>Should we ask you later?</source>
- <translation type="unfinished"/>
+ <translation>Skal vi spørre deg igjen senere?</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="74"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="75"/>
<source>Don&apos;t ask me again</source>
- <translation type="unfinished"/>
+ <translation>Ikke spør meg igjen</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="75"/>
- <source>Ask Later</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+ <source>Ask later</source>
+ <translation>Spør senere</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="76"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+ <source>Submit user survey.</source>
+ <translation>Send inn brukerundersøkelse.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="77"/>
<source>Ask again?</source>
- <translation type="unfinished"/>
+ <translation>Spørre igjen?</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="95"/>
- <source>Submit User Survey.</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="36"/>
+ <source>
+OS CPU Architecture: %1</source>
+ <translation>
+OS CPU-arkitektur: %1</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="97"/>
<source>Subsurface was unable to submit the user survey.</source>
- <translation type="unfinished"/>
+ <translation>Subsurface klarte ikke å sende inn undersøkelsen.</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="102"/>
<source>The following error occurred:</source>
- <translation type="unfinished"/>
+ <translation>Den følgende feilen inntraff:</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="103"/>
<source>Please check your internet connection.</source>
- <translation type="unfinished"/>
+ <translation>Sjekk internettforbindelsen din.</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="111"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="112"/>
<source>Survey successfully submitted.</source>
- <translation type="unfinished"/>
+ <translation>Undersøkelsen er sendt.</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+ <location filename="../qt-ui/usersurvey.cpp" line="117"/>
<source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
<translation>Det oppstod en feil under leting etter oppdatering.&lt;br/&gt;&lt;br/&gt;%1</translation>
</message>
@@ -3043,12 +3095,12 @@ Language: %1</source>
<context>
<name>WSInfoModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="721"/>
+ <location filename="../qt-ui/models.cpp" line="734"/>
<source>Description</source>
<translation>Beskrivelse</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="721"/>
+ <location filename="../qt-ui/models.cpp" line="734"/>
<source>kg</source>
<translation>kg</translation>
</message>
@@ -3057,8 +3109,8 @@ Language: %1</source>
<name>WebServices</name>
<message>
<location filename="../qt-ui/webservices.ui" line="14"/>
- <source>Webservice Connection</source>
- <translation>Forbindelse til nettjeneste</translation>
+ <source>Web service connection</source>
+ <translation>Forbindelse til webtjeneste</translation>
</message>
<message>
<location filename="../qt-ui/webservices.ui" line="25"/>
@@ -3082,7 +3134,7 @@ Language: %1</source>
</message>
<message>
<location filename="../qt-ui/webservices.ui" line="85"/>
- <source>Save User ID locally?</source>
+ <source>Save user ID locally?</source>
<translation>Lagre bruker-ID lokalt?</translation>
</message>
<message>
@@ -3109,117 +3161,97 @@ Language: %1</source>
<context>
<name>WeightModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="373"/>
+ <location filename="../qt-ui/models.cpp" line="387"/>
<source>Type</source>
<translation>Type</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="373"/>
+ <location filename="../qt-ui/models.cpp" line="387"/>
<source>Weight</source>
<translation>Vekt</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="433"/>
- <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="458"/>
- <source>kg</source>
- <translation>kg</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="459"/>
- <source>lbs</source>
- <translation>pund</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="483"/>
- <source>ft</source>
- <translation>ft</translation>
- </message>
- <message>
- <location filename="../qt-ui/models.cpp" line="484"/>
- <source>m</source>
- <translation>m</translation>
+ <location filename="../qt-ui/models.cpp" line="447"/>
+ <source>Clicking here will remove this weight system.</source>
+ <translation>Klikk her for å fjerne dette vektsystemet.</translation>
</message>
</context>
<context>
<name>YearlyStatisticsModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1637"/>
+ <location filename="../qt-ui/models.cpp" line="1647"/>
<source>Year
&gt; Month / Trip</source>
<translation>År
&gt; Måned / Tur</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1640"/>
+ <location filename="../qt-ui/models.cpp" line="1650"/>
<source>#</source>
<translation>#</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1643"/>
+ <location filename="../qt-ui/models.cpp" line="1653"/>
<source>Duration
Total</source>
<translation>Varighet
Total</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1646"/>
+ <location filename="../qt-ui/models.cpp" line="1656"/>
<source>
Average</source>
<translation>
Snitt</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1649"/>
+ <location filename="../qt-ui/models.cpp" line="1659"/>
<source>
Shortest</source>
<translation>
Kortest</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1652"/>
+ <location filename="../qt-ui/models.cpp" line="1662"/>
<source>
Longest</source>
<translation>
Lengst</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1655"/>
+ <location filename="../qt-ui/models.cpp" line="1665"/>
<source>Depth (%1)
Average</source>
<translation>Dybde (%1)
Snitt</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1658"/>
- <location filename="../qt-ui/models.cpp" line="1667"/>
- <location filename="../qt-ui/models.cpp" line="1676"/>
+ <location filename="../qt-ui/models.cpp" line="1668"/>
+ <location filename="../qt-ui/models.cpp" line="1677"/>
+ <location filename="../qt-ui/models.cpp" line="1686"/>
<source>
Minimum</source>
<translation>
Minimum</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1661"/>
- <location filename="../qt-ui/models.cpp" line="1670"/>
- <location filename="../qt-ui/models.cpp" line="1679"/>
+ <location filename="../qt-ui/models.cpp" line="1671"/>
+ <location filename="../qt-ui/models.cpp" line="1680"/>
+ <location filename="../qt-ui/models.cpp" line="1689"/>
<source>
Maximum</source>
<translation>
Maksimum</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1664"/>
+ <location filename="../qt-ui/models.cpp" line="1674"/>
<source>SAC (%1)
Average</source>
<translation>SAC (%1)
Snitt</translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1673"/>
+ <location filename="../qt-ui/models.cpp" line="1683"/>
<source>Temp. (%1)
Average</source>
<translation>Temp. (%1)
@@ -3229,29 +3261,29 @@ Snitt</translation>
<context>
<name>gettextFromC</name>
<message>
- <location filename="../dive.c" line="87"/>
+ <location filename="../dive.c" line="123"/>
<source>pascal</source>
<translation>pascal</translation>
</message>
<message>
- <location filename="../dive.c" line="92"/>
+ <location filename="../dive.c" line="128"/>
<location filename="../qt-gui.cpp" line="323"/>
<source>bar</source>
<translation>bar</translation>
</message>
<message>
- <location filename="../dive.c" line="96"/>
+ <location filename="../dive.c" line="132"/>
<location filename="../qt-gui.cpp" line="326"/>
<source>psi</source>
<translation>psi</translation>
</message>
<message>
- <location filename="../dive.c" line="138"/>
+ <location filename="../dive.c" line="174"/>
<source>cuft</source>
<translation>ft³</translation>
</message>
<message>
- <location filename="../dive.c" line="167"/>
+ <location filename="../dive.c" line="203"/>
<location filename="../qt-gui.cpp" line="205"/>
<location filename="../qt-gui.cpp" line="220"/>
<location filename="../worldmap-save.c" line="44"/>
@@ -3259,36 +3291,56 @@ Snitt</translation>
<translation>m</translation>
</message>
<message>
- <location filename="../dive.c" line="172"/>
+ <location filename="../dive.c" line="208"/>
<location filename="../qt-gui.cpp" line="208"/>
<location filename="../qt-gui.cpp" line="222"/>
<source>ft</source>
<translation>ft</translation>
</message>
<message>
- <location filename="../dive.c" line="217"/>
+ <location filename="../dive.c" line="231"/>
+ <source>m/min</source>
+ <translation>m/min</translation>
+ </message>
+ <message>
+ <location filename="../dive.c" line="233"/>
+ <source>m/s</source>
+ <translation>m/s</translation>
+ </message>
+ <message>
+ <location filename="../dive.c" line="238"/>
+ <source>ft/min</source>
+ <translation>ft/min</translation>
+ </message>
+ <message>
+ <location filename="../dive.c" line="240"/>
+ <source>ft/s</source>
+ <translation>ft/s</translation>
+ </message>
+ <message>
+ <location filename="../dive.c" line="259"/>
<location filename="../qt-gui.cpp" line="231"/>
<location filename="../qt-gui.cpp" line="241"/>
<source>lbs</source>
<translation>pund</translation>
</message>
<message>
- <location filename="../dive.c" line="221"/>
+ <location filename="../dive.c" line="263"/>
<location filename="../qt-gui.cpp" line="229"/>
<location filename="../qt-gui.cpp" line="239"/>
<source>kg</source>
<translation>kg</translation>
</message>
<message>
- <location filename="../dive.c" line="1237"/>
+ <location filename="../dive.c" line="1279"/>
<source>(%s) or (%s)</source>
<translation>(%s) eller (%s)</translation>
</message>
<message>
<location filename="../divelist.c" line="467"/>
<location filename="../equipment.c" line="104"/>
- <location filename="../planner.c" line="976"/>
- <location filename="../planner.c" line="979"/>
+ <location filename="../planner.c" line="986"/>
+ <location filename="../planner.c" line="989"/>
<location filename="../statistics.c" line="355"/>
<source>air</source>
<translation>luft</translation>
@@ -3325,8 +3377,8 @@ Snitt</translation>
<translation>Kunne ikke åpne &apos;%s&apos;</translation>
</message>
<message>
- <location filename="../file.c" line="406"/>
- <location filename="../file.c" line="482"/>
+ <location filename="../file.c" line="409"/>
+ <location filename="../file.c" line="494"/>
<source>Maximum number of supported columns on CSV import is %d</source>
<translation>Maks antall kolonner i CSV-importen er %d</translation>
</message>
@@ -3558,26 +3610,26 @@ Snitt</translation>
<translation>Fikk ikke åpnet %s %s (%s)</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="466"/>
+ <location filename="../parse-xml.c" line="467"/>
<source>Strange percentage reading %s
</source>
<translation>Rar lesing av prosent %s
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1683"/>
+ <location filename="../parse-xml.c" line="1692"/>
<source>Failed to parse &apos;%s&apos;</source>
<translation>Kunne ikke lese &apos;%s&apos;</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1904"/>
+ <location filename="../parse-xml.c" line="1913"/>
<source>Database query get_events failed.
</source>
<translation>Databasespørring get_events feilet.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1911"/>
+ <location filename="../parse-xml.c" line="1920"/>
<source>Database query get_tags failed.
</source>
<translation>Databasespørring get_tags feilet.
@@ -3591,36 +3643,36 @@ Snitt</translation>
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="1945"/>
- <location filename="../parse-xml.c" line="2092"/>
+ <location filename="../parse-xml.c" line="1954"/>
+ <location filename="../parse-xml.c" line="2101"/>
<source>Database query failed '%s'.
</source>
<translation>Databasespørring feilet &apos;%s&apos;.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="2056"/>
+ <location filename="../parse-xml.c" line="2065"/>
<source>Database query get_cylinders failed.
</source>
<translation>Databasespørring get_cylinders feilet.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="2063"/>
+ <location filename="../parse-xml.c" line="2072"/>
<source>Database query get_changes failed.
</source>
<translation>Databasespørring get_changes feilet.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="2070"/>
+ <location filename="../parse-xml.c" line="2079"/>
<source>Database query get_profile_sample failed.
</source>
<translation>Databasespørring get_profile_sample feilet.
</translation>
</message>
<message>
- <location filename="../parse-xml.c" line="2161"/>
+ <location filename="../parse-xml.c" line="2170"/>
<source>Can&apos;t open stylesheet %s</source>
<translation>Kan ikke åpne stilark %s</translation>
</message>
@@ -3631,9 +3683,9 @@ Snitt</translation>
</message>
<message>
<location filename="../planner.c" line="159"/>
- <location filename="../planner.c" line="752"/>
+ <location filename="../planner.c" line="761"/>
<source>Can&apos;t find gas %s</source>
- <translation type="unfinished"/>
+ <translation>Finner ikke gassen %s</translation>
</message>
<message>
<location filename="../planner.c" line="345"/>
@@ -3648,98 +3700,108 @@ Snitt</translation>
<message>
<location filename="../planner.c" line="535"/>
<source>based on GFlow = %d and GFhigh = %d</source>
- <translation type="unfinished"/>
+ <translation>basert på GFlow = %d og GFhigh = %d</translation>
</message>
<message>
<location filename="../planner.c" line="538"/>
<source>Subsurface dive plan</source>
- <translation type="unfinished"/>
+ <translation>Subsurface dykkeplan</translation>
</message>
<message>
<location filename="../planner.c" line="542"/>
<source>depth</source>
- <translation type="unfinished"/>
+ <translation>dybde</translation>
</message>
<message>
<location filename="../planner.c" line="545"/>
<source>runtime</source>
- <translation type="unfinished"/>
+ <translation>løpetid</translation>
</message>
<message>
<location filename="../planner.c" line="548"/>
<source>duration</source>
- <translation type="unfinished"/>
+ <translation>lengde</translation>
</message>
<message>
<location filename="../planner.c" line="551"/>
<source>gas</source>
- <translation type="unfinished"/>
+ <translation>gass</translation>
</message>
<message>
<location filename="../planner.c" line="585"/>
<source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
- <translation type="unfinished"/>
+ <translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u på %s</translation>
</message>
<message>
<location filename="../planner.c" line="595"/>
<source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
- <translation type="unfinished"/>
+ <translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s</translation>
</message>
<message>
<location filename="../planner.c" line="606"/>
<source>%3.0f%s</source>
- <translation type="unfinished"/>
+ <translation>%3.0f%s</translation>
</message>
<message>
<location filename="../planner.c" line="609"/>
<location filename="../planner.c" line="613"/>
<source>%3dmin</source>
- <translation type="unfinished"/>
+ <translation>%3dmin</translation>
</message>
<message>
<location filename="../planner.c" line="629"/>
<source>Switch gas to %s</source>
- <translation type="unfinished"/>
+ <translation>Bytt til gass %s</translation>
+ </message>
+ <message>
+ <location filename="../planner.c" line="642"/>
+ <source>CNS</source>
+ <translation>CNS</translation>
+ </message>
+ <message>
+ <location filename="../planner.c" line="644"/>
+ <source>OTU</source>
+ <translation>OTU</translation>
</message>
<message>
- <location filename="../planner.c" line="638"/>
+ <location filename="../planner.c" line="647"/>
<source>Gas consumption:</source>
- <translation type="unfinished"/>
+ <translation>Gassforbruk:</translation>
</message>
<message>
- <location filename="../planner.c" line="658"/>
- <location filename="../planner.c" line="663"/>
- <location filename="../planner.c" line="686"/>
+ <location filename="../planner.c" line="667"/>
+ <location filename="../planner.c" line="672"/>
+ <location filename="../planner.c" line="695"/>
<source>Warning:</source>
- <translation type="unfinished"/>
+ <translation>Advarsel:</translation>
</message>
<message>
- <location filename="../planner.c" line="659"/>
+ <location filename="../planner.c" line="668"/>
<source>this is more gas than available in the specified cylinder!</source>
- <translation type="unfinished"/>
+ <translation>dette er mer gass en det som er tilgjengelig i tanken!</translation>
</message>
<message>
- <location filename="../planner.c" line="664"/>
+ <location filename="../planner.c" line="673"/>
<source>not enough reserve for gas sharing on ascent!</source>
- <translation type="unfinished"/>
+ <translation>ikke nok i reserve til å dele gass under oppstigning!</translation>
</message>
<message>
- <location filename="../planner.c" line="666"/>
+ <location filename="../planner.c" line="675"/>
<source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
- <translation type="unfinished"/>
+ <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s i planlagt oppstigning)</translation>
</message>
<message>
- <location filename="../planner.c" line="668"/>
+ <location filename="../planner.c" line="677"/>
<source>%.0f%s (%.0f%s during planned ascent) of %s</source>
- <translation type="unfinished"/>
+ <translation>%.0f%s (%.0f%s under planlagt oppstigning) av %s</translation>
</message>
<message>
- <location filename="../planner.c" line="683"/>
+ <location filename="../planner.c" line="692"/>
<source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
- <translation type="unfinished"/>
+ <translation>høy pO₂-verdi %.2f ve %d:%02u med gass %s ved dybde %.*f %s</translation>
</message>
<message>
- <location filename="../planner.c" line="980"/>
+ <location filename="../planner.c" line="990"/>
<source>ean</source>
<translation>ean</translation>
</message>
@@ -3777,7 +3839,8 @@ D: %.1f%s
<location filename="../profile.c" line="1266"/>
<source>SAC: %.*f%s/min
</source>
- <translation type="unfinished"/>
+ <translation>SAC: %.*f%s/min
+</translation>
</message>
<message>
<location filename="../profile.c" line="1268"/>
@@ -3875,93 +3938,100 @@ EADD: %d%s
</translation>
</message>
<message>
- <location filename="../profile.c" line="1321"/>
+ <location filename="../profile.c" line="1320"/>
+ <source>TTS: %umin
+</source>
+ <translation>TTS: %umin
+</translation>
+ </message>
+ <message>
+ <location filename="../profile.c" line="1323"/>
<source>Deco: %umin @ %.0f%s (calc)
</source>
<translation>Deko: %umin @ %.0f%s (kalk.)
</translation>
</message>
<message>
- <location filename="../profile.c" line="1329"/>
+ <location filename="../profile.c" line="1331"/>
<source>In deco (calc)
</source>
<translation>I deko (kalk.)
</translation>
</message>
<message>
- <location filename="../profile.c" line="1331"/>
+ <location filename="../profile.c" line="1333"/>
<source>NDL: %umin (calc)
</source>
<translation>NDL: %umin (kalk.)
</translation>
</message>
<message>
- <location filename="../profile.c" line="1334"/>
+ <location filename="../profile.c" line="1336"/>
<source>TTS: %umin (calc)
</source>
<translation>TTS: %umin (kalk.)
</translation>
</message>
<message>
- <location filename="../profile.c" line="1337"/>
+ <location filename="../profile.c" line="1339"/>
<source>Calculated ceiling %.0f%s
</source>
<translation>Kalkulert tak %.0f%s
</translation>
</message>
<message>
- <location filename="../profile.c" line="1343"/>
+ <location filename="../profile.c" line="1345"/>
<source>Tissue %.0fmin: %.0f%s
</source>
<translation>Vev %.0fmin: %.0f%s
</translation>
</message>
<message>
- <location filename="../profile.c" line="1349"/>
+ <location filename="../profile.c" line="1351"/>
<source>heartbeat: %d
</source>
<translation>puls: %d
</translation>
</message>
<message>
- <location filename="../profile.c" line="1351"/>
+ <location filename="../profile.c" line="1353"/>
<source>bearing: %d
</source>
<translation>retning: %d
</translation>
</message>
<message>
- <location filename="../profile.c" line="1443"/>
+ <location filename="../profile.c" line="1445"/>
<source>%sT: %d:%02d min</source>
<translation>%sT: %d:%02d min</translation>
</message>
<message>
- <location filename="../profile.c" line="1447"/>
- <location filename="../profile.c" line="1451"/>
- <location filename="../profile.c" line="1455"/>
+ <location filename="../profile.c" line="1449"/>
+ <location filename="../profile.c" line="1453"/>
+ <location filename="../profile.c" line="1457"/>
<source>%s %sD:%.1f%s</source>
<translation>%s %sD:%.1f%s</translation>
</message>
<message>
- <location filename="../profile.c" line="1459"/>
+ <location filename="../profile.c" line="1461"/>
<source>%s %sD:%.1f%s
</source>
<translation>%s %sD:%.1f%s
</translation>
</message>
<message>
- <location filename="../profile.c" line="1463"/>
+ <location filename="../profile.c" line="1465"/>
<source>%s%sV:%.2f%s</source>
<translation>%s%sV:%.2f%s</translation>
</message>
<message>
- <location filename="../profile.c" line="1467"/>
- <location filename="../profile.c" line="1471"/>
+ <location filename="../profile.c" line="1469"/>
+ <location filename="../profile.c" line="1473"/>
<source>%s %sV:%.2f%s</source>
<translation>%s %sV:%.2f%s</translation>
</message>
<message>
- <location filename="../profile.c" line="1478"/>
+ <location filename="../profile.c" line="1480"/>
<source>%s %sP:%d %s</source>
<translation>%s %sP:%d %s</translation>
</message>
@@ -4081,9 +4151,9 @@ EADD: %d%s
<translation>deko</translation>
</message>
<message>
- <location filename="../dive.c" line="133"/>
+ <location filename="../dive.c" line="169"/>
<source>ℓ</source>
- <translation type="unfinished"/>
+ <translation>ℓ</translation>
</message>
<message>
<location filename="../statistics.c" line="214"/>
@@ -4131,97 +4201,97 @@ EADD: %d%s
<translation>(ingen dykk)</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Sun</source>
<translation>søn</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Mon</source>
<translation>man</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Tue</source>
<translation>tir</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Wed</source>
<translation>ons</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Thu</source>
<translation>tor</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Fri</source>
<translation>fre</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="75"/>
+ <location filename="../subsurfacestartup.c" line="77"/>
<source>Sat</source>
<translation>lør</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="84"/>
+ <location filename="../subsurfacestartup.c" line="86"/>
<source>Jan</source>
<translation>jan</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="84"/>
+ <location filename="../subsurfacestartup.c" line="86"/>
<source>Feb</source>
<translation>feb</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="84"/>
+ <location filename="../subsurfacestartup.c" line="86"/>
<source>Mar</source>
<translation>mar</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="84"/>
+ <location filename="../subsurfacestartup.c" line="86"/>
<source>Apr</source>
<translation>apr</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="84"/>
+ <location filename="../subsurfacestartup.c" line="86"/>
<source>May</source>
<translation>mai</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="84"/>
+ <location filename="../subsurfacestartup.c" line="86"/>
<source>Jun</source>
<translation>jun</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="85"/>
+ <location filename="../subsurfacestartup.c" line="87"/>
<source>Jul</source>
<translation>jul</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="85"/>
+ <location filename="../subsurfacestartup.c" line="87"/>
<source>Aug</source>
<translation>aug</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="85"/>
+ <location filename="../subsurfacestartup.c" line="87"/>
<source>Sep</source>
<translation>sep</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="85"/>
+ <location filename="../subsurfacestartup.c" line="87"/>
<source>Oct</source>
<translation>okt</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="85"/>
+ <location filename="../subsurfacestartup.c" line="87"/>
<source>Nov</source>
<translation>nov</translation>
</message>
<message>
- <location filename="../subsurfacestartup.c" line="85"/>
+ <location filename="../subsurfacestartup.c" line="87"/>
<source>Dec</source>
<translation>des</translation>
</message>
@@ -4363,17 +4433,17 @@ Er Uemis Zurich plugget i ordentlig?</translation>
<message>
<location filename="../uemis.c" line="203"/>
<source>pO₂ Green Warning</source>
- <translation type="unfinished"/>
+ <translation>pO₂ grønn advarsel</translation>
</message>
<message>
<location filename="../uemis.c" line="206"/>
<source>pO₂ Ascend Warning</source>
- <translation type="unfinished"/>
+ <translation>pO₂ oppstigningsadvarsel</translation>
</message>
<message>
<location filename="../uemis.c" line="208"/>
<source>pO₂ Ascend Alarm</source>
- <translation type="unfinished"/>
+ <translation>pO₂ oppstigningsalarm</translation>
</message>
<message>
<location filename="../uemis.c" line="212"/>
@@ -4436,10 +4506,10 @@ Er Uemis Zurich plugget i ordentlig?</translation>
<translation>Alarm: dårlig batteri</translation>
</message>
<message>
- <location filename="../save-html.c" line="272"/>
+ <location filename="../save-html.c" line="293"/>
<location filename="../worldmap-save.c" line="106"/>
<source>Can&apos;t open file %s</source>
- <translation type="unfinished"/>
+ <translation>Klarer ikke åpne fila %s</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="36"/>
@@ -4449,12 +4519,12 @@ Er Uemis Zurich plugget i ordentlig?</translation>
<message>
<location filename="../worldmap-save.c" line="38"/>
<source>Time:</source>
- <translation type="unfinished"/>
+ <translation>Tid:</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="40"/>
<source>Duration:</source>
- <translation type="unfinished"/>
+ <translation>Lengde:</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="41"/>
@@ -4464,28 +4534,52 @@ Er Uemis Zurich plugget i ordentlig?</translation>
<message>
<location filename="../worldmap-save.c" line="43"/>
<source>Max Depth:</source>
- <translation type="unfinished"/>
+ <translation>Maksdybde:</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="46"/>
<source>Air Temp:</source>
- <translation type="unfinished"/>
+ <translation>Lufttemp:</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="48"/>
<source>Water Temp:</source>
- <translation type="unfinished"/>
+ <translation>Vanntemp:</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="50"/>
<source>Location:</source>
- <translation type="unfinished"/>
+ <translation>Sted:</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="54"/>
<source>Notes:</source>
<translation>Notater:</translation>
</message>
+ <message>
+ <location filename="../qthelper.cpp" line="46"/>
+ <location filename="../qthelper.cpp" line="73"/>
+ <source>N</source>
+ <translation>N</translation>
+ </message>
+ <message>
+ <location filename="../qthelper.cpp" line="46"/>
+ <location filename="../qthelper.cpp" line="74"/>
+ <source>S</source>
+ <translation>S</translation>
+ </message>
+ <message>
+ <location filename="../qthelper.cpp" line="47"/>
+ <location filename="../qthelper.cpp" line="75"/>
+ <source>E</source>
+ <translation>Ø</translation>
+ </message>
+ <message>
+ <location filename="../qthelper.cpp" line="47"/>
+ <location filename="../qthelper.cpp" line="76"/>
+ <source>W</source>
+ <translation>V</translation>
+ </message>
</context>
<context>
<name>plannerSettingsWidget</name>
@@ -4497,17 +4591,17 @@ Er Uemis Zurich plugget i ordentlig?</translation>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="35"/>
<source>Rates</source>
- <translation type="unfinished"/>
+ <translation>Hastigheter</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="56"/>
<source>Ascent</source>
- <translation type="unfinished"/>
+ <translation>Oppstigning</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="77"/>
<source>below 75% avg. depth</source>
- <translation type="unfinished"/>
+ <translation>under 75% snittdybde</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="84"/>
@@ -4516,133 +4610,133 @@ Er Uemis Zurich plugget i ordentlig?</translation>
<location filename="../qt-ui/plannerSettings.ui" line="135"/>
<location filename="../qt-ui/plannerSettings.ui" line="181"/>
<source>m/min</source>
- <translation type="unfinished"/>
+ <translation>m/min</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="94"/>
<source>75%-50% avg. depth</source>
- <translation type="unfinished"/>
+ <translation>75%-50% av snittdybde</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="111"/>
<source>50% avg. depth - 6m/20ft</source>
- <translation type="unfinished"/>
+ <translation>50% av snittdybde til 6m/20ft</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="128"/>
<source>6m/20ft to surface</source>
- <translation type="unfinished"/>
+ <translation>6m/20ft til overflaten</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="148"/>
<source>Descent</source>
- <translation type="unfinished"/>
+ <translation>Nedstigning</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="200"/>
<source>surface to the bottom</source>
- <translation type="unfinished"/>
+ <translation>overflate til bunn</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="226"/>
<source>Planning</source>
- <translation type="unfinished"/>
+ <translation>Planlegging</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="247"/>
<source>GF low</source>
- <translation type="unfinished"/>
+ <translation>GF low</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="264"/>
<source>GF high</source>
- <translation type="unfinished"/>
+ <translation>GF high</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="281"/>
<source>Drop to first depth</source>
- <translation type="unfinished"/>
+ <translation>Dropp til første dybde</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="288"/>
<source>Last Stop at 6m/20ft</source>
- <translation type="unfinished"/>
+ <translation>Siste stopp ved 6m/20ft</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="295"/>
- <source>plan backgas breaks</source>
- <translation type="unfinished"/>
+ <source>Plan backgas breaks</source>
+ <translation>Planlegg stopp med bakgass</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="318"/>
- <source>Gas Options</source>
- <translation type="unfinished"/>
+ <source>Gas options</source>
+ <translation>Gassvalg</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="339"/>
- <source>bottom SAC</source>
- <translation type="unfinished"/>
+ <source>Bottom SAC</source>
+ <translation>SAC på bunn</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="349"/>
- <source>deco SAC</source>
- <translation type="unfinished"/>
+ <source>Deco SAC</source>
+ <translation>SAC under deko</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="359"/>
- <source>bottom pO₂</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/plannerSettings.ui" line="366"/>
- <location filename="../qt-ui/plannerSettings.ui" line="389"/>
- <source>bar</source>
- <translation>bar</translation>
+ <source>Bottom pO₂</source>
+ <translation>pO₂ på bunn</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="382"/>
- <source>deco pO₂</source>
- <translation type="unfinished"/>
+ <source>Deco pO₂</source>
+ <translation>pO₂ for deko</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="421"/>
- <source>Dive Notes</source>
- <translation>Dykk</translation>
+ <source>Dive notes</source>
+ <translation>Notater</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="442"/>
- <source>In dive plan, show runtime (absolute time) of stops</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="445"/>
+ <source>Display runtime</source>
+ <translation>Vis løpetid</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="445"/>
- <source>display runtime</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="461"/>
+ <source>Display segment duration</source>
+ <translation>Vis lengde på segment</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="458"/>
- <source>In dive plan, show duration (relative time) of stops</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="474"/>
+ <source>Display transitions in deco</source>
+ <translation>Vis overganger i deko</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="461"/>
- <source>display segment duration</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="481"/>
+ <source>Verbatim diveplan</source>
+ <translation>Utdypende dykkeplan</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="471"/>
- <source>In diveplan, list transitions or treat them as implicit</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+ <source>bar</source>
+ <translation>bar</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="474"/>
- <source>display transitions in deco</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+ <source>In dive plan, show runtime (absolute time) of stops</source>
+ <translation>I dykkeplanen, vis stoppenes løpetid (absolutt tid)</translation>
</message>
<message>
- <location filename="../qt-ui/plannerSettings.ui" line="481"/>
- <source>verbatim diveplan</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/plannerSettings.ui" line="458"/>
+ <source>In dive plan, show duration (relative time) of stops</source>
+ <translation>I dykkeplanen, vis stoppenes lengde (relativ tid)</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/plannerSettings.ui" line="471"/>
+ <source>In diveplan, list transitions or treat them as implicit</source>
+ <translation>I dykkeplanen, vis overganger eller behandle dem eksplisitt</translation>
</message>
</context>
</TS> \ No newline at end of file
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-25 04:54:02 +0000