diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2015-01-29 07:27:03 -0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-01-29 07:27:03 -0800 |
commit | 9a91c801a63f81dc5d7460eb84bac8329c35cace (patch) | |
tree | 2b8c90ffb419188b163fab1f50ba5b9a01e51922 /translations/subsurface_nb_NO.ts | |
parent | d136651d120a01fd90c5c3505567701ca36419c8 (diff) | |
download | subsurface-9a91c801a63f81dc5d7460eb84bac8329c35cace.tar.gz |
Latest strings and translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_nb_NO.ts')
-rw-r--r-- | translations/subsurface_nb_NO.ts | 394 |
1 files changed, 189 insertions, 205 deletions
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 7e5d0559c..66443efe3 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -75,16 +75,6 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/> - <source>Max depth</source> - <translation>Maksdybde</translation> - </message> - <message> - <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/> - <source>Avg depth</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> @@ -114,6 +104,16 @@ <translation>Vanntemp.</translation> </message> <message> + <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/> + <source>Max. depth</source> + <translation>Maksdybde</translation> + </message> + <message> + <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/> + <source>Avg. depth</source> + <translation>Snittdybde</translation> + </message> + <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/> <source>O₂</source> <translation type="unfinished"/> @@ -995,70 +995,70 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1050"/> <source>Backup files (*.xml)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1034"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1038"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1033"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1049"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1060"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1061"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1071"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1072"/> <source>All files (*.*)</source> <translation type="unfinished"/> </message> @@ -1259,27 +1259,27 @@ <context> <name>DiveImportedModel</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="562"/> <source>Date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="564"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="566"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="588"/> <source>h:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="588"/> <source>min</source> <translation>min</translation> </message> @@ -1888,27 +1888,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/> - <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/> - <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/> - <source>Sample cns</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/> - <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/> - <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/> - <source>Sample ndl</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/> - <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/> - <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/> - <source>Sample tts</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/> <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/> <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/> @@ -1926,25 +1905,30 @@ </message> <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/> + <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/> + <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/> + <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/> <source>Sample CNS</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/> + <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/> + <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/> + <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/> <source>Sample NDL</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/> + <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/> + <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/> + <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/> <source>Sample TTS</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/> - <source>Samples pressure</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/> <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/> <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/> @@ -2160,37 +2144,37 @@ </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/> - <source>Sensor1</source> + <source>Sensor 1</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/> - <source>Sensor2</source> + <source>Sensor 2</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/> - <source>Sensor3</source> + <source>Sensor 3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/> - <source>Ambient pressure</source> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/> + <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/> - <source>Heart beat</source> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/> + <source>Mean depth @ s</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/> - <source>Gradient factor</source> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/> + <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/> - <source>Mean depth/s</source> + <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/> + <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> @@ -2595,7 +2579,7 @@ </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/> - <source>Downloaded Dives</source> + <source>Downloaded dives</source> <translation type="unfinished"/> </message> <message> @@ -2701,17 +2685,17 @@ <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1621"/> + <location filename="../configuredivecomputerthreads.cpp" line="1623"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1624"/> + <location filename="../configuredivecomputerthreads.cpp" line="1626"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1627"/> + <location filename="../configuredivecomputerthreads.cpp" line="1629"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -2743,201 +2727,201 @@ <context> <name>MainTab</name> <message> - <location filename="../qt-ui/maintab.ui" line="162"/> - <location filename="../qt-ui/maintab.cpp" line="497"/> + <location filename="../qt-ui/maintab.ui" line="160"/> + <location filename="../qt-ui/maintab.cpp" line="498"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="67"/> + <location filename="../qt-ui/maintab.ui" line="65"/> <source>Coordinates</source> <translation>Koordinater</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="169"/> + <location filename="../qt-ui/maintab.ui" line="167"/> <source>Divemaster</source> <translation>Dykkeleder</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="176"/> + <location filename="../qt-ui/maintab.ui" line="174"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="277"/> + <location filename="../qt-ui/maintab.ui" line="275"/> <source>Tags</source> <translation>Emner</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="208"/> + <location filename="../qt-ui/maintab.ui" line="206"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="221"/> + <location filename="../qt-ui/maintab.ui" line="219"/> <source>Visibility</source> <translation>Sikt</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="230"/> + <location filename="../qt-ui/maintab.ui" line="228"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="471"/> <source>Dive notes</source> <translation>Notater</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="74"/> + <location filename="../qt-ui/maintab.ui" line="72"/> <source>Dive mode</source> <translation>Dykkemodus</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="102"/> - <location filename="../qt-ui/maintab.ui" line="677"/> - <location filename="../qt-ui/maintab.cpp" line="279"/> + <location filename="../qt-ui/maintab.ui" line="100"/> + <location filename="../qt-ui/maintab.ui" line="675"/> + <location filename="../qt-ui/maintab.cpp" line="280"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="109"/> - <location filename="../qt-ui/maintab.ui" line="696"/> - <location filename="../qt-ui/maintab.cpp" line="280"/> + <location filename="../qt-ui/maintab.ui" line="107"/> + <location filename="../qt-ui/maintab.ui" line="694"/> + <location filename="../qt-ui/maintab.cpp" line="281"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="284"/> - <location filename="../qt-ui/maintab.cpp" line="498"/> + <location filename="../qt-ui/maintab.ui" line="282"/> + <location filename="../qt-ui/maintab.cpp" line="499"/> <source>Notes</source> <translation>Notater</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="398"/> + <location filename="../qt-ui/maintab.ui" line="396"/> <source>Equipment</source> <translation>Utstyr</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="525"/> + <location filename="../qt-ui/maintab.ui" line="523"/> <source>Gases used</source> <translation>Brukte gasser</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="544"/> + <location filename="../qt-ui/maintab.ui" line="542"/> <source>Gas consumed</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="582"/> + <location filename="../qt-ui/maintab.ui" line="580"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="620"/> + <location filename="../qt-ui/maintab.ui" line="618"/> <source>Max. depth</source> <translation>Maksdybde</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="658"/> + <location filename="../qt-ui/maintab.ui" line="656"/> <source>Air pressure</source> <translation>Lufttrykk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="715"/> + <location filename="../qt-ui/maintab.ui" line="713"/> <source>Dive time</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="874"/> + <location filename="../qt-ui/maintab.ui" line="872"/> <source>Total time</source> <translation>Totaltid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="932"/> + <location filename="../qt-ui/maintab.ui" line="930"/> <source>Gas consumption</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="991"/> + <location filename="../qt-ui/maintab.ui" line="989"/> <source>Extra data</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="997"/> + <location filename="../qt-ui/maintab.ui" line="995"/> <source>Additional data from dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="83"/> - <location filename="../qt-ui/maintab.ui" line="487"/> + <location filename="../qt-ui/maintab.ui" line="81"/> + <location filename="../qt-ui/maintab.ui" line="485"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="90"/> + <location filename="../qt-ui/maintab.ui" line="88"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="454"/> + <location filename="../qt-ui/maintab.ui" line="452"/> <source>Dive info</source> <translation>Detaljer</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="506"/> + <location filename="../qt-ui/maintab.ui" line="504"/> <source>Interval</source> <translation>Overflateintervall</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="563"/> - <location filename="../qt-ui/maintab.ui" line="828"/> + <location filename="../qt-ui/maintab.ui" line="561"/> + <location filename="../qt-ui/maintab.ui" line="826"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="639"/> + <location filename="../qt-ui/maintab.ui" line="637"/> <source>Avg. depth</source> <translation>Snittdybde</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="601"/> + <location filename="../qt-ui/maintab.ui" line="599"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="734"/> + <location filename="../qt-ui/maintab.ui" line="732"/> <source>Salinity</source> <translation>Saltholdighet</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="771"/> + <location filename="../qt-ui/maintab.ui" line="769"/> <source>Stats</source> <translation>Statistikk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="804"/> + <location filename="../qt-ui/maintab.ui" line="802"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="816"/> + <location filename="../qt-ui/maintab.ui" line="814"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="842"/> + <location filename="../qt-ui/maintab.ui" line="840"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="893"/> + <location filename="../qt-ui/maintab.ui" line="891"/> <source>Dives</source> <translation>Dykk</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="977"/> + <location filename="../qt-ui/maintab.ui" line="975"/> <source>Photos</source> <translation>Bilder</translation> </message> @@ -2972,106 +2956,106 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="276"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="277"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>Water temp. [%1]</source> <translation>Vanntemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="314"/> + <location filename="../qt-ui/maintab.cpp" line="315"/> <source>This trip is being edited.</source> <translation>Denne turen redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="322"/> + <location filename="../qt-ui/maintab.cpp" line="323"/> <source>Multiple dives are being edited.</source> <translation>Flere dykk redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="324"/> + <location filename="../qt-ui/maintab.cpp" line="325"/> <source>This dive is being edited.</source> <translation>Dette dykket redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="439"/> - <location filename="../qt-ui/maintab.cpp" line="465"/> + <location filename="../qt-ui/maintab.cpp" line="440"/> + <location filename="../qt-ui/maintab.cpp" line="466"/> <source>Trip notes</source> <translation>Turnotater</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="463"/> + <location filename="../qt-ui/maintab.cpp" line="464"/> <source>Trip location</source> <translation>Tursted</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> - <location filename="../qt-ui/maintab.cpp" line="566"/> - <location filename="../qt-ui/maintab.cpp" line="570"/> - <location filename="../qt-ui/maintab.cpp" line="574"/> + <location filename="../qt-ui/maintab.cpp" line="535"/> + <location filename="../qt-ui/maintab.cpp" line="567"/> + <location filename="../qt-ui/maintab.cpp" line="571"/> + <location filename="../qt-ui/maintab.cpp" line="575"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="563"/> + <location filename="../qt-ui/maintab.cpp" line="564"/> <source>Deepest dive</source> <translation>Dypeste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="564"/> + <location filename="../qt-ui/maintab.cpp" line="565"/> <source>Shallowest dive</source> <translation>Grunneste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="577"/> + <location filename="../qt-ui/maintab.cpp" line="578"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="578"/> + <location filename="../qt-ui/maintab.cpp" line="579"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="579"/> + <location filename="../qt-ui/maintab.cpp" line="580"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="590"/> + <location filename="../qt-ui/maintab.cpp" line="591"/> <source>Highest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>Lowest temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="592"/> + <location filename="../qt-ui/maintab.cpp" line="593"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="602"/> + <location filename="../qt-ui/maintab.cpp" line="603"/> <source>Longest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="603"/> + <location filename="../qt-ui/maintab.cpp" line="604"/> <source>Shortest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="604"/> + <location filename="../qt-ui/maintab.cpp" line="605"/> <source>Average length of all selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="628"/> + <location filename="../qt-ui/maintab.cpp" line="629"/> <source>These gases could be mixed from Air and using: </source> @@ -3080,17 +3064,17 @@ fra luft og bruker: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="632"/> + <location filename="../qt-ui/maintab.cpp" line="633"/> <source> and </source> <translation>og</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="925"/> + <location filename="../qt-ui/maintab.cpp" line="926"/> <source>Discard the changes?</source> <translation>Slette endringer?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="926"/> + <location filename="../qt-ui/maintab.cpp" line="927"/> <source>You are about to discard your changes.</source> <translation>Du er i ferd med å droppe endringene dine.</translation> </message> @@ -3237,7 +3221,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="296"/> - <location filename="../qt-ui/mainwindow.cpp" line="232"/> + <location filename="../qt-ui/mainwindow.cpp" line="233"/> <source>Open</source> <translation>Åpne</translation> </message> @@ -3597,90 +3581,90 @@ p, li { white-space: pre-wrap; } <translation>F11</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="229"/> + <location filename="../qt-ui/mainwindow.cpp" line="230"/> <source>Open file</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="233"/> + <location filename="../qt-ui/mainwindow.cpp" line="234"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="309"/> + <location filename="../qt-ui/mainwindow.cpp" line="310"/> <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="421"/> + <location filename="../qt-ui/mainwindow.cpp" line="422"/> <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="468"/> + <location filename="../qt-ui/mainwindow.cpp" line="469"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="811"/> + <location filename="../qt-ui/mainwindow.cpp" line="812"/> <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="813"/> + <location filename="../qt-ui/mainwindow.cpp" line="814"/> <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="818"/> + <location filename="../qt-ui/mainwindow.cpp" line="819"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1173"/> + <location filename="../qt-ui/mainwindow.cpp" line="1174"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1314"/> + <location filename="../qt-ui/mainwindow.cpp" line="1315"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="819"/> + <location filename="../qt-ui/mainwindow.cpp" line="820"/> <source>Changes will be lost if you don't save them.</source> <translation>Endringer vil gå tapt hvis du ikke lagrer.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="277"/> - <location filename="../qt-ui/mainwindow.cpp" line="421"/> - <location filename="../qt-ui/mainwindow.cpp" line="1355"/> + <location filename="../qt-ui/mainwindow.cpp" line="278"/> + <location filename="../qt-ui/mainwindow.cpp" line="422"/> + <location filename="../qt-ui/mainwindow.cpp" line="1356"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="223"/> - <location filename="../qt-ui/mainwindow.cpp" line="1157"/> + <location filename="../qt-ui/mainwindow.cpp" line="224"/> + <location filename="../qt-ui/mainwindow.cpp" line="1158"/> <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="602"/> + <location filename="../qt-ui/mainwindow.cpp" line="603"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1174"/> + <location filename="../qt-ui/mainwindow.cpp" line="1175"/> <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="1315"/> + <location filename="../qt-ui/mainwindow.cpp" line="1316"/> <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1355"/> + <location filename="../qt-ui/mainwindow.cpp" line="1356"/> <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> @@ -4644,12 +4628,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <context> <name>ReadSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1518"/> + <location filename="../configuredivecomputerthreads.cpp" line="1520"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1510"/> + <location filename="../configuredivecomputerthreads.cpp" line="1512"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4676,12 +4660,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <context> <name>ResetSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1653"/> + <location filename="../configuredivecomputerthreads.cpp" line="1655"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1657"/> + <location filename="../configuredivecomputerthreads.cpp" line="1659"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -4951,7 +4935,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <translation>Lukk</translation> </message> <message> - <location filename="../qt-ui/about.cpp" line="16"/> + <location filename="../qt-ui/about.cpp" line="18"/> <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015</span></source> <translation type="unfinished"/> </message> @@ -5082,72 +5066,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="63"/> + <location filename="../qt-ui/updatemanager.cpp" line="81"/> <source>Check for updates.</source> <translation>Se etter oppdateringer.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="64"/> + <location filename="../qt-ui/updatemanager.cpp" line="82"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface klarte ikke å se etter oppdateringer.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="69"/> + <location filename="../qt-ui/updatemanager.cpp" line="87"/> <source>The following error occurred:</source> <translation>Den følgende feilen inntraff:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="70"/> + <location filename="../qt-ui/updatemanager.cpp" line="88"/> <source>Please check your internet connection.</source> <translation>Sjekk internettforbindelsen din.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="83"/> + <location filename="../qt-ui/updatemanager.cpp" line="98"/> <source>You are using the latest version of Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="86"/> + <location filename="../qt-ui/updatemanager.cpp" line="101"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="94"/> + <location filename="../qt-ui/updatemanager.cpp" line="107"/> <source>A new version of Subsurface is available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="95"/> - <source>Latest version is %1, please check with your OS vendor for updates.</source> + <location filename="../qt-ui/updatemanager.cpp" line="108"/> + <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="103"/> + <location filename="../qt-ui/updatemanager.cpp" line="116"/> <source>Newest release version is </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="104"/> + <location filename="../qt-ui/updatemanager.cpp" line="117"/> <source>The server returned the following information:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="121"/> + <location filename="../qt-ui/updatemanager.cpp" line="134"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="122"/> + <location filename="../qt-ui/updatemanager.cpp" line="135"/> <source>Decline</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="123"/> + <location filename="../qt-ui/updatemanager.cpp" line="136"/> <source>Accept</source> <translation>OK</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="125"/> + <location filename="../qt-ui/updatemanager.cpp" line="138"/> <source>Automatic check for updates</source> <translation type="unfinished"/> </message> @@ -5229,91 +5213,91 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="225"/> + <location filename="../qt-ui/usersurvey.ui" line="231"/> <source>What kind of diver are you?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="264"/> + <location filename="../qt-ui/usersurvey.ui" line="270"/> <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="41"/> + <location filename="../qt-ui/usersurvey.cpp" line="43"/> <source> Operating system: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="43"/> + <location filename="../qt-ui/usersurvey.cpp" line="45"/> <source> CPU architecture: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="45"/> + <location filename="../qt-ui/usersurvey.cpp" line="47"/> <source> OS CPU architecture: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="46"/> + <location filename="../qt-ui/usersurvey.cpp" line="48"/> <source> Language: %1</source> <translation>Språk: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="93"/> + <location filename="../qt-ui/usersurvey.cpp" line="95"/> <source>Should we ask you later?</source> <translation>Skal vi spørre deg igjen senere?</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="94"/> + <location filename="../qt-ui/usersurvey.cpp" line="96"/> <source>Don't ask me again</source> <translation>Ikke spør meg igjen</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="95"/> + <location filename="../qt-ui/usersurvey.cpp" line="97"/> <source>Ask later</source> <translation>Spør senere</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="115"/> + <location filename="../qt-ui/usersurvey.cpp" line="117"/> <source>Submit user survey.</source> <translation>Send inn brukerundersøkelse.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="96"/> + <location filename="../qt-ui/usersurvey.cpp" line="98"/> <source>Ask again?</source> <translation>Spørre igjen?</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="17"/> + <location filename="../qt-ui/usersurvey.cpp" line="18"/> <source>Send</source> <translation>Send</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="116"/> + <location filename="../qt-ui/usersurvey.cpp" line="118"/> <source>Subsurface was unable to submit the user survey.</source> <translation>Subsurface klarte ikke å sende inn undersøkelsen.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="121"/> + <location filename="../qt-ui/usersurvey.cpp" line="123"/> <source>The following error occurred:</source> <translation>Den følgende feilen inntraff:</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="122"/> + <location filename="../qt-ui/usersurvey.cpp" line="124"/> <source>Please check your internet connection.</source> <translation>Sjekk internettforbindelsen din.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="131"/> + <location filename="../qt-ui/usersurvey.cpp" line="133"/> <source>Survey successfully submitted.</source> <translation>Undersøkelsen er sendt.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="136"/> + <location filename="../qt-ui/usersurvey.cpp" line="138"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>Det oppstod en feil under leting etter oppdatering.<br/><br/>%1</translation> </message> @@ -5405,19 +5389,19 @@ Language: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1547"/> - <location filename="../configuredivecomputerthreads.cpp" line="1555"/> - <location filename="../configuredivecomputerthreads.cpp" line="1566"/> + <location filename="../configuredivecomputerthreads.cpp" line="1549"/> + <location filename="../configuredivecomputerthreads.cpp" line="1557"/> + <location filename="../configuredivecomputerthreads.cpp" line="1568"/> <source>Failed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1576"/> + <location filename="../configuredivecomputerthreads.cpp" line="1578"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1580"/> + <location filename="../configuredivecomputerthreads.cpp" line="1582"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> |