summaryrefslogtreecommitdiffstats
path: root/translations/subsurface_nb_NO.ts
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2020-03-19 08:56:11 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-03-19 08:56:11 -0700
commitef821d7d94bbc69337c36f26a25d819e340b14f5 (patch)
treebe866c1f7992640f678a3581ad0124d5b5d4d9b2 /translations/subsurface_nb_NO.ts
parenteb76bdb3e377b601ea62fc36cb58c14a55f25565 (diff)
downloadsubsurface-ef821d7d94bbc69337c36f26a25d819e340b14f5.tar.gz
More translation updates
Good progress by the translation teams! Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_nb_NO.ts')
-rw-r--r--translations/subsurface_nb_NO.ts331
1 files changed, 145 insertions, 186 deletions
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index ce95f3e59..32e9181a4 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -38,12 +38,12 @@
<context>
<name>AddWeight</name>
<message>
- <location filename="../commands/command_edit.cpp" line="991"/>
+ <location filename="../commands/command_edit.cpp" line="972"/>
<source>Add weight</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../commands/command_edit.cpp" line="993"/>
+ <location filename="../commands/command_edit.cpp" line="974"/>
<source>Add weight (%n dive(s))</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -630,12 +630,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../commands/command_edit.cpp" line="94"/>
+ <location filename="../commands/command_edit.cpp" line="95"/>
<source>Edit %1</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../commands/command_edit.cpp" line="96"/>
+ <location filename="../commands/command_edit.cpp" line="97"/>
<source>Edit %1 (%n dive(s))</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -715,7 +715,7 @@
<context>
<name>Command::EditAirTemp</name>
<message>
- <location filename="../commands/command_edit.cpp" line="333"/>
+ <location filename="../commands/command_edit.cpp" line="335"/>
<source>air temperature</source>
<translation type="unfinished"/>
</message>
@@ -723,7 +723,7 @@
<context>
<name>Command::EditAtmPress</name>
<message>
- <location filename="../commands/command_edit.cpp" line="399"/>
+ <location filename="../commands/command_edit.cpp" line="401"/>
<source>Atm. pressure</source>
<translation type="unfinished"/>
</message>
@@ -731,7 +731,7 @@
<context>
<name>Command::EditChill</name>
<message>
- <location filename="../commands/command_edit.cpp" line="312"/>
+ <location filename="../commands/command_edit.cpp" line="314"/>
<source>chill</source>
<translation type="unfinished"/>
</message>
@@ -739,7 +739,7 @@
<context>
<name>Command::EditCurrent</name>
<message>
- <location filename="../commands/command_edit.cpp" line="270"/>
+ <location filename="../commands/command_edit.cpp" line="272"/>
<source>current</source>
<translation type="unfinished"/>
</message>
@@ -747,7 +747,7 @@
<context>
<name>Command::EditDepth</name>
<message>
- <location filename="../commands/command_edit.cpp" line="447"/>
+ <location filename="../commands/command_edit.cpp" line="449"/>
<source>depth</source>
<translation>dybde</translation>
</message>
@@ -755,7 +755,7 @@
<context>
<name>Command::EditDiveSite</name>
<message>
- <location filename="../commands/command_edit.cpp" line="469"/>
+ <location filename="../commands/command_edit.cpp" line="471"/>
<source>dive site</source>
<translation type="unfinished"/>
</message>
@@ -811,7 +811,7 @@
<context>
<name>Command::EditDuration</name>
<message>
- <location filename="../commands/command_edit.cpp" line="423"/>
+ <location filename="../commands/command_edit.cpp" line="425"/>
<source>duration</source>
<translation>lengde</translation>
</message>
@@ -819,7 +819,7 @@
<context>
<name>Command::EditNotes</name>
<message>
- <location filename="../commands/command_edit.cpp" line="164"/>
+ <location filename="../commands/command_edit.cpp" line="166"/>
<source>notes</source>
<translation type="unfinished"/>
</message>
@@ -827,7 +827,7 @@
<context>
<name>Command::EditRating</name>
<message>
- <location filename="../commands/command_edit.cpp" line="207"/>
+ <location filename="../commands/command_edit.cpp" line="209"/>
<source>rating</source>
<translation type="unfinished"/>
</message>
@@ -835,7 +835,7 @@
<context>
<name>Command::EditSuit</name>
<message>
- <location filename="../commands/command_edit.cpp" line="186"/>
+ <location filename="../commands/command_edit.cpp" line="188"/>
<source>suit</source>
<translation>drakt</translation>
</message>
@@ -843,7 +843,7 @@
<context>
<name>Command::EditSurge</name>
<message>
- <location filename="../commands/command_edit.cpp" line="291"/>
+ <location filename="../commands/command_edit.cpp" line="293"/>
<source>surge</source>
<translation type="unfinished"/>
</message>
@@ -875,7 +875,7 @@
<context>
<name>Command::EditVisibility</name>
<message>
- <location filename="../commands/command_edit.cpp" line="228"/>
+ <location filename="../commands/command_edit.cpp" line="230"/>
<source>visibility</source>
<translation type="unfinished"/>
</message>
@@ -883,7 +883,7 @@
<context>
<name>Command::EditWaterTemp</name>
<message>
- <location filename="../commands/command_edit.cpp" line="357"/>
+ <location filename="../commands/command_edit.cpp" line="359"/>
<source>water temperature</source>
<translation type="unfinished"/>
</message>
@@ -891,7 +891,7 @@
<context>
<name>Command::EditWaterTypeUser</name>
<message>
- <location filename="../commands/command_edit.cpp" line="378"/>
+ <location filename="../commands/command_edit.cpp" line="380"/>
<source>salinity</source>
<translation type="unfinished"/>
</message>
@@ -899,7 +899,7 @@
<context>
<name>Command::EditWaveSize</name>
<message>
- <location filename="../commands/command_edit.cpp" line="249"/>
+ <location filename="../commands/command_edit.cpp" line="251"/>
<source>wavesize</source>
<translation type="unfinished"/>
</message>
@@ -5360,7 +5360,7 @@ Existing Site</source>
<location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/>
<location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="316"/>
<location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="355"/>
- <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="458"/>
+ <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="465"/>
<location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="334"/>
<source>Download</source>
<translation>Last ned</translation>
@@ -5442,37 +5442,37 @@ Existing Site</source>
<translation>Skann på nytt</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="375"/>
+ <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="382"/>
<source> Downloaded dives</source>
<translation>Nedlastede dykk</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="376"/>
+ <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="383"/>
<source>Info:</source>
<translation>Info:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="399"/>
+ <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="406"/>
<source>force downloading all dives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="428"/>
+ <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="435"/>
<source>Please wait while we record these dives...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="443"/>
+ <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="450"/>
<source>Accept</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="472"/>
+ <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="479"/>
<source>Select All</source>
<translation>Velg alle</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="481"/>
+ <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="488"/>
<source>Unselect All</source>
<translation>Velg ingen</translation>
</message>
@@ -5488,7 +5488,7 @@ Existing Site</source>
<context>
<name>EditBuddies</name>
<message>
- <location filename="../commands/command_edit.cpp" line="746"/>
+ <location filename="../commands/command_edit.cpp" line="727"/>
<source>buddies</source>
<translation type="unfinished"/>
</message>
@@ -5496,7 +5496,7 @@ Existing Site</source>
<context>
<name>EditDive</name>
<message>
- <location filename="../commands/command_edit.cpp" line="1167"/>
+ <location filename="../commands/command_edit.cpp" line="1148"/>
<source>Edit dive [%1]</source>
<translation type="unfinished"/>
</message>
@@ -5504,7 +5504,7 @@ Existing Site</source>
<context>
<name>EditDiveMaster</name>
<message>
- <location filename="../commands/command_edit.cpp" line="769"/>
+ <location filename="../commands/command_edit.cpp" line="750"/>
<source>dive master</source>
<translation type="unfinished"/>
</message>
@@ -5512,23 +5512,15 @@ Existing Site</source>
<context>
<name>EditMode</name>
<message>
- <location filename="../commands/command_edit.cpp" line="567"/>
+ <location filename="../commands/command_edit.cpp" line="569"/>
<source>dive mode</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>EditNumber</name>
- <message>
- <location filename="../commands/command_edit.cpp" line="588"/>
- <source>number</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>EditTags</name>
<message>
- <location filename="../commands/command_edit.cpp" line="723"/>
+ <location filename="../commands/command_edit.cpp" line="704"/>
<source>tags</source>
<translation type="unfinished"/>
</message>
@@ -5536,12 +5528,12 @@ Existing Site</source>
<context>
<name>EditTagsBase</name>
<message>
- <location filename="../commands/command_edit.cpp" line="659"/>
+ <location filename="../commands/command_edit.cpp" line="639"/>
<source>Edit %1</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../commands/command_edit.cpp" line="661"/>
+ <location filename="../commands/command_edit.cpp" line="641"/>
<source>Edit %1 (%n dive(s))</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -5549,12 +5541,12 @@ Existing Site</source>
<context>
<name>EditWeight</name>
<message>
- <location filename="../commands/command_edit.cpp" line="1106"/>
+ <location filename="../commands/command_edit.cpp" line="1087"/>
<source>Edit weight</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../commands/command_edit.cpp" line="1108"/>
+ <location filename="../commands/command_edit.cpp" line="1089"/>
<source>Edit weight (%n dive(s))</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -6016,7 +6008,7 @@ Existing Site</source>
<context>
<name>GpsLocation</name>
<message>
- <location filename="../core/gpslocation.cpp" line="134"/>
+ <location filename="../core/gpslocation.cpp" line="133"/>
<source>Unknown GPS location (no GPS source)</source>
<translation>Ukjent GPS-lokasjon (ingen GPS-kilde)</translation>
</message>
@@ -6075,7 +6067,7 @@ Existing Site</source>
</message>
<message>
<location filename="../desktop-widgets/importgps.ui" line="308"/>
- <source>By how many hours did the international time zone at the dive site differ from UCT (also regarded as Greenwich Mean Time)? Normally one would specify this value in whole hours (h:00):</source>
+ <source>By how many hours did the international time zone at the dive site differ from UTC (also regarded as Greenwich Mean Time)? Normally one would specify this value in whole hours (h:00):</source>
<translation type="unfinished"/>
</message>
<message>
@@ -6490,17 +6482,17 @@ Existing Site</source>
<translation>Tursted</translation>
</message>
<message>
- <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="591"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="590"/>
<source>Discard the changes?</source>
<translation>Slette endringer?</translation>
</message>
<message>
- <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="592"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="591"/>
<source>You are about to discard your changes.</source>
<translation>Du er i ferd med å droppe endringene dine.</translation>
</message>
<message>
- <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="630"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="629"/>
<source>Warning: edited %1 dives</source>
<translation type="unfinished"/>
</message>
@@ -7000,9 +6992,9 @@ Existing Site</source>
<location filename="../desktop-widgets/divelistview.cpp" line="680"/>
<location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
<location filename="../desktop-widgets/mainwindow.cpp" line="640"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="793"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="903"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1790"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="792"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="902"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
<source>Warning</source>
<translation>Advarsel</translation>
</message>
@@ -7042,7 +7034,7 @@ programmet kan overskrive dem.</translation>
<message>
<location filename="../desktop-widgets/mainwindow.cpp" line="486"/>
<location filename="../desktop-widgets/mainwindow.cpp" line="533"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1520"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1519"/>
<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>
@@ -7053,7 +7045,7 @@ programmet kan overskrive dem.</translation>
</message>
<message>
<location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1916"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1915"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@@ -7064,7 +7056,7 @@ programmet kan overskrive dem.</translation>
</message>
<message>
<location filename="../desktop-widgets/mainwindow.cpp" line="618"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1340"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1339"/>
<source>Save changes?</source>
<translation>Lagre endringer?</translation>
</message>
@@ -7081,208 +7073,208 @@ Hvis du svarer nei vil skylagring kun bli synkronisert neste gang du velger &quo
<translation>Kunne ikke skru på skylagring</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="691"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="690"/>
<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="../desktop-widgets/mainwindow.cpp" line="793"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="792"/>
<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="../desktop-widgets/mainwindow.cpp" line="847"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="846"/>
<source>Print runtime table</source>
<translation>Skriv ut løpetidstabel</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="903"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="902"/>
<source>Trying to replan a dive that&apos;s not a planned dive.</source>
<translation>Prøver å re-planlegge et dykk som ikke allerede er et planlagt dykk.</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1006"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1005"/>
<source>Yearly statistics</source>
<translation>Årsstatistikk</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1234"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1233"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
<source>Dive log files</source>
<translation>Dykkeloggfiler</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1254"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1549"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1548"/>
<source>Subsurface files</source>
<translation>Subsurface-filer</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1255"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1297"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1254"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/>
<source>Cochran</source>
<translation>Cochran</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1256"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1255"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1298"/>
<source>DiveLogs.de</source>
<translation>DiveLogs.de</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1257"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1300"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1256"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/>
<source>JDiveLog</source>
<translation>JDiveLog</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1258"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1301"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1257"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1300"/>
<source>Liquivision</source>
<translation>Liquivision</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1302"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1258"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1301"/>
<source>Suunto</source>
<translation>Suunto</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1260"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1303"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1302"/>
<source>UDCF</source>
<translation>UDCF</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1260"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1303"/>
<source>UDDF</source>
<translation>UDDF</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1262"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/>
<source>XML</source>
<translation>XML</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1263"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1262"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/>
<source>Divesoft</source>
<translation>Divesoft</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1263"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/>
<source>Datatrak/WLog</source>
<translation>Datatrak/WLog</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
<source>MkVI files</source>
<translation>MkVI-filer</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
<source>APD log viewer</source>
<translation>APD log viewer</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
<source>OSTCtools</source>
<translation>OSTCtools</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
<source>DAN DL7</source>
<translation>DAN DL7</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1298"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1297"/>
<source>CSV</source>
<translation>CSV</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/>
<source>All files</source>
<translation>Alle filer</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/>
<source>Dive site files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/>
<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="../desktop-widgets/mainwindow.cpp" line="1335"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/>
<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="../desktop-widgets/mainwindow.cpp" line="1341"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1340"/>
<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="../desktop-widgets/mainwindow.cpp" line="1548"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1547"/>
<source>Save file as</source>
<translation>Lagre fil som</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1636"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1635"/>
<source>[local cache for] %1</source>
<translation>[lokal cache for] %1</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1637"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1636"/>
<source>[cloud storage for] %1</source>
<translation>[skylager for] %1</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1675"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1777"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1674"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1776"/>
<source>multiple files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1703"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1702"/>
<source>Opening datafile from older version</source>
<translation>Åpner datafil fra eldre versjon</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1704"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1703"/>
<source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
<translation>Du åpnet en datafil fra en eldre versjon av Subsurface. Vi anbefaler at du leser manualen for å else om endringene i den nye versjonen, særlig med tanke på dykkestedsdatabasen.
Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på dykkestedsdatabasen og sjekke at alt er greit.</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1728"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1727"/>
<source>Open dive log file</source>
<translation>Åpne dykkelogg</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1755"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1754"/>
<source>Open dive site file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1790"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
<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>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1916"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1915"/>
<source>Contacting cloud service...</source>
<translation>Kontakter skylager...</translation>
</message>
@@ -7401,7 +7393,7 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned
<context>
<name>PasteDives</name>
<message numerus="yes">
- <location filename="../commands/command_edit.cpp" line="868"/>
+ <location filename="../commands/command_edit.cpp" line="849"/>
<source>Paste onto %n dive(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -8978,179 +8970,146 @@ Eksporter denne templaten til en annen fil.</translation>
<translation>Starter...</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/>
<source>Open local dive data file</source>
<translation>Åpne lokal dykkelogg</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="352"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="353"/>
<source>Opening local data file failed</source>
<translation>Kunne ikke åpne lokal dykkelogg</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/>
<source>%1 dives loaded from local dive data file</source>
<translation>%1 dykk hentet fra lokal dykkelogg</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="379"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="698"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/>
<source>Incorrect cloud credentials</source>
<translation>Feil bruker/passord for skyen</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/>
<source>working in no-cloud mode</source>
<translation>jobber i ikke-sky-modus</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/>
<source>Error parsing local storage, giving up</source>
<translation>Klarte ikke å lese fra lokalt lagring</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/>
<source>no cloud credentials</source>
<translation>ingen påloggingsdetaljer for skyen</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="532"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="604"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="525"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="597"/>
<source>Please enter valid cloud credentials.</source>
<translation>Legg in påloggingsdetaljer for skyen</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="565"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="558"/>
<source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
<translation>Epost og passord for skylager kan bare bestå av bokstaver, tall og &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, og &apos;+&apos;.</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="571"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/>
<source>Invalid format for email address</source>
<translation>Feil format på epostadresse</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="608"/>
<source>Attempting to open cloud storage with new credentials</source>
<translation>Prøver å åpne skylagring med nye påloggingsdetaljer</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="629"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="676"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="622"/>
<source>Testing cloud credentials</source>
<translation>Tester påloggingsdetaljer for skyen</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="646"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/>
<source>No response from cloud server to validate the credentials</source>
<translation>Skytjener svarte ikke ved validering av påloggingsdetaljer</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="652"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="645"/>
<source>Incorrect email / password combination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="657"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="650"/>
<source>Cloud credentials require verification PIN</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="653"/>
<source>Incorrect PIN, please try again</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="665"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="658"/>
<source>PIN accepted, credentials verified</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="704"/>
- <source>Cannot connect to cloud storage - cloud account not verified</source>
- <translation>Får ikke koblet til skylagring - konto er ikke verifisert</translation>
- </message>
- <message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/>
- <source>Cloud credentials are invalid</source>
- <translation>Påloggingsdetaljer for skyen er ugyldige</translation>
- </message>
- <message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="742"/>
- <source>Cannot open cloud storage: Error creating https connection</source>
- <translation>Kunne ikke åpne skylagring: Feil ved opprettelse av https-forbindelse</translation>
- </message>
- <message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="756"/>
- <source>Cannot open cloud storage: %1</source>
- <translation>Kan ikke åpne skylagring: %1</translation>
- </message>
- <message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="769"/>
- <source>Cannot connect to cloud storage</source>
- <translation>Kan ikke koble til skylagring</translation>
- </message>
- <message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="774"/>
- <source>Cloud credentials valid, loading dives...</source>
- <translation>Gyldig bruker/passord, henter dykk</translation>
- </message>
- <message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="783"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="667"/>
<source>Cloud storage error: %1</source>
<translation>Feil i skylagring: %1</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="829"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="713"/>
<source>Loading dives from local storage (&apos;no cloud&apos; mode)</source>
<translation>Henter dykk fra lokalt lager (&apos;ikke-sky-modus&quot;)</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="875"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="759"/>
<source>Failed to connect to cloud server, reverting to no cloud status</source>
<translation>Fikk ikke koblet til skylagring, skrur tilbake til lokal modus</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="897"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="781"/>
<source>Cloud storage open successfully. No dives in dive list.</source>
<translation>Tilkobling til skylagring OK. Ingen dykk i lista.</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1082"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1083"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="966"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="967"/>
<source>h</source>
<translation>t</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1082"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1083"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1084"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="966"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="967"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="968"/>
<source>min</source>
<translation>min</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1082"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="966"/>
<source>sec</source>
<translation>sek</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1186"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="1070"/>
<source>weight</source>
<translation>Vekt</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1471"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="1355"/>
<source>Fatal error: cannot save data file. Please copy log file and report.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1660"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="1544"/>
<source>Unknown GPS location</source>
<translation>Ukjent GPS-posisjon</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1878"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="1762"/>
<source>no default cylinder</source>
<translation type="unfinished"/>
</message>
@@ -9182,12 +9141,12 @@ Eksporter denne templaten til en annen fil.</translation>
<context>
<name>RemoveWeight</name>
<message>
- <location filename="../commands/command_edit.cpp" line="1076"/>
+ <location filename="../commands/command_edit.cpp" line="1057"/>
<source>Remove weight</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../commands/command_edit.cpp" line="1078"/>
+ <location filename="../commands/command_edit.cpp" line="1059"/>
<source>Remove weight (%n dive(s))</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -9232,12 +9191,12 @@ Eksporter denne templaten til en annen fil.</translation>
<context>
<name>ReplanDive</name>
<message>
- <location filename="../commands/command_edit.cpp" line="944"/>
+ <location filename="../commands/command_edit.cpp" line="925"/>
<source>Replan dive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../commands/command_edit.cpp" line="944"/>
+ <location filename="../commands/command_edit.cpp" line="925"/>
<source>Edit profile</source>
<translation type="unfinished"/>
</message>
@@ -12092,7 +12051,7 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen.
<translation>Ingen dykk lastet ned fra dykkecomputer</translation>
</message>
<message>
- <location filename="../core/load-git.c" line="170"/>
+ <location filename="../core/load-git.c" line="173"/>
<location filename="../core/parse-xml.c" line="1229"/>
<source>multiple GPS locations for this dive site; also %s
</source>
@@ -12100,20 +12059,20 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen.
</translation>
</message>
<message>
- <location filename="../core/load-git.c" line="195"/>
- <location filename="../core/parse.c" line="441"/>
+ <location filename="../core/load-git.c" line="198"/>
+ <location filename="../core/parse.c" line="436"/>
<source>additional name for site: %s
</source>
<translation>ytterligere navn for sted: %s
</translation>
</message>
<message>
- <location filename="../core/load-git.c" line="1703"/>
+ <location filename="../core/load-git.c" line="1706"/>
<source>Load dives from local cache</source>
<translation>Last inn dykk fra lokal cache</translation>
</message>
<message>
- <location filename="../core/load-git.c" line="1707"/>
+ <location filename="../core/load-git.c" line="1710"/>
<source>Successfully opened dive data</source>
<translation>Åpnet dykkelogg</translation>
</message>