diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-09-14 21:05:39 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-09-14 21:10:24 -0700 |
| commit | 3abb70855ca55b1e2e71a6d4caab32db2983cead (patch) | |
| tree | 00dae637e1f24a28a40d70866b9d7b16c72daa3b /translations | |
| parent | 2dd52b492127047aa9169acc53aa2e32f72ec7f4 (diff) | |
| download | subsurface-3abb70855ca55b1e2e71a6d4caab32db2983cead.tar.gz | |
Latest translations
And update latest translation sources (which have been pushed to
transifex).
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations')
| -rw-r--r-- | translations/subsurface_cs.ts | 38 | ||||
| -rw-r--r-- | translations/subsurface_en_GB.ts | 10 | ||||
| -rw-r--r-- | translations/subsurface_es_ES.ts | 20 | ||||
| -rw-r--r-- | translations/subsurface_it_IT.ts | 223 | ||||
| -rw-r--r-- | translations/subsurface_nb_NO.ts | 400 | ||||
| -rw-r--r-- | translations/subsurface_pt_PT.ts | 23 | ||||
| -rw-r--r-- | translations/subsurface_ru_RU.ts | 74 | ||||
| -rw-r--r-- | translations/subsurface_source.ts | 1097 |
8 files changed, 957 insertions, 928 deletions
diff --git a/translations/subsurface_cs.ts b/translations/subsurface_cs.ts index be95d8c9c..576e35af0 100644 --- a/translations/subsurface_cs.ts +++ b/translations/subsurface_cs.ts @@ -4,13 +4,13 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="14"/> <source>Remote Bluetooth device selection</source> - <translation type="unfinished"/> + <translation>Výběr vzdáleného zařízení Bluetooth</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="32"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="28"/> <source>Discovered devices</source> - <translation type="unfinished"/> + <translation>Objevená zařízení</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="41"/> @@ -22,36 +22,36 @@ <location filename="../qt-ui/btdeviceselectiondialog.ui" line="54"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="32"/> <source>Quit</source> - <translation type="unfinished"/> + <translation>Ukončit</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="83"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="29"/> <source>Scan</source> - <translation type="unfinished"/> + <translation>Prohledat</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="96"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="30"/> <source>Clear</source> - <translation type="unfinished"/> + <translation>Vyprázdnit</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="119"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="22"/> <source>Local Bluetooth device details</source> - <translation type="unfinished"/> + <translation>Podrobnosti místního zařízení Bluetooth</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="128"/> <source>Name: </source> - <translation type="unfinished"/> + <translation>Název:</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="142"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="24"/> <source>Address:</source> - <translation type="unfinished"/> + <translation>Adresa:</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="171"/> @@ -63,18 +63,18 @@ <location filename="../qt-ui/btdeviceselectiondialog.ui" line="193"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="27"/> <source>Turn on/off</source> - <translation type="unfinished"/> + <translation>Zapnout/Vypnout</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="203"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="23"/> <source>Select device:</source> - <translation type="unfinished"/> + <translation>Vybraná zařízení:</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="25"/> <source>Name:</source> - <translation type="unfinished"/> + <translation>Název:</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="128"/> @@ -120,7 +120,7 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="230"/> <source>%1 (%2) [State: %3]</source> - <translation type="unfinished"/> + <translation>%1 (%2) [Stav: %3]</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="247"/> @@ -162,12 +162,12 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/> <source>turned on</source> - <translation type="unfinished"/> + <translation>zapnuto</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/> <source>turned off</source> - <translation type="unfinished"/> + <translation>vypnuto</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="301"/> @@ -207,7 +207,7 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="384"/> <source>Local device error: %1.</source> - <translation type="unfinished"/> + <translation>Chyba místního zařízení: %1</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="385"/> @@ -217,7 +217,7 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="387"/> <source>Unknown error</source> - <translation type="unfinished"/> + <translation>Neznámá chyba</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="396"/> @@ -237,12 +237,12 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="410"/> <source>Device discovery error: %1.</source> - <translation type="unfinished"/> + <translation>Chyba při zjišťování zařízení: %1.</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="438"/> <source>Not available</source> - <translation type="unfinished"/> + <translation>Nedostupné</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="445"/> @@ -4713,7 +4713,7 @@ ze vzduchu a následujících plynů:</translation> <message> <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Scan</source> - <translation type="unfinished"/> + <translation>Prohledat</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="452"/> diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index ccb85c372..177ca5289 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -4822,7 +4822,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <message> <location filename="../qt-ui/mainwindow.cpp" line="697"/> <source>Trying to replan a dive that's not a planned dive.</source> - <translation type="unfinished"/> + <translation>Trying to replan a dive that's not a planned dive.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="821"/> @@ -7959,12 +7959,12 @@ Maximum</translation> <message> <location filename="../planner.c" line="556"/> <source>based on VPM-B at nominal conservatism</source> - <translation type="unfinished"/> + <translation>based on VPM-B at nominal conservatism</translation> </message> <message> <location filename="../planner.c" line="558"/> <source>based on VPM-B at +%d conservatism</source> - <translation type="unfinished"/> + <translation>based on VPM-B at +%d conservatism</translation> </message> <message> <location filename="../planner.c" line="781"/> @@ -8724,7 +8724,9 @@ and click 'Retry'</translation> <source>Uemis Zurich: the file system is full. Disconnect/reconnect the dive computer and click Retry</source> - <translation type="unfinished"/> + <translation>Uemis Zurich: the file system is full. +Disconnect/reconnect the dive computer +and click Retry</translation> </message> <message> <location filename="../uemis-downloader.c" line="29"/> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index 9fb2b4a72..c23ec6437 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -1060,7 +1060,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="893"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/> <source>Flip screen</source> - <translation>Plegar pantalla</translation> + <translation>Girar pantalla</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="900"/> @@ -4823,7 +4823,7 @@ Subsurface ya ha intentado cargar los datos pero puede que merezca la pena perde <message> <location filename="../qt-ui/mainwindow.cpp" line="697"/> <source>Trying to replan a dive that's not a planned dive.</source> - <translation type="unfinished"/> + <translation>Se está intentando re-planificar un buceo que no ha sido planificado</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="821"/> @@ -4844,12 +4844,12 @@ Subsurface ya ha intentado cargar los datos pero puede que merezca la pena perde <message> <location filename="../build/ui_mainwindow.h" line="565"/> <source>Open cloud storage</source> - <translation>Abrir almacenamiento en la nube</translation> + <translation>Abrir registro en la nube</translation> </message> <message> <location filename="../build/ui_mainwindow.h" line="566"/> <source>Save to cloud storage</source> - <translation>Guardar en almacenamiento en la nube</translation> + <translation>Guardar registro en la nube</translation> </message> </context> <context> @@ -5524,7 +5524,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos <location filename="../qt-ui/preferences.ui" line="767"/> <location filename="../build/ui_preferences.h" line="1350"/> <source>decimal</source> - <translation>decimal</translation> + <translation>Decimal</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="829"/> @@ -7961,12 +7961,12 @@ Media</translation> <message> <location filename="../planner.c" line="556"/> <source>based on VPM-B at nominal conservatism</source> - <translation type="unfinished"/> + <translation>basado en VPM-B sin conservadurismo</translation> </message> <message> <location filename="../planner.c" line="558"/> <source>based on VPM-B at +%d conservatism</source> - <translation type="unfinished"/> + <translation>basado en VPM-B con +%d conservadurismo</translation> </message> <message> <location filename="../planner.c" line="781"/> @@ -8726,7 +8726,9 @@ y pulse 'Reintentar'</translation> <source>Uemis Zurich: the file system is full. Disconnect/reconnect the dive computer and click Retry</source> - <translation type="unfinished"/> + <translation>Uemis Zurich: el sistema de archivos está lleno. +Desconecta/conecta el ordenador de buceo +y pulsa Reintentar</translation> </message> <message> <location filename="../uemis-downloader.c" line="29"/> @@ -9630,7 +9632,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/plannerSettings.ui" line="492"/> <source>Conservatism level</source> - <translation>Nivel de conservatismo</translation> + <translation>Nivel de conservadurismo</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="605"/> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index 67b037d5f..c27f2e996 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -4,13 +4,13 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="14"/> <source>Remote Bluetooth device selection</source> - <translation type="unfinished"/> + <translation>Selezione del device Bluetooth remoto</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="32"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="28"/> <source>Discovered devices</source> - <translation type="unfinished"/> + <translation>Dispositivi rilevati</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="41"/> @@ -28,87 +28,87 @@ <location filename="../qt-ui/btdeviceselectiondialog.ui" line="83"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="29"/> <source>Scan</source> - <translation type="unfinished"/> + <translation>Scansione</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="96"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="30"/> <source>Clear</source> - <translation type="unfinished"/> + <translation>Cancella</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="119"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="22"/> <source>Local Bluetooth device details</source> - <translation type="unfinished"/> + <translation>Dettagli dispositivi Bluetooth locali</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="128"/> <source>Name: </source> - <translation type="unfinished"/> + <translation>Nome:</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="142"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="24"/> <source>Address:</source> - <translation type="unfinished"/> + <translation>Indirizzo:</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="171"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="26"/> <source>Bluetooth powered on</source> - <translation type="unfinished"/> + <translation>Bluetooth acceso</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="193"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="27"/> <source>Turn on/off</source> - <translation type="unfinished"/> + <translation>Accendi/spegni</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="203"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="23"/> <source>Select device:</source> - <translation type="unfinished"/> + <translation>Seleziona dispositivo:</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="25"/> <source>Name:</source> - <translation type="unfinished"/> + <translation>Nome:</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="128"/> <source>Trying to turn on the local Bluetooth device...</source> - <translation type="unfinished"/> + <translation>Tentativo di accensione del dispositivo Bluetooth...</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="131"/> <source>Trying to turn off the local Bluetooth device...</source> - <translation type="unfinished"/> + <translation>Tentativo di spegnimento del dispositivo Bluetooth...</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="177"/> <source>Scanning for remote devices...</source> - <translation type="unfinished"/> + <translation>Scansione dei dispositivi remoti...</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="186"/> <source>Scanning finished successfully.</source> - <translation type="unfinished"/> + <translation>Scansione finita correttamente.</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="219"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="333"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="353"/> <source>UNPAIRED</source> - <translation type="unfinished"/> + <translation>DISACCOPPIATO</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="223"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="338"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="351"/> <source>PAIRED</source> - <translation type="unfinished"/> + <translation>ACCOPPIATO</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="226"/> @@ -146,53 +146,53 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="50"/> <source>Could not initialize Winsock version 2.2</source> - <translation type="unfinished"/> + <translation>Impossibile inizializzare libreria Winsock 2.2</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="161"/> <source>Remote devices list was cleared.</source> - <translation type="unfinished"/> + <translation>La lista dei dispositivi remoti è stata cancellata.</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="202"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> - <translation type="unfinished"/> + <translation>Il dispositivo locale Bluetooth era %1.</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/> <source>turned on</source> - <translation type="unfinished"/> + <translation>acceso</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/> <source>turned off</source> - <translation type="unfinished"/> + <translation>spento</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="301"/> <source>Remove pairing</source> - <translation type="unfinished"/> + <translation>Rimuovi accoppiamento</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="317"/> <source>Trying to pair device %1</source> - <translation type="unfinished"/> + <translation>Tentativo di accoppiamento dispositivo %1</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="321"/> <source>Trying to unpair device %1</source> - <translation type="unfinished"/> + <translation>Tentativo disaccoppiamento dispositivo %1</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="334"/> <source>Device %1 was unpaired.</source> - <translation type="unfinished"/> + <translation>Dispositivo %1 era disaccoppiato</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="341"/> <source>Device %1 was paired.</source> - <translation type="unfinished"/> + <translation>Dispositivo %1 era accoppiato.</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="346"/> @@ -207,7 +207,7 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="384"/> <source>Local device error: %1.</source> - <translation type="unfinished"/> + <translation>Errore dispositivo locale: %1</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="385"/> @@ -217,7 +217,7 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="387"/> <source>Unknown error</source> - <translation type="unfinished"/> + <translation>Errore sconosciuto</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="396"/> @@ -242,12 +242,12 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="438"/> <source>Not available</source> - <translation type="unfinished"/> + <translation>Non disponibile</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="445"/> <source>The local Bluetooth adapter cannot be accessed.</source> - <translation type="unfinished"/> + <translation>Accesso negato all'adattatore Bluetooth locale.</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="495"/> @@ -431,17 +431,17 @@ <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/> <source>Sample sensor1 pO₂</source> - <translation type="unfinished"/> + <translation>Valore campione sensore1 pO2</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/> <source>Sample sensor2 pO₂</source> - <translation type="unfinished"/> + <translation>Valore campione sensore2 pO2</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/> <source>Sample sensor3 pO₂</source> - <translation type="unfinished"/> + <translation>Valore campione sensore3 pO2</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="42"/> @@ -1071,7 +1071,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="914"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2212"/> <source>Graphical speed indicator</source> - <translation type="unfinished"/> + <translation>Indicatore grafico di velocità</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="928"/> @@ -1345,7 +1345,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2219"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2235"/> <source> ℓ/min</source> - <translation type="unfinished"/> + <translation> ℓ/min</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1050"/> @@ -1746,7 +1746,7 @@ <location filename="../qt-ui/divecomponentselection.ui" line="73"/> <location filename="../build/ui_divecomponentselection.h" line="141"/> <source>Dive site</source> - <translation type="unfinished"/> + <translation>Luogo immersione</translation> </message> <message> <location filename="../qt-ui/divecomponentselection.ui" line="94"/> @@ -1822,7 +1822,7 @@ il computer selezionato?</translation> <message> <location filename="../qt-ui/profile/diveeventitem.cpp" line="116"/> <source>Manual switch to OC</source> - <translation type="unfinished"/> + <translation>Switch manuale a OC</translation> </message> <message> <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/> @@ -2038,12 +2038,12 @@ il computer selezionato?</translation> <message> <location filename="../qt-ui/divelistview.cpp" line="883"/> <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> + <translation>Carica immagine(i) da file(s)</translation> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="884"/> <source>Load image(s) from web</source> - <translation type="unfinished"/> + <translation>Carica immagine(i) dal web</translation> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="907"/> @@ -2124,13 +2124,13 @@ il computer selezionato?</translation> <location filename="../qt-ui/divelogexportdialog.ui" line="115"/> <location filename="../build/ui_divelogexportdialog.h" line="352"/> <source>Subsurface &XML</source> - <translation type="unfinished"/> + <translation>Subsurface &XML</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="147"/> <location filename="../build/ui_divelogexportdialog.h" line="354"/> <source>di&velogs.de</source> - <translation type="unfinished"/> + <translation>di&velogs.de</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="157"/> @@ -2190,7 +2190,7 @@ il computer selezionato?</translation> <location filename="../qt-ui/divelogexportdialog.ui" line="375"/> <location filename="../build/ui_divelogexportdialog.h" line="374"/> <source>All di&ves</source> - <translation type="unfinished"/> + <translation>Tutte le imme&rsioni</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="385"/> @@ -2202,7 +2202,7 @@ il computer selezionato?</translation> <location filename="../qt-ui/divelogexportdialog.ui" line="392"/> <location filename="../build/ui_divelogexportdialog.h" line="376"/> <source>Export photos</source> - <translation type="unfinished"/> + <translation>Esporta foto</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="408"/> @@ -2379,7 +2379,7 @@ il computer selezionato?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="199"/> <source>Please wait, exporting...</source> - <translation type="unfinished"/> + <translation>Prego attendere, esportazione in corso...</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="234"/> @@ -2560,21 +2560,21 @@ il computer selezionato?</translation> <location filename="../qt-ui/divelogimportdialog.cpp" line="670"/> <location filename="../qt-ui/divelogimportdialog.cpp" line="721"/> <source>Sample sensor1 pO₂</source> - <translation type="unfinished"/> + <translation>Valore campione sensore1 pO2</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="569"/> <location filename="../qt-ui/divelogimportdialog.cpp" line="672"/> <location filename="../qt-ui/divelogimportdialog.cpp" line="723"/> <source>Sample sensor2 pO₂</source> - <translation type="unfinished"/> + <translation>Valore campione sensore2 pO2</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="571"/> <location filename="../qt-ui/divelogimportdialog.cpp" line="674"/> <location filename="../qt-ui/divelogimportdialog.cpp" line="725"/> <source>Sample sensor3 pO₂</source> - <translation type="unfinished"/> + <translation>Valore campione sensore3 pO2</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/> @@ -3484,7 +3484,7 @@ invia il testo che segue ai programmatori. <message> <location filename="../qt-ui/kmessagewidget.cpp" line="91"/> <source>Close message</source> - <translation type="unfinished"/> + <translation>Chiudi messaggio</translation> </message> </context> <context> @@ -3720,7 +3720,7 @@ invia il testo che segue ai programmatori. <message> <location filename="../qt-ui/maintab.ui" line="214"/> <source>Edit dive site</source> - <translation type="unfinished"/> + <translation>Modifica il luogo di immersione</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="217"/> @@ -4717,7 +4717,7 @@ mixati con aria e usando: <message> <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Scan</source> - <translation type="unfinished"/> + <translation>Scansione</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="452"/> @@ -5006,7 +5006,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l'aggiorna <location filename="../qt-ui/preferences.ui" line="157"/> <location filename="../build/ui_preferences.h" line="1300"/> <source>Georeference</source> - <translation type="unfinished"/> + <translation>Georeferenza</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="217"/> @@ -5134,7 +5134,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l'aggiorna <location filename="../build/ui_preferences.h" line="1406"/> <location filename="../build/ui_preferences.h" line="1407"/> <source>/</source> - <translation type="unfinished"/> + <translation>/</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="531"/> @@ -5361,12 +5361,12 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l'aggiorna <location filename="../qt-ui/preferences.ui" line="1373"/> <location filename="../build/ui_preferences.h" line="1388"/> <source>Verification PIN</source> - <translation type="unfinished"/> + <translation>Verifica PIN</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1380"/> <source>New password</source> - <translation type="unfinished"/> + <translation>Nuova password</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1408"/> @@ -5378,7 +5378,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l'aggiorna <location filename="../qt-ui/preferences.ui" line="1415"/> <location filename="../build/ui_preferences.h" line="1396"/> <source>Save Password locally?</source> - <translation type="unfinished"/> + <translation>Salvo la password localemnte?</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1425"/> @@ -5468,19 +5468,19 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l'aggiorna <location filename="../qt-ui/preferences.ui" line="521"/> <location filename="../build/ui_preferences.h" line="1324"/> <source>&Metric</source> - <translation type="unfinished"/> + <translation>&Metrico</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="541"/> <location filename="../build/ui_preferences.h" line="1326"/> <source>Personali&ze</source> - <translation type="unfinished"/> + <translation>Personali&zza</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="554"/> <location filename="../build/ui_preferences.h" line="1327"/> <source>Individual settings</source> - <translation type="unfinished"/> + <translation>Impostazioni individuali</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="627"/> @@ -5673,12 +5673,12 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l'aggiorna <message> <location filename="../build/ui_printoptions.h" line="158"/> <source>One dive per page</source> - <translation type="unfinished"/> + <translation>Una immersione per pagina</translation> </message> <message> <location filename="../build/ui_printoptions.h" line="159"/> <source>Two dives per page</source> - <translation type="unfinished"/> + <translation>Due immersioni per pagina</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="41"/> @@ -5730,12 +5730,12 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l'aggiorna <message> <location filename="../qt-ui/printoptions.ui" line="141"/> <source>Export</source> - <translation type="unfinished"/> + <translation>Esporta</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="148"/> <source>Import</source> - <translation type="unfinished"/> + <translation>Importa</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="29"/> @@ -6586,27 +6586,27 @@ Not all images have timestamps in the range between <message> <location filename="../qt-ui/templateedit.ui" line="112"/> <source>Arial</source> - <translation type="unfinished"/> + <translation>Arial</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="117"/> <source>Impact</source> - <translation type="unfinished"/> + <translation>Impact</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="122"/> <source>Georgia</source> - <translation type="unfinished"/> + <translation>Georgia</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="127"/> <source>Courier</source> - <translation type="unfinished"/> + <translation>Courier</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="132"/> <source>Verdana</source> - <translation type="unfinished"/> + <translation>Verdana</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="144"/> @@ -6754,17 +6754,17 @@ Not all images have timestamps in the range between <message> <location filename="../tests/testparse.cpp" line="304"/> <source>Sample sensor1 pO₂</source> - <translation type="unfinished"/> + <translation>Valore campione sensore1 pO2</translation> </message> <message> <location filename="../tests/testparse.cpp" line="306"/> <source>Sample sensor2 pO₂</source> - <translation type="unfinished"/> + <translation>Valore campione sensore2 pO2</translation> </message> <message> <location filename="../tests/testparse.cpp" line="308"/> <source>Sample sensor3 pO₂</source> - <translation type="unfinished"/> + <translation>Valore campione sensore3 pO2</translation> </message> <message> <location filename="../tests/testparse.cpp" line="310"/> @@ -7015,7 +7015,7 @@ Sistema operativo: %1</translation> <location filename="../qt-ui/usersurvey.cpp" line="45"/> <source> CPU architecture: %1</source> - <translation>Architettura CPI: %1</translation> + <translation>Architettura CPU: %1</translation> </message> <message> <location filename="../qt-ui/usersurvey.cpp" line="47"/> @@ -7300,22 +7300,22 @@ Media</translation> <message> <location filename="../taxonomy.c" line="6"/> <source>None</source> - <translation type="unfinished"/> + <translation>Nessuno</translation> </message> <message> <location filename="../taxonomy.c" line="7"/> <source>Ocean</source> - <translation type="unfinished"/> + <translation>Ocean</translation> </message> <message> <location filename="../taxonomy.c" line="8"/> <source>Country</source> - <translation type="unfinished"/> + <translation>Nazione</translation> </message> <message> <location filename="../taxonomy.c" line="9"/> <source>State</source> - <translation type="unfinished"/> + <translation>Stato</translation> </message> <message> <location filename="../taxonomy.c" line="10"/> @@ -7325,12 +7325,12 @@ Media</translation> <message> <location filename="../taxonomy.c" line="11"/> <source>Town</source> - <translation type="unfinished"/> + <translation>Città</translation> </message> <message> <location filename="../taxonomy.c" line="12"/> <source>City</source> - <translation type="unfinished"/> + <translation>Città</translation> </message> </context> <context> @@ -7338,7 +7338,7 @@ Media</translation> <message> <location filename="../libdivecomputer.c" line="640"/> <source>Error parsing the header</source> - <translation type="unfinished"/> + <translation>Errore nel parsing dell'intestazione</translation> </message> </context> <context> @@ -7417,7 +7417,7 @@ Media</translation> <message> <location filename="../dive.c" line="1558"/> <source>(%s) or (%s)</source> - <translation>(%s) oder (%s)</translation> + <translation>(%s) o (%s)</translation> </message> <message> <location filename="../divelist.c" line="482"/> @@ -7470,7 +7470,7 @@ Media</translation> <message> <location filename="../file.c" line="458"/> <source>Empty file '%s'</source> - <translation type="unfinished"/> + <translation>File vuoto '%s'</translation> </message> <message> <location filename="../file.c" line="638"/> @@ -8162,7 +8162,8 @@ EADD: %d%s <location filename="../profile.c" line="1201"/> <source>RBT: %umin </source> - <translation type="unfinished"/> + <translation>RBT: %umin +</translation> </message> <message> <location filename="../profile.c" line="1204"/> @@ -8175,7 +8176,8 @@ EADD: %d%s <location filename="../profile.c" line="1210"/> <source>Tissue %.0fmin: %.1f%s </source> - <translation type="unfinished"/> + <translation>Tessuti %.0fmin: %.1f%s +</translation> </message> <message> <location filename="../profile.c" line="1216"/> @@ -8236,22 +8238,22 @@ EADD: %d%s <message> <location filename="../qthelper.cpp" line="309"/> <source>%1km</source> - <translation type="unfinished"/> + <translation>%1km</translation> </message> <message> <location filename="../qthelper.cpp" line="311"/> <source>%1m</source> - <translation type="unfinished"/> + <translation>%1m</translation> </message> <message> <location filename="../qthelper.cpp" line="315"/> <source>%1mi</source> - <translation type="unfinished"/> + <translation>%1mi</translation> </message> <message> <location filename="../qthelper.cpp" line="317"/> <source>%1yd</source> - <translation type="unfinished"/> + <translation>%1yd</translation> </message> <message> <location filename="../qthelper.cpp" line="853"/> @@ -8308,7 +8310,7 @@ EADD: %d%s <message> <location filename="../datatrak.c" line="437"/> <source>search</source> - <translation type="unfinished"/> + <translation>cerca</translation> </message> <message> <location filename="../datatrak.c" line="447"/> @@ -8367,32 +8369,32 @@ EADD: %d%s <message> <location filename="../datatrak.c" line="284"/> <source>fog</source> - <translation type="unfinished"/> + <translation>nebbia</translation> </message> <message> <location filename="../datatrak.c" line="287"/> <source>rain</source> - <translation type="unfinished"/> + <translation>pioggia</translation> </message> <message> <location filename="../datatrak.c" line="290"/> <source>storm</source> - <translation type="unfinished"/> + <translation>temporale</translation> </message> <message> <location filename="../datatrak.c" line="293"/> <source>snow</source> - <translation type="unfinished"/> + <translation>neve</translation> </message> <message> <location filename="../datatrak.c" line="313"/> <source>No suit</source> - <translation type="unfinished"/> + <translation>Nessuna muta</translation> </message> <message> <location filename="../datatrak.c" line="316"/> <source>Shorty</source> - <translation type="unfinished"/> + <translation>Muta corta</translation> </message> <message> <location filename="../datatrak.c" line="319"/> @@ -8402,17 +8404,17 @@ EADD: %d%s <message> <location filename="../datatrak.c" line="322"/> <source>Wet suit</source> - <translation type="unfinished"/> + <translation>Muta umida</translation> </message> <message> <location filename="../datatrak.c" line="325"/> <source>Semidry suit</source> - <translation type="unfinished"/> + <translation>Muta semistagna</translation> </message> <message> <location filename="../datatrak.c" line="328"/> <source>Dry suit</source> - <translation type="unfinished"/> + <translation>Muta stagna</translation> </message> <message> <location filename="../datatrak.c" line="388"/> @@ -8438,7 +8440,7 @@ EADD: %d%s <message> <location filename="../datatrak.c" line="398"/> <source>salt water</source> - <translation type="unfinished"/> + <translation>acqua salata</translation> </message> <message> <location filename="../datatrak.c" line="423"/> @@ -8458,37 +8460,37 @@ EADD: %d%s <message> <location filename="../datatrak.c" line="455"/> <source>other</source> - <translation type="unfinished"/> + <translation>altro</translation> </message> <message> <location filename="../datatrak.c" line="466"/> <source>Other activities</source> - <translation type="unfinished"/> + <translation>Altre attività</translation> </message> <message> <location filename="../datatrak.c" line="490"/> <source>Datatrak/Wlog notes</source> - <translation type="unfinished"/> + <translation>Note Datatrak/Wlog</translation> </message> <message> <location filename="../datatrak.c" line="529"/> <source>Manually entered dive</source> - <translation type="unfinished"/> + <translation>Immersione inserita manualmente</translation> </message> <message> <location filename="../datatrak.c" line="580"/> <source>Unknown</source> - <translation type="unfinished"/> + <translation>Sconosiuto</translation> </message> <message> <location filename="../datatrak.c" line="662"/> <source>Error: couldn't open the file %s</source> - <translation type="unfinished"/> + <translation>Errore: impossibile aprire il file %s</translation> </message> <message> <location filename="../datatrak.c" line="675"/> <source>Error: no dive</source> - <translation type="unfinished"/> + <translation>Errore: nessuna immersione</translation> </message> <message> <location filename="../dive.c" line="26"/> @@ -9237,7 +9239,7 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <location filename="../git-access.c" line="206"/> <location filename="../git-access.c" line="210"/> <source>Remote storage and local data diverged. Error: can't get commit (%s)</source> - <translation type="unfinished"/> + <translation>Dati locali e dati remoti non coincidono. Errore: non è possibile salvare (%s)</translation> </message> <message> <location filename="../git-access.c" line="208"/> @@ -9282,7 +9284,7 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <message> <location filename="../git-access.c" line="259"/> <source>Failed to get author: (%s)</source> - <translation type="unfinished"/> + <translation>Errore nella lettura dell'autore: (%s)</translation> </message> <message> <location filename="../git-access.c" line="261"/> @@ -9302,7 +9304,7 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <message> <location filename="../git-access.c" line="509"/> <source>git clone of %s failed (%s)</source> - <translation type="unfinished"/> + <translation>Errore (%s) nel clone git di %s</translation> </message> <message> <location filename="../load-git.c" line="189"/> @@ -9315,7 +9317,8 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <location filename="../parse-xml.c" line="1302"/> <source>additional name for site: %s </source> - <translation type="unfinished"/> + <translation>nome addizionale per il sito: %s +</translation> </message> <message> <location filename="../ostctools.c" line="122"/> @@ -9326,7 +9329,7 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <message> <location filename="../ostctools.c" line="167"/> <source>Error - %s - parsing dive %d</source> - <translation type="unfinished"/> + <translation>Errore - %s - nel parsing dell'immersione %d</translation> </message> </context> <context> diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index b0838eaf2..2c6ccba00 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -63,7 +63,7 @@ <location filename="../qt-ui/btdeviceselectiondialog.ui" line="193"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="27"/> <source>Turn on/off</source> - <translation type="unfinished"/> + <translation>Skru av/på</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="203"/> @@ -146,33 +146,33 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="50"/> <source>Could not initialize Winsock version 2.2</source> - <translation type="unfinished"/> + <translation>Kunne ikke starte Winsock version 2.2</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="161"/> <source>Remote devices list was cleared.</source> - <translation type="unfinished"/> + <translation>Enhetsliste ble slettet.</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="202"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> - <translation type="unfinished"/> + <translation>Den lokale Bluetooth-enheten ble %1.</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/> <source>turned on</source> - <translation type="unfinished"/> + <translation>skrudd på</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/> <source>turned off</source> - <translation type="unfinished"/> + <translation>skrudd av</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="301"/> <source>Remove pairing</source> - <translation type="unfinished"/> + <translation>Fjern paring</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="317"/> @@ -227,7 +227,7 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="399"/> <source>Writing to or reading from the device resulted in an error.</source> - <translation type="unfinished"/> + <translation>Feil ved skriving til eller lesing fra enheten.</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="405"/> @@ -1332,12 +1332,12 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="907"/> <source>MOD warning</source> - <translation type="unfinished"/> + <translation>MOD-advarsel</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="921"/> <source>Dynamic ascent rate</source> - <translation type="unfinished"/> + <translation>Dynamisk oppstigningshastighet</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="974"/> @@ -1345,7 +1345,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2219"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2235"/> <source> ℓ/min</source> - <translation type="unfinished"/> + <translation> ℓ/min</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1050"/> @@ -2378,7 +2378,7 @@ <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="199"/> <source>Please wait, exporting...</source> - <translation type="unfinished"/> + <translation>Vent, eksporterer...</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="234"/> @@ -3612,28 +3612,29 @@ send gjerne følgende til utvikleren. <location filename="../qt-ui/locationinformation.cpp" line="28"/> <location filename="../qt-ui/locationinformation.cpp" line="209"/> <source>Dive site management</source> - <translation type="unfinished"/> + <translation>Dykkestedsdatabase</translation> </message> <message> <location filename="../qt-ui/locationinformation.cpp" line="61"/> <source>Merge dive Sites</source> - <translation type="unfinished"/> + <translation>Slå sammen steder</translation> </message> <message> <location filename="../qt-ui/locationinformation.cpp" line="70"/> <source>Merging dive sites</source> - <translation type="unfinished"/> + <translation>Slå sammen steder</translation> </message> <message> <location filename="../qt-ui/locationinformation.cpp" line="71"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> - <translation type="unfinished"/> + <translation>Du er i ferd med å slå sammen steder, og du kan ikke angre +Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../qt-ui/locationinformation.cpp" line="216"/> <source>You are editing a dive site</source> - <translation type="unfinished"/> + <translation>Du redigerer et dykkested</translation> </message> </context> <context> @@ -3719,12 +3720,12 @@ send gjerne følgende til utvikleren. <location filename="../qt-ui/maintab.ui" line="21"/> <location filename="../build/ui_maintab.h" line="964"/> <source>General notes about the current selection</source> - <translation type="unfinished"/> + <translation>Notater om det som er valgt</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="214"/> <source>Edit dive site</source> - <translation type="unfinished"/> + <translation>Rediger dykkested</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="217"/> @@ -3742,7 +3743,7 @@ send gjerne følgende til utvikleren. <location filename="../qt-ui/maintab.ui" line="524"/> <location filename="../build/ui_maintab.h" line="966"/> <source>Used equipment in the current selection</source> - <translation type="unfinished"/> + <translation>Utstyr som brukes i det som er valgt</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="616"/> @@ -3796,7 +3797,7 @@ send gjerne følgende til utvikleren. <location filename="../qt-ui/maintab.ui" line="963"/> <location filename="../build/ui_maintab.h" line="1007"/> <source>Simple statistics about the selection</source> - <translation type="unfinished"/> + <translation>Statistikk om det som er valgt</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="1069"/> @@ -3814,7 +3815,7 @@ send gjerne følgende til utvikleren. <location filename="../qt-ui/maintab.ui" line="1181"/> <location filename="../build/ui_maintab.h" line="1009"/> <source>All photos from the current selection</source> - <translation type="unfinished"/> + <translation>Alle bilder i det som er valgt</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="1207"/> @@ -3826,7 +3827,7 @@ send gjerne følgende til utvikleren. <location filename="../qt-ui/maintab.ui" line="1210"/> <location filename="../build/ui_maintab.h" line="1011"/> <source>Adittional data from the dive computer</source> - <translation type="unfinished"/> + <translation>Ekstra data fra dykkecomputeren</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="92"/> @@ -4178,7 +4179,7 @@ fra luft og bruker: <location filename="../qt-ui/mainwindow.ui" line="146"/> <location filename="../build/ui_mainwindow.h" line="573"/> <source>&Edit</source> - <translation type="unfinished"/> + <translation>R&ediger</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="158"/> @@ -4287,13 +4288,13 @@ fra luft og bruker: <location filename="../qt-ui/mainwindow.ui" line="259"/> <location filename="../build/ui_mainwindow.h" line="488"/> <source>Edit device &names</source> - <translation type="unfinished"/> + <translation>Rediger device&navn</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="272"/> <location filename="../build/ui_mainwindow.h" line="491"/> <source>&Edit dive</source> - <translation type="unfinished"/> + <translation>R&ediger dykk</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="277"/> @@ -4407,7 +4408,7 @@ fra luft og bruker: <location filename="../qt-ui/mainwindow.ui" line="474"/> <location filename="../build/ui_mainwindow.h" line="539"/> <source>Edit &dive in planner</source> - <translation type="unfinished"/> + <translation>Rediger &dykk i planlegger</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="486"/> @@ -4462,53 +4463,53 @@ fra luft og bruker: <location filename="../build/ui_mainwindow.h" line="560"/> <location filename="../qt-ui/mainwindow.cpp" line="213"/> <source>&Undo</source> - <translation type="unfinished"/> + <translation>Angre</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="702"/> <location filename="../build/ui_mainwindow.h" line="561"/> <source>Ctrl+Z</source> - <translation type="unfinished"/> + <translation>Ctrl+Z</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="707"/> <location filename="../build/ui_mainwindow.h" line="562"/> <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>&Redo</source> - <translation type="unfinished"/> + <translation>Gjør om</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="710"/> <location filename="../build/ui_mainwindow.h" line="563"/> <source>Ctrl+Shift+Z</source> - <translation type="unfinished"/> + <translation>Ctrl+Shift+Z</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="715"/> <location filename="../build/ui_mainwindow.h" line="564"/> <source>&Find moved images</source> - <translation type="unfinished"/> + <translation>&Finn bilder som er flyttet</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="720"/> <source>Open c&loud storage</source> - <translation type="unfinished"/> + <translation>Åpne skylager</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="725"/> <source>Save to clo&ud storage</source> - <translation type="unfinished"/> + <translation>Lagre til skylager</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="730"/> <location filename="../build/ui_mainwindow.h" line="567"/> <source>&Manage dive sites</source> - <translation type="unfinished"/> + <translation>Dykkestedsdatabase</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="735"/> <source>Dive Site &Edit</source> - <translation type="unfinished"/> + <translation>R&ediger dykkested</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="677"/> @@ -4716,7 +4717,7 @@ fra luft og bruker: <message> <location filename="../qt-ui/mainwindow.cpp" line="441"/> <source>Traverse image directories</source> - <translation type="unfinished"/> + <translation>Gå gjennom bildekataloger</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="444"/> @@ -4726,7 +4727,7 @@ fra luft og bruker: <message> <location filename="../qt-ui/mainwindow.cpp" line="452"/> <source>Scanning images...(this can take a while)</source> - <translation type="unfinished"/> + <translation>Går gjennom bilder... (dette kan ta en stund)</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="505"/> @@ -4746,7 +4747,7 @@ fra luft og bruker: <message> <location filename="../qt-ui/mainwindow.cpp" line="774"/> <source>Trying to edit a dive that's not a manually added dive.</source> - <translation type="unfinished"/> + <translation>Prøver å redigere et dykk som ikke er lagt til manuelt.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="1032"/> @@ -4771,18 +4772,19 @@ fra luft og bruker: <message> <location filename="../qt-ui/mainwindow.cpp" line="1473"/> <source>[cloud storage for] %1</source> - <translation type="unfinished"/> + <translation>[skylager for] %1</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="1570"/> <source>Opening datafile from older version</source> - <translation type="unfinished"/> + <translation>Åpner datafil fra eldre versjon</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="1571"/> <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 type="unfinished"/> + <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="../qt-ui/mainwindow.cpp" line="1582"/> @@ -4792,7 +4794,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <message> <location filename="../qt-ui/mainwindow.cpp" line="1583"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source> - <translation type="unfinished"/> + <translation>Dykkeloggfiler (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran-filer (*.can *.CAN);;CSV-filer (*.csv *.CSV);;DiveLog.de-filer (*.dld *.DLD);;JDiveLog-filer (*.jlb *.JLB);;Liquivision-filer (*.lvd *.LVD);;MkVI-filer (*.txt *.TXT);;Suunto-filer (*.sde *.db *.SDE *.DB);;Divesoft-filer (*.dlf *.DLF);;UDDF-/UDCF-filer (*.uddf *.udcf *.UDDF *.UDCF);;XML-filer (*.xml *.XML);;APD-filer (*.apd *.APD);;Datatrak/WLog-filer (*.log *.LOG);;OSTCtools-filer (*.dive *.DIVE);;Alle filer (*)</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="1041"/> @@ -4819,7 +4821,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <message> <location filename="../qt-ui/mainwindow.cpp" line="697"/> <source>Trying to replan a dive that's not a planned dive.</source> - <translation type="unfinished"/> + <translation>Prøver å re-planlegge et dykk som ikke allerede er et planlagt dykk.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="821"/> @@ -4840,12 +4842,12 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <message> <location filename="../build/ui_mainwindow.h" line="565"/> <source>Open cloud storage</source> - <translation type="unfinished"/> + <translation>Åpne skylager</translation> </message> <message> <location filename="../build/ui_mainwindow.h" line="566"/> <source>Save to cloud storage</source> - <translation type="unfinished"/> + <translation>Lagre til skyen</translation> </message> </context> <context> @@ -5010,7 +5012,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <location filename="../qt-ui/preferences.ui" line="157"/> <location filename="../build/ui_preferences.h" line="1300"/> <source>Georeference</source> - <translation type="unfinished"/> + <translation>Geo-referanse</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="217"/> @@ -5034,25 +5036,25 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <location filename="../qt-ui/preferences.ui" line="273"/> <location filename="../build/ui_preferences.h" line="1308"/> <source>No default file</source> - <translation type="unfinished"/> + <translation>Ingen forhåndsvalgt fil</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="283"/> <location filename="../build/ui_preferences.h" line="1309"/> <source>&Local default file</source> - <translation type="unfinished"/> + <translation>&Lokal forhåndsvalgt fil</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="293"/> <location filename="../build/ui_preferences.h" line="1310"/> <source>Clo&ud storage default file</source> - <translation type="unfinished"/> + <translation>Forhåndsvalgt fil for skylager</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="305"/> <location filename="../build/ui_preferences.h" line="1311"/> <source>Local dive log file</source> - <translation type="unfinished"/> + <translation>Lokal dykkelogg</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="317"/> @@ -5094,7 +5096,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <location filename="../qt-ui/preferences.ui" line="508"/> <location filename="../build/ui_preferences.h" line="1322"/> <source>Unit system</source> - <translation type="unfinished"/> + <translation>Enhetssystem</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="514"/> @@ -5106,31 +5108,31 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <location filename="../qt-ui/preferences.ui" line="1572"/> <location filename="../build/ui_preferences.h" line="1401"/> <source>Dive site geo lookup</source> - <translation type="unfinished"/> + <translation>Geo-oppslag av dykkested</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1578"/> <location filename="../build/ui_preferences.h" line="1402"/> <source>Enable geocoding for dive site management</source> - <translation type="unfinished"/> + <translation>Skru på geo-koding for dykkestedsdatabase</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1585"/> <location filename="../build/ui_preferences.h" line="1403"/> <source>Parse site without GPS data</source> - <translation type="unfinished"/> + <translation>Les inn sted uten GPS-data</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1592"/> <location filename="../build/ui_preferences.h" line="1404"/> <source>Same format for existing dives</source> - <translation type="unfinished"/> + <translation>Samme format for eksisterende dyk</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1602"/> <location filename="../build/ui_preferences.h" line="1405"/> <source>Dive Site Layout</source> - <translation type="unfinished"/> + <translation>Dykkestedsoppsett</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1624"/> @@ -5138,7 +5140,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <location filename="../build/ui_preferences.h" line="1406"/> <location filename="../build/ui_preferences.h" line="1407"/> <source>/</source> - <translation type="unfinished"/> + <translation>/</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="531"/> @@ -5248,7 +5250,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <location filename="../qt-ui/preferences.ui" line="1127"/> <location filename="../build/ui_preferences.h" line="1372"/> <source>UI language</source> - <translation type="unfinished"/> + <translation>Språk i brukergrensesnitt</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1133"/> @@ -5353,7 +5355,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <location filename="../build/ui_preferences.h" line="1382"/> <location filename="../qt-ui/preferences.cpp" line="123"/> <source>Subsurface cloud storage</source> - <translation type="unfinished"/> + <translation>Skylager for Subsurface</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1359"/> @@ -5365,24 +5367,24 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <location filename="../qt-ui/preferences.ui" line="1373"/> <location filename="../build/ui_preferences.h" line="1388"/> <source>Verification PIN</source> - <translation type="unfinished"/> + <translation>Bekreftelses-PIN</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1380"/> <source>New password</source> - <translation type="unfinished"/> + <translation>Nytt passord</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1408"/> <location filename="../build/ui_preferences.h" line="1395"/> <source>Sync to cloud in the background?</source> - <translation type="unfinished"/> + <translation>Synkronisere til skylager i bakgrunnen?</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1415"/> <location filename="../build/ui_preferences.h" line="1396"/> <source>Save Password locally?</source> - <translation type="unfinished"/> + <translation>Lagre passord lokalt?</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1425"/> @@ -5472,25 +5474,25 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <location filename="../qt-ui/preferences.ui" line="521"/> <location filename="../build/ui_preferences.h" line="1324"/> <source>&Metric</source> - <translation type="unfinished"/> + <translation>&Metrisk</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="541"/> <location filename="../build/ui_preferences.h" line="1326"/> <source>Personali&ze</source> - <translation type="unfinished"/> + <translation>Personifiser</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="554"/> <location filename="../build/ui_preferences.h" line="1327"/> <source>Individual settings</source> - <translation type="unfinished"/> + <translation>Individuelle valg</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="627"/> <location filename="../build/ui_preferences.h" line="1335"/> <source>&liter</source> - <translation type="unfinished"/> + <translation>&liter</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="712"/> @@ -5508,19 +5510,19 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <location filename="../qt-ui/preferences.ui" line="750"/> <location filename="../build/ui_preferences.h" line="1348"/> <source>Location Display</source> - <translation type="unfinished"/> + <translation>Stedsvisning</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="757"/> <location filename="../build/ui_preferences.h" line="1349"/> <source>traditional (dms)</source> - <translation type="unfinished"/> + <translation>tradisjonell (dms)</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="767"/> <location filename="../build/ui_preferences.h" line="1350"/> <source>decimal</source> - <translation type="unfinished"/> + <translation>desimal</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="829"/> @@ -5609,7 +5611,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <message> <location filename="../qt-ui/preferences.cpp" line="120"/> <source>Subsurface cloud storage (credentials verified)</source> - <translation type="unfinished"/> + <translation>Skylager for Subsurface (bruker godkjent)</translation> </message> <message> <location filename="../qt-ui/preferences.cpp" line="329"/> @@ -5626,7 +5628,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <location filename="../qt-ui/preferences.cpp" line="382"/> <location filename="../qt-ui/preferences.cpp" line="395"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> - <translation type="unfinished"/> + <translation>Epost og passord for skylager kan bare bestå av bokstaver, tall og '.', '-', '_', og '+'.</translation> </message> <message> <location filename="../qt-ui/preferences.cpp" line="487"/> @@ -5677,24 +5679,24 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <message> <location filename="../build/ui_printoptions.h" line="158"/> <source>One dive per page</source> - <translation type="unfinished"/> + <translation>Ett dykk per side</translation> </message> <message> <location filename="../build/ui_printoptions.h" line="159"/> <source>Two dives per page</source> - <translation type="unfinished"/> + <translation>To dykk per side</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="41"/> <location filename="../build/ui_printoptions.h" line="149"/> <source>&Dive list print</source> - <translation type="unfinished"/> + <translation>Utskrift av liste over &dykk</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="57"/> <location filename="../build/ui_printoptions.h" line="151"/> <source>&Statistics print</source> - <translation type="unfinished"/> + <translation>Utskrift av &statistikk</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="67"/> @@ -5718,7 +5720,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <location filename="../qt-ui/printoptions.ui" line="102"/> <location filename="../build/ui_printoptions.h" line="155"/> <source>Template</source> - <translation type="unfinished"/> + <translation>Mal</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="127"/> @@ -5734,12 +5736,12 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <message> <location filename="../qt-ui/printoptions.ui" line="141"/> <source>Export</source> - <translation type="unfinished"/> + <translation>Eksport</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="148"/> <source>Import</source> - <translation type="unfinished"/> + <translation>Import</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="29"/> @@ -5750,7 +5752,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <message> <location filename="../qt-ui/printoptions.cpp" line="150"/> <source>Import template file</source> - <translation type="unfinished"/> + <translation>Importer mal</translation> </message> <message> <location filename="../qt-ui/printoptions.cpp" line="151"/> @@ -5761,7 +5763,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <message> <location filename="../qt-ui/printoptions.cpp" line="163"/> <source>Export template files as</source> - <translation type="unfinished"/> + <translation>Eksporter mal som</translation> </message> </context> <context> @@ -5887,7 +5889,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1257"/> <source>Edit the profile</source> - <translation type="unfinished"/> + <translation>Rediger profil</translation> </message> <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1261"/> @@ -6174,7 +6176,9 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal <source>Warning! Not all images have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</source> - <translation type="unfinished"/> + <translation>Advarsel! +Noen av bildene har datostempel 30 før eller etter +valgte dykk. </translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="173"/> @@ -6294,7 +6298,7 @@ Not all images have timestamps in the range between <message> <location filename="../build/ui_simpledivesiteedit.h" line="104"/> <source>Dive site quick edit. Hit ESC or click outside to close</source> - <translation type="unfinished"/> + <translation>Hurtigredigering av dykkested. Trykk ESC eller klikk utafor for å lukke.</translation> </message> </context> <context> @@ -6575,12 +6579,12 @@ Not all images have timestamps in the range between <message> <location filename="../qt-ui/templateedit.ui" line="37"/> <source>Preview</source> - <translation type="unfinished"/> + <translation>Forhåndsvisning</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="94"/> <source>Style</source> - <translation type="unfinished"/> + <translation>Stil</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="104"/> @@ -6590,27 +6594,27 @@ Not all images have timestamps in the range between <message> <location filename="../qt-ui/templateedit.ui" line="112"/> <source>Arial</source> - <translation type="unfinished"/> + <translation>Arial</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="117"/> <source>Impact</source> - <translation type="unfinished"/> + <translation>Impact</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="122"/> <source>Georgia</source> - <translation type="unfinished"/> + <translation>Georgia</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="127"/> <source>Courier</source> - <translation type="unfinished"/> + <translation>Courier</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="132"/> <source>Verdana</source> - <translation type="unfinished"/> + <translation>Verdana</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="144"/> @@ -6620,57 +6624,57 @@ Not all images have timestamps in the range between <message> <location filename="../qt-ui/templateedit.ui" line="14"/> <source>Edit template</source> - <translation type="unfinished"/> + <translation>Rediger mal</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="165"/> <source>Color palette</source> - <translation type="unfinished"/> + <translation>Fargepalett</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="173"/> <source>Default</source> - <translation type="unfinished"/> + <translation>Standardvalg</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="178"/> <source>Almond</source> - <translation type="unfinished"/> + <translation>Almond</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="183"/> <source>Shades of blue</source> - <translation type="unfinished"/> + <translation>Blånyanser</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="188"/> <source>Custom</source> - <translation type="unfinished"/> + <translation>Tilpasset</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="200"/> <source>Line spacing</source> - <translation type="unfinished"/> + <translation>Linjehøyde</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="241"/> <source>Template</source> - <translation type="unfinished"/> + <translation>Mal</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="264"/> <source>Colors</source> - <translation type="unfinished"/> + <translation>Farger</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="280"/> <source>Background</source> - <translation type="unfinished"/> + <translation>Bakgrun</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="293"/> <source>color1</source> - <translation type="unfinished"/> + <translation>farge1</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="303"/> @@ -6685,52 +6689,52 @@ Not all images have timestamps in the range between <message> <location filename="../qt-ui/templateedit.ui" line="320"/> <source>Table cells 1</source> - <translation type="unfinished"/> + <translation>Tabell-celler 1</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="333"/> <source>color2</source> - <translation type="unfinished"/> + <translation>farge2</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="360"/> <source>Table cells 2</source> - <translation type="unfinished"/> + <translation>Tabell-celler 2</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="373"/> <source>color3</source> - <translation type="unfinished"/> + <translation>farge3</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="400"/> <source>Text 1</source> - <translation type="unfinished"/> + <translation>Tekst 1</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="413"/> <source>color4</source> - <translation type="unfinished"/> + <translation>farge4</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="440"/> <source>Text 2</source> - <translation type="unfinished"/> + <translation>Tekst 2</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="453"/> <source>color5</source> - <translation type="unfinished"/> + <translation>farge5</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="480"/> <source>Borders</source> - <translation type="unfinished"/> + <translation>Kanter</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="493"/> <source>color6</source> - <translation type="unfinished"/> + <translation>farge6</translation> </message> </context> <context> @@ -6809,7 +6813,7 @@ Not all images have timestamps in the range between <message> <location filename="../qt-mobile/TopBar.qml" line="59"/> <source>Subsurface mobile</source> - <translation type="unfinished"/> + <translation>Subsurface mobil</translation> </message> </context> <context> @@ -6832,7 +6836,7 @@ Not all images have timestamps in the range between <location filename="../qt-ui/urldialog.ui" line="52"/> <location filename="../build/ui_urldialog.h" line="58"/> <source>Enter URL for images</source> - <translation type="unfinished"/> + <translation>Legg inn URL for bilder</translation> </message> </context> <context> @@ -7189,7 +7193,7 @@ Language: %1</source> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="518"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="549"/> <source>No error</source> - <translation type="unfinished"/> + <translation>Ingen feil</translation> </message> </context> <context> @@ -7304,37 +7308,37 @@ Snitt</translation> <message> <location filename="../taxonomy.c" line="6"/> <source>None</source> - <translation type="unfinished"/> + <translation>Ingen</translation> </message> <message> <location filename="../taxonomy.c" line="7"/> <source>Ocean</source> - <translation type="unfinished"/> + <translation>Hav</translation> </message> <message> <location filename="../taxonomy.c" line="8"/> <source>Country</source> - <translation type="unfinished"/> + <translation>Land</translation> </message> <message> <location filename="../taxonomy.c" line="9"/> <source>State</source> - <translation type="unfinished"/> + <translation>Stat</translation> </message> <message> <location filename="../taxonomy.c" line="10"/> <source>County</source> - <translation type="unfinished"/> + <translation>Fylke</translation> </message> <message> <location filename="../taxonomy.c" line="11"/> <source>Town</source> - <translation type="unfinished"/> + <translation>Tettsted</translation> </message> <message> <location filename="../taxonomy.c" line="12"/> <source>City</source> - <translation type="unfinished"/> + <translation>By</translation> </message> </context> <context> @@ -7342,7 +7346,7 @@ Snitt</translation> <message> <location filename="../libdivecomputer.c" line="640"/> <source>Error parsing the header</source> - <translation type="unfinished"/> + <translation>Kunne ikke lese header</translation> </message> </context> <context> @@ -7474,7 +7478,7 @@ Snitt</translation> <message> <location filename="../file.c" line="458"/> <source>Empty file '%s'</source> - <translation type="unfinished"/> + <translation>Tom fil '%s'</translation> </message> <message> <location filename="../file.c" line="638"/> @@ -7800,7 +7804,8 @@ Snitt</translation> <location filename="../parse-xml.c" line="1240"/> <source>multiple GPS locations for this dive site; also %s </source> - <translation type="unfinished"/> + <translation>Flere GPS-posisjoner for dette steder; også %s +</translation> </message> <message> <location filename="../parse-xml.c" line="2026"/> @@ -7856,17 +7861,17 @@ Snitt</translation> <message> <location filename="../planner.c" line="526"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> - <translation type="unfinished"/> + <translation>Advarsel: Dette er en ny implementasjon av %s og er en dykkeplan-implementasjon som bare har sett begrenset med testing. Vi anbefaler å ikke planlegge dykk utelukkende på bakgrunn av disse resultatene.</translation> </message> <message> <location filename="../planner.c" line="552"/> <source>based on Buhlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation type="unfinished"/> + <translation>basert på Buhlmann ZHL-16B med GFlow = %d og GFhigh = %d</translation> </message> <message> <location filename="../planner.c" line="560"/> <source>recreational mode based on Buhlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation type="unfinished"/> + <translation>rekreasjonsmodus basert på Bühlmann ZHL-16B med GFlow = %d og GFhigh = %d</translation> </message> <message> <location filename="../planner.c" line="577"/> @@ -7952,12 +7957,12 @@ Snitt</translation> <message> <location filename="../planner.c" line="556"/> <source>based on VPM-B at nominal conservatism</source> - <translation type="unfinished"/> + <translation>basert på VPM-B med standard konservatisme</translation> </message> <message> <location filename="../planner.c" line="558"/> <source>based on VPM-B at +%d conservatism</source> - <translation type="unfinished"/> + <translation>basert på VPM-B med +%d konservatisme</translation> </message> <message> <location filename="../planner.c" line="781"/> @@ -8165,7 +8170,8 @@ EADD: %d%s <location filename="../profile.c" line="1201"/> <source>RBT: %umin </source> - <translation type="unfinished"/> + <translation>RBT: %umin +</translation> </message> <message> <location filename="../profile.c" line="1204"/> @@ -8178,7 +8184,8 @@ EADD: %d%s <location filename="../profile.c" line="1210"/> <source>Tissue %.0fmin: %.1f%s </source> - <translation type="unfinished"/> + <translation>Vev %.0fmin: %.1f%s +</translation> </message> <message> <location filename="../profile.c" line="1216"/> @@ -8239,22 +8246,22 @@ EADD: %d%s <message> <location filename="../qthelper.cpp" line="309"/> <source>%1km</source> - <translation type="unfinished"/> + <translation>%1km</translation> </message> <message> <location filename="../qthelper.cpp" line="311"/> <source>%1m</source> - <translation type="unfinished"/> + <translation>%1m</translation> </message> <message> <location filename="../qthelper.cpp" line="315"/> <source>%1mi</source> - <translation type="unfinished"/> + <translation>%1mi</translation> </message> <message> <location filename="../qthelper.cpp" line="317"/> <source>%1yd</source> - <translation type="unfinished"/> + <translation>%1yd</translation> </message> <message> <location filename="../qthelper.cpp" line="853"/> @@ -8311,7 +8318,7 @@ EADD: %d%s <message> <location filename="../datatrak.c" line="437"/> <source>search</source> - <translation type="unfinished"/> + <translation>søk</translation> </message> <message> <location filename="../datatrak.c" line="447"/> @@ -8355,82 +8362,82 @@ EADD: %d%s <message> <location filename="../datatrak.c" line="145"/> <source>Error: the file does not appear to be a DATATRAK divelog</source> - <translation type="unfinished"/> + <translation>Feil: dette ser ikke ut til å være en DATATRAK-fil</translation> </message> <message> <location filename="../datatrak.c" line="278"/> <source>clear</source> - <translation type="unfinished"/> + <translation>klart</translation> </message> <message> <location filename="../datatrak.c" line="281"/> <source>misty</source> - <translation type="unfinished"/> + <translation>lett tåke</translation> </message> <message> <location filename="../datatrak.c" line="284"/> <source>fog</source> - <translation type="unfinished"/> + <translation>tåke</translation> </message> <message> <location filename="../datatrak.c" line="287"/> <source>rain</source> - <translation type="unfinished"/> + <translation>regn</translation> </message> <message> <location filename="../datatrak.c" line="290"/> <source>storm</source> - <translation type="unfinished"/> + <translation>storm</translation> </message> <message> <location filename="../datatrak.c" line="293"/> <source>snow</source> - <translation type="unfinished"/> + <translation>sn</translation> </message> <message> <location filename="../datatrak.c" line="313"/> <source>No suit</source> - <translation type="unfinished"/> + <translation>Ingen drakt</translation> </message> <message> <location filename="../datatrak.c" line="316"/> <source>Shorty</source> - <translation type="unfinished"/> + <translation>Shorty</translation> </message> <message> <location filename="../datatrak.c" line="319"/> <source>Combi</source> - <translation type="unfinished"/> + <translation>Kombi</translation> </message> <message> <location filename="../datatrak.c" line="322"/> <source>Wet suit</source> - <translation type="unfinished"/> + <translation>Våtdrakt</translation> </message> <message> <location filename="../datatrak.c" line="325"/> <source>Semidry suit</source> - <translation type="unfinished"/> + <translation>Semidry</translation> </message> <message> <location filename="../datatrak.c" line="328"/> <source>Dry suit</source> - <translation type="unfinished"/> + <translation>Tørrdrakt</translation> </message> <message> <location filename="../datatrak.c" line="388"/> <source>no stop</source> - <translation type="unfinished"/> + <translation>ingen stop</translation> </message> <message> <location filename="../datatrak.c" line="392"/> <source>single ascent</source> - <translation type="unfinished"/> + <translation>enkel oppstigning</translation> </message> <message> <location filename="../datatrak.c" line="394"/> <source>multiple ascent</source> - <translation type="unfinished"/> + <translation>flere oppstigninger</translation> </message> <message> <location filename="../datatrak.c" line="396"/> @@ -8441,57 +8448,57 @@ EADD: %d%s <message> <location filename="../datatrak.c" line="398"/> <source>salt water</source> - <translation type="unfinished"/> + <translation>saltvan</translation> </message> <message> <location filename="../datatrak.c" line="423"/> <source>sight seeing</source> - <translation type="unfinished"/> + <translation>sightseeing</translation> </message> <message> <location filename="../datatrak.c" line="425"/> <source>club dive</source> - <translation type="unfinished"/> + <translation>klubbdyk</translation> </message> <message> <location filename="../datatrak.c" line="429"/> <source>instruction</source> - <translation type="unfinished"/> + <translation>instruksjon</translation> </message> <message> <location filename="../datatrak.c" line="455"/> <source>other</source> - <translation type="unfinished"/> + <translation>annet</translation> </message> <message> <location filename="../datatrak.c" line="466"/> <source>Other activities</source> - <translation type="unfinished"/> + <translation>Andre aktiviteter</translation> </message> <message> <location filename="../datatrak.c" line="490"/> <source>Datatrak/Wlog notes</source> - <translation type="unfinished"/> + <translation>Datatrak/Wlog-notater</translation> </message> <message> <location filename="../datatrak.c" line="529"/> <source>Manually entered dive</source> - <translation type="unfinished"/> + <translation>Dykk lagt inn manuelt</translation> </message> <message> <location filename="../datatrak.c" line="580"/> <source>Unknown</source> - <translation type="unfinished"/> + <translation>Ukjent</translation> </message> <message> <location filename="../datatrak.c" line="662"/> <source>Error: couldn't open the file %s</source> - <translation type="unfinished"/> + <translation>Feil: kunne ikke åpne %s</translation> </message> <message> <location filename="../datatrak.c" line="675"/> <source>Error: no dive</source> - <translation type="unfinished"/> + <translation>Feil: Ikke noe dykk</translation> </message> <message> <location filename="../dive.c" line="26"/> @@ -8715,7 +8722,10 @@ og trykk 'Prøv igjen'</translation> <source>Uemis Zurich: the file system is full. Disconnect/reconnect the dive computer and click Retry</source> - <translation type="unfinished"/> + <translation>Uemis Zurich: filsystemet er fullt. +Koble fra og til dykkecomputeren +og klikk Prøv igjen +</translation> </message> <message> <location filename="../uemis-downloader.c" line="29"/> @@ -9240,96 +9250,98 @@ Er Uemis Zurich plugget i ordentlig?</translation> <location filename="../git-access.c" line="206"/> <location filename="../git-access.c" line="210"/> <source>Remote storage and local data diverged. Error: can't get commit (%s)</source> - <translation type="unfinished"/> + <translation>Skylager og lokal data avviker. Feil: Kan ikke hente commit (%s)</translation> </message> <message> <location filename="../git-access.c" line="208"/> <source>Remote storage and local data diverged. Error: failed local tree lookup (%s)</source> - <translation type="unfinished"/> + <translation>Skylager og lokal data avviker. Feil: failed local tree lookup (%s)</translation> </message> <message> <location filename="../git-access.c" line="212"/> <source>Remote storage and local data diverged. Error: failed remote tree lookup (%s)</source> - <translation type="unfinished"/> + <translation>Skylager og lokal data avviker. Feil: failed remote tree lookup (%s)</translation> </message> <message> <location filename="../git-access.c" line="214"/> <source>Remote storage and local data diverged. Error: can't get commit: (%s)</source> - <translation type="unfinished"/> + <translation>Skylager og lokal data avviker. Feil: Kan ikke hente commit (%s)</translation> </message> <message> <location filename="../git-access.c" line="216"/> <source>Remote storage and local data diverged. Error: failed base tree lookup: (%s)</source> - <translation type="unfinished"/> + <translation>Skylager og lokal data avviker. Feil: failed base tree lookup: (%s)</translation> </message> <message> <location filename="../git-access.c" line="218"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> - <translation type="unfinished"/> + <translation>Skylager og lokal data avviker. Feil: merge failed (%s)</translation> </message> <message> <location filename="../git-access.c" line="247"/> <source>Remote storage and local data diverged. Error: merge conflict - manual intervention needed</source> - <translation type="unfinished"/> + <translation>Skylager og lokal data avviker. Feil: merge conflict - manual intervention needed (%s)</translation> </message> <message> <location filename="../git-access.c" line="255"/> <source>Remote storage and local data diverged. Error: writing the tree failed (%s)</source> - <translation type="unfinished"/> + <translation>Skylager og lokal data avviker. Feil: writing the tree failed (%s)</translation> </message> <message> <location filename="../git-access.c" line="257"/> <source>Remote storage and local data diverged. Error: tree lookup failed (%s)</source> - <translation type="unfinished"/> + <translation>Skylager og lokal data avviker. Feil: tree lookup failed (%s)</translation> </message> <message> <location filename="../git-access.c" line="259"/> <source>Failed to get author: (%s)</source> - <translation type="unfinished"/> + <translation>Kunne ikke hente forfatter: (%s)</translation> </message> <message> <location filename="../git-access.c" line="261"/> <source>Remote storage and local data diverged. Error: git commit create failed (%s)</source> - <translation type="unfinished"/> + <translation>Skylager og lokal data avviker. Feil: git commit create failed (%s)</translation> </message> <message> <location filename="../git-access.c" line="263"/> <source>Error: could not lookup the merge commit I just created (%s)</source> - <translation type="unfinished"/> + <translation>Feil: could not lookup the merge commit I just created (%s)</translation> </message> <message> <location filename="../git-access.c" line="506"/> <source>Error connecting to Subsurface cloud storage</source> - <translation type="unfinished"/> + <translation>Klarte ikke å koble til skylager for Subsurface</translation> </message> <message> <location filename="../git-access.c" line="509"/> <source>git clone of %s failed (%s)</source> - <translation type="unfinished"/> + <translation>git clone of %s failed (%s)</translation> </message> <message> <location filename="../load-git.c" line="189"/> <source>multiple gps locations for this dive site; also %s </source> - <translation type="unfinished"/> + <translation>multiple gps-lokasjoner for dette dykket; også %s +</translation> </message> <message> <location filename="../load-git.c" line="216"/> <location filename="../parse-xml.c" line="1302"/> <source>additional name for site: %s </source> - <translation type="unfinished"/> + <translation>ytterligere navn for sted: %s +</translation> </message> <message> <location filename="../ostctools.c" line="122"/> <location filename="../ostctools.c" line="154"/> <source>Unknown DC in dive %d</source> - <translation type="unfinished"/> + <translation>Ukjent computer i dykk %d</translation> </message> <message> <location filename="../ostctools.c" line="167"/> <source>Error - %s - parsing dive %d</source> - <translation type="unfinished"/> + <translation>Feil - %s - leser dykk %d</translation> </message> </context> <context> @@ -9338,7 +9350,7 @@ Er Uemis Zurich plugget i ordentlig?</translation> <location filename="../qt-mobile/main.qml" line="11"/> <location filename="../qt-mobile/main.qml" line="96"/> <source>Subsurface mobile</source> - <translation type="unfinished"/> + <translation>Subsurface mobil</translation> </message> </context> <context> @@ -9437,30 +9449,30 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/plannerSettings.ui" line="261"/> <source>VPM-B deco</source> - <translation type="unfinished"/> + <translation>VPM-B deko</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="268"/> <source>Buehlmann deco</source> - <translation type="unfinished"/> + <translation>Bühlmann deco</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="278"/> <location filename="../build/ui_plannerSettings.h" line="445"/> <source>Reserve gas</source> - <translation type="unfinished"/> + <translation>Reservegass</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="320"/> <location filename="../build/ui_plannerSettings.h" line="449"/> <source>Postpone gas change if a stop is not required</source> - <translation type="unfinished"/> + <translation>Forsinke gassbytte hvis et stopp ikke er påkrevd</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="323"/> <location filename="../build/ui_plannerSettings.h" line="451"/> <source>Only switch at required stops</source> - <translation type="unfinished"/> + <translation>Bytt bare ved påkrevede stopp</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="343"/> @@ -9600,24 +9612,24 @@ p, li { white-space: pre-wrap; } <location filename="../qt-ui/plannerSettings.ui" line="396"/> <location filename="../build/ui_plannerSettings.h" line="443"/> <source>Recreational mode</source> - <translation type="unfinished"/> + <translation>Rekreasjonsmodus</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="433"/> <location filename="../build/ui_plannerSettings.h" line="452"/> <source>Min. switch duration</source> - <translation type="unfinished"/> + <translation>Minimum tid for bytte</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="456"/> <location filename="../build/ui_plannerSettings.h" line="444"/> <source>Safety stop</source> - <translation type="unfinished"/> + <translation>Sikkerhetsstopp</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="492"/> <source>Conservatism level</source> - <translation type="unfinished"/> + <translation>Konservatisme</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="605"/> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index 5b8859924..e03804627 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -157,7 +157,7 @@ <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="202"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> - <translation>O tdispositivo Bluetooth local foi %1.</translation> + <translation>O dispositivo Bluetooth local foi %1.</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/> @@ -1778,7 +1778,7 @@ <message> <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/> <source>Remove the selected dive computer?</source> - <translation>Remover o computador de mergulho seleccionado ?</translation> + <translation>Remover o computador de mergulho seleccionado?</translation> </message> <message> <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/> @@ -3403,7 +3403,6 @@ p, li { white-space: pre-wrap; } </source> <translation>O seu perfil de mergulho não foi carregado para o facebook, por favor envie a seguinte informação aos desenvolvedores do Subsurface. - </translation> </message> </context> @@ -4458,7 +4457,7 @@ obtidos a partir do ar usando: <location filename="../qt-ui/mainwindow.ui" line="694"/> <location filename="../build/ui_mainwindow.h" line="559"/> <source>User &survey</source> - <translation>&Questionário do utilizador</translation> + <translation>&Questionário ao utilizador</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="699"/> @@ -4823,7 +4822,7 @@ O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sis <message> <location filename="../qt-ui/mainwindow.cpp" line="697"/> <source>Trying to replan a dive that's not a planned dive.</source> - <translation type="unfinished"/> + <translation>Está a tentar planear novamente um mergulho que não foi criado no planeador de mergulhos</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="821"/> @@ -6310,7 +6309,6 @@ Nem todas as imagens foram obtidas no entervalo entre <source>Dive date: %1 </source> <translation>Data do mergulho: %1 - </translation> </message> <message> @@ -6337,7 +6335,6 @@ Nem todas as imagens foram obtidas no entervalo entre <source>Dive location: %1 </source> <translation>Local do mergulho: %1 - </translation> </message> <message> @@ -7803,7 +7800,6 @@ Média</translation> <source>Strange percentage reading %s </source> <translation>Leitura estranha das percentagens %s - </translation> </message> <message> @@ -7963,12 +7959,12 @@ Média</translation> <message> <location filename="../planner.c" line="556"/> <source>based on VPM-B at nominal conservatism</source> - <translation type="unfinished"/> + <translation>baseado no conservacionismo nominal do VPM-B</translation> </message> <message> <location filename="../planner.c" line="558"/> <source>based on VPM-B at +%d conservatism</source> - <translation type="unfinished"/> + <translation>baseado no VPM-B com conservacionismo +%d </translation> </message> <message> <location filename="../planner.c" line="781"/> @@ -8083,7 +8079,6 @@ D: %.1f%s EADD: %d%s </source> <translation>EAD: %d%s - EADD: %d%s </translation> </message> @@ -8093,7 +8088,6 @@ EADD: %d%s EADD: %d%s </source> <translation>END: %d%s - EADD: %d%s </translation> </message> @@ -8144,7 +8138,6 @@ EADD: %d%s <source>TTS: %umin </source> <translation>TTS: %umin - </translation> </message> <message> @@ -8731,7 +8724,9 @@ e clique em "Repetir"</translation> <source>Uemis Zurich: the file system is full. Disconnect/reconnect the dive computer and click Retry</source> - <translation type="unfinished"/> + <translation>Uemis Zurich: o sistema de ficheiros está cheio. +Desligue/volte a ligar o computador de mergulho +e clique Tentar novamente</translation> </message> <message> <location filename="../uemis-downloader.c" line="29"/> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index d6dec9df3..d0a4bf9ff 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -4,13 +4,13 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="14"/> <source>Remote Bluetooth device selection</source> - <translation type="unfinished"/> + <translation>Выбор удаленного устройства Bluetooth</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="32"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="28"/> <source>Discovered devices</source> - <translation type="unfinished"/> + <translation>Найденные устройства</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="41"/> @@ -28,13 +28,13 @@ <location filename="../qt-ui/btdeviceselectiondialog.ui" line="83"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="29"/> <source>Scan</source> - <translation type="unfinished"/> + <translation>Сканировать</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="96"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="30"/> <source>Clear</source> - <translation type="unfinished"/> + <translation>Очистить</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="119"/> @@ -51,19 +51,19 @@ <location filename="../qt-ui/btdeviceselectiondialog.ui" line="142"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="24"/> <source>Address:</source> - <translation type="unfinished"/> + <translation>Адрес:</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="171"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="26"/> <source>Bluetooth powered on</source> - <translation type="unfinished"/> + <translation>Bluetooth включен</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="193"/> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="27"/> <source>Turn on/off</source> - <translation type="unfinished"/> + <translation>Вкл/Выкл</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.ui" line="203"/> @@ -79,22 +79,22 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="128"/> <source>Trying to turn on the local Bluetooth device...</source> - <translation type="unfinished"/> + <translation>Включение локального устройства Bluetooth...</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="131"/> <source>Trying to turn off the local Bluetooth device...</source> - <translation type="unfinished"/> + <translation>Выключение локального устройства Bluetooth...</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="177"/> <source>Scanning for remote devices...</source> - <translation type="unfinished"/> + <translation>Сканирование устройств...</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="186"/> <source>Scanning finished successfully.</source> - <translation type="unfinished"/> + <translation>Сканирование завершено.</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="219"/> @@ -162,27 +162,27 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/> <source>turned on</source> - <translation type="unfinished"/> + <translation>включен</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/> <source>turned off</source> - <translation type="unfinished"/> + <translation>выключен</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="301"/> <source>Remove pairing</source> - <translation type="unfinished"/> + <translation>Удалить сопряжение</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="317"/> <source>Trying to pair device %1</source> - <translation type="unfinished"/> + <translation>Попытка сопряжения с %1</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="321"/> <source>Trying to unpair device %1</source> - <translation type="unfinished"/> + <translation>Попытка удалить сопряжение с %1</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="334"/> @@ -192,7 +192,7 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="341"/> <source>Device %1 was paired.</source> - <translation type="unfinished"/> + <translation>Устройство %1 сопряжено.</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="346"/> @@ -217,12 +217,12 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="387"/> <source>Unknown error</source> - <translation type="unfinished"/> + <translation>Неизвестная ошибка</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="396"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> - <translation type="unfinished"/> + <translation>Адаптер Bluetooth выключен, включите его перед выполнением поиска.</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="399"/> @@ -242,7 +242,7 @@ <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="438"/> <source>Not available</source> - <translation type="unfinished"/> + <translation>Недоступно</translation> </message> <message> <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="445"/> @@ -1345,7 +1345,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2219"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2235"/> <source> ℓ/min</source> - <translation type="unfinished"/> + <translation>л/мин</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1050"/> @@ -2130,7 +2130,7 @@ <location filename="../qt-ui/divelogexportdialog.ui" line="147"/> <location filename="../build/ui_divelogexportdialog.h" line="354"/> <source>di&velogs.de</source> - <translation type="unfinished"/> + <translation>divelogs.de</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="157"/> @@ -4458,26 +4458,26 @@ mixed from Air and using: <location filename="../build/ui_mainwindow.h" line="560"/> <location filename="../qt-ui/mainwindow.cpp" line="213"/> <source>&Undo</source> - <translation type="unfinished"/> + <translation>Отменить</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="702"/> <location filename="../build/ui_mainwindow.h" line="561"/> <source>Ctrl+Z</source> - <translation type="unfinished"/> + <translation>Ctrl+Z</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="707"/> <location filename="../build/ui_mainwindow.h" line="562"/> <location filename="../qt-ui/mainwindow.cpp" line="214"/> <source>&Redo</source> - <translation type="unfinished"/> + <translation>Повторить</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="710"/> <location filename="../build/ui_mainwindow.h" line="563"/> <source>Ctrl+Shift+Z</source> - <translation type="unfinished"/> + <translation>Ctrl+Shift+Z</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="715"/> @@ -4717,7 +4717,7 @@ mixed from Air and using: <message> <location filename="../qt-ui/mainwindow.cpp" line="444"/> <source>Scan</source> - <translation type="unfinished"/> + <translation>Сканировать</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="452"/> @@ -5244,7 +5244,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <location filename="../qt-ui/preferences.ui" line="1127"/> <location filename="../build/ui_preferences.h" line="1372"/> <source>UI language</source> - <translation type="unfinished"/> + <translation>Язык интерфейса</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1133"/> @@ -5366,7 +5366,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <message> <location filename="../qt-ui/preferences.ui" line="1380"/> <source>New password</source> - <translation type="unfinished"/> + <translation>Новый пароль</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="1408"/> @@ -5735,7 +5735,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <message> <location filename="../qt-ui/printoptions.ui" line="148"/> <source>Import</source> - <translation type="unfinished"/> + <translation>Импорт</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="29"/> @@ -6586,27 +6586,27 @@ Not all images have timestamps in the range between <message> <location filename="../qt-ui/templateedit.ui" line="112"/> <source>Arial</source> - <translation type="unfinished"/> + <translation>Arial</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="117"/> <source>Impact</source> - <translation type="unfinished"/> + <translation>Impact</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="122"/> <source>Georgia</source> - <translation type="unfinished"/> + <translation>Georgia</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="127"/> <source>Courier</source> - <translation type="unfinished"/> + <translation>Courier</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="132"/> <source>Verdana</source> - <translation type="unfinished"/> + <translation>Verdana</translation> </message> <message> <location filename="../qt-ui/templateedit.ui" line="144"/> @@ -9609,12 +9609,12 @@ p, li { white-space: pre-wrap; } <location filename="../qt-ui/plannerSettings.ui" line="456"/> <location filename="../build/ui_plannerSettings.h" line="444"/> <source>Safety stop</source> - <translation type="unfinished"/> + <translation>Остановка безопасности</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="492"/> <source>Conservatism level</source> - <translation type="unfinished"/> + <translation>Уровень консерватизма</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="605"/> diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index 214f9f857..df6477f77 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -260,12 +260,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="595"/> + <location filename="../qt-ui/simplewidgets.cpp" line="606"/> <source>Person: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="596"/> + <location filename="../qt-ui/simplewidgets.cpp" line="607"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"></translation> </message> @@ -483,6 +483,16 @@ <source>Device settings successfully reset</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../configuredivecomputer.cpp" line="627"/> + <source>Unable to create libdivecomputer context</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configuredivecomputer.cpp" line="658"/> + <source>Could not a establish connection to the dive computer.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ConfigureDiveComputerDialog</name> @@ -499,59 +509,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="141"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="170"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="80"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1521"/> <source>Retrieve available details</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="67"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="93"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/> <source>Save changes to device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="93"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/> <source>Backup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="100"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="129"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1530"/> <source>Restore backup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="110"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="139"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1531"/> <source>Update firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="148"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="177"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="185"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/> <source>OSTC 3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="224"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1376"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1752"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="253"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1405"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1781"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1616"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1764"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1781"/> @@ -559,9 +567,9 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1471"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1768"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="297"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1500"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1797"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/> @@ -569,9 +577,9 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="291"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1494"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1791"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="320"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1523"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1820"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/> @@ -579,9 +587,9 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="308"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1528"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1808"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="337"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1557"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1837"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/> @@ -589,118 +597,118 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="360"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/> <source>Language</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="231"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1552"/> <source>English</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="236"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="265"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1553"/> <source>German</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="241"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="270"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1554"/> <source>French</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="246"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="275"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1555"/> <source>Italian</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="394"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/> <source>Dive mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="342"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="371"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/> <source>OC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="347"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="376"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/> <source>CC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="352"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2035"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="381"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2064"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/> <source>Gauge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="357"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="386"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/> <source>Apnea</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="394"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1936"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="423"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1965"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/> <source>Date format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="376"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/> <source>MMDDYY</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="381"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="410"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/> <source>DDMMYY</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="386"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="415"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/> <source>YYMMDD</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="883"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2156"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="912"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2185"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/> <source>Saturation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="453"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="690"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="716"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="768"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="834"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="860"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="942"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="958"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1265"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1977"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2081"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2107"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2133"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2173"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2196"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="482"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="696"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="719"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="745"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="797"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="863"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="889"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="971"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="987"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1294"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2006"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2110"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2136"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2162"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2202"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2225"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/> @@ -719,387 +727,387 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="706"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1960"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="735"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1989"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/> <source>Desaturation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="824"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2097"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="853"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2126"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/> <source>Last deco</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="745"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2006"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="774"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2035"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/> <source> m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="423"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="452"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/> <source>Brightness</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="434"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/> <source>Eco</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="410"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="439"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/> <source>Medium</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="415"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="444"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/> <source>High</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="540"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1926"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="569"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/> <source>Sampling rate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="464"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/> <source>2s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="469"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1584"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="498"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1613"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/> <source>10s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="433"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1665"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="462"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1694"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/> <source>Units</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/> <source>m/°C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/> <source>ft/°F</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="581"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="610"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/> <source>Dive mode color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="551"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="580"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1608"/> <source>Standard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="556"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="585"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1609"/> <source>Red</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="561"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="590"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1610"/> <source>Green</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="566"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="595"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1611"/> <source>Blue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="443"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="472"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/> <source>Salinity (0-5%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="574"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1860"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="603"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1889"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1770"/> <source>Sync dive computer time with PC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="608"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/> <source>Compass gain</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="90"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/> <source>Read settings from backup file or from device before writing to the device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="90"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="116"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/> <source>Read settings from backup file or from device before writing to a backup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="203"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="232"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="484"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/> <source>230LSB/Gauss</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="489"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="518"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/> <source>330LSB/Gauss</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="494"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="523"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/> <source>390LSB/Gauss</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="499"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="528"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/> <source>440LSB/Gauss</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="504"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="533"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/> <source>660LSB/Gauss</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="509"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="538"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/> <source>820LSB/Gauss</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="514"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="543"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/> <source>1090LSB/Gauss</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="519"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="548"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/> <source>1370LSB/Gauss</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="591"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1867"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="620"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1896"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/> <source>Show safety stop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="601"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="630"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/> <source>Reset device to default settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="639"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1953"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="668"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1982"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1617"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1782"/> <source>Alt GF can be selected underwater</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="194"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="223"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/> <source>Suunto Vyper family</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="619"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1947"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="648"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1976"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/> <source>Advanced settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="646"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1970"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="675"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1999"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1783"/> <source>Future TTS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="653"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="682"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1619"/> <source>Pressure sensor offset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="660"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2189"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="689"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2218"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1620"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1809"/> <source>GFLow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="683"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2166"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="712"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2195"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1622"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1808"/> <source>GFHigh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="758"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2019"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="787"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2048"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1787"/> <source>Decotype</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="784"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="813"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1629"/> <source> mbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="814"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2068"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="843"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2097"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/> <source> min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="801"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2030"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="830"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2059"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1792"/> <source>ZH-L16</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="134"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="163"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/> <source>Save libdivecomputer logfile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="625"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="654"/> <source>Left button sensitivity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="632"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="661"/> <source>Always show ppO2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="806"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="835"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/> <source>ZH-L16+GF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="850"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2123"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="879"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2152"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1802"/> <source>Alt GFLow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="876"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2149"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="905"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2178"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1641"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1804"/> <source>Alt GFHigh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="893"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="922"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/> <source>Flip screen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="900"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="929"/> <source>Right button sensitivity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="914"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2212"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="943"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2241"/> <source>Graphical speed indicator</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="928"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2251"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="957"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2280"/> <source>Bottom gas consumption</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="935"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2258"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="964"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2287"/> <source>Deco gas consumption</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1007"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2266"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1036"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2295"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1721"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1876"/> <source>Gas settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1055"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1140"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2314"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2399"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1084"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1169"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2343"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2428"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1647"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1670"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1814"/> @@ -1108,10 +1116,10 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1060"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1145"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2319"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2404"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1089"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1174"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2348"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2433"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1649"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1672"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1816"/> @@ -1120,10 +1128,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1065"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1150"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2324"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2409"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1094"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1179"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1254"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2353"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2438"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2503"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1651"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1674"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1818"/> @@ -1132,160 +1142,156 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1070"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2329"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1099"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2358"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1656"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1823"/> <source>Gas 1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1075"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2334"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1104"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2363"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1658"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1825"/> <source>Gas 2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1080"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2339"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1109"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2368"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1660"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1827"/> <source>Gas 3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1085"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2344"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1114"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2373"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1662"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1829"/> <source>Gas 4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1090"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2349"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1119"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2378"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1664"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1831"/> <source>Gas 5</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1155"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2414"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1184"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2443"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1679"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1846"/> <source>Dil 1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1160"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2419"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1189"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2448"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1681"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1848"/> <source>Dil 2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1165"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2424"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1194"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2453"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1683"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1850"/> <source>Dil 3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1170"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2429"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1199"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2458"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1685"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1852"/> <source>Dil 4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1175"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2434"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1204"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2463"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1687"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1854"/> <source>Dil 5</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1220"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2469"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/> <source>Set point [cbar]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1225"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2474"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/> <source>Change depth [m]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1230"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2479"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1259"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2508"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1698"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1865"/> <source>SP 1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1235"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2484"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2513"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1700"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1867"/> <source>SP 2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1240"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2489"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1269"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2518"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1702"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1869"/> <source>SP 3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1245"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1274"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1704"/> <source>SP 4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1250"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1279"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1706"/> <source>SP 5</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1282"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1311"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/> <source>Fixed setpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1287"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1316"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1714"/> <source>Sensor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1295"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1324"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1716"/> <source>Setpoint fallback</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1318"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1334"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2510"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2526"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1347"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1363"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2539"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2555"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1717"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1718"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1872"/> @@ -1294,66 +1300,86 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1563"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1592"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/> <source>P1 (medium)</source> <extracomment>Suunto safety level</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1568"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1597"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/> <source>P2 (high)</source> <extracomment>Suunto safety level</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1607"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1636"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/> <source>Total dive time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1831"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1860"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/> <source>kg/ℓ</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2045"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2074"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/> <source>Apnoea</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1398"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1427"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/> <source>Safety level</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="907"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="47"/> + <source>Connect via bluetooth</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/> + <source>Connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/> + <source>Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/> + <source>OSTC 3,Sport,Cr,2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="936"/> <source>MOD warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="921"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="950"/> <source>Dynamic ascent rate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="974"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="990"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2219"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2235"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1003"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1019"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2248"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2264"/> <source> ℓ/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1050"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1135"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2309"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2394"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1079"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1164"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2338"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2423"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/> @@ -1362,275 +1388,281 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1258"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1249"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2498"/> + <source>Set point</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1287"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/> <source>O₂ in calibration gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1350"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2542"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1379"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2571"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1874"/> <source>pO₂ max</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1357"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2549"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1386"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2578"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1720"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1875"/> <source>pO₂ min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1424"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1453"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/> <source>Altitude range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1431"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1460"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1724"/> <source>Model</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1451"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1893"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1922"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1725"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1778"/> <source>Number of dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1511"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1540"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1728"/> <source>Max depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1558"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1587"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1732"/> <source>P0 (none)</source> <extracomment>Suunto safety level</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1576"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1605"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/> <source>Sample rate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1589"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1618"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1740"/> <source>20s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1594"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1623"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1741"/> <source>30s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1599"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1628"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1742"/> <source>60s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1614"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1643"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/> <source>Computer model</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1631"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1723"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1660"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1752"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1746"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1762"/> <source>min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1645"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1674"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1749"/> <source>24h</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1650"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1679"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1750"/> <source>12h</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1658"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1687"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1752"/> <source>Time format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1673"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1702"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1756"/> <source>Imperial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1678"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1707"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1757"/> <source>Metric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1689"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1718"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1759"/> <source>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1696"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1725"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1760"/> <source>Light</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1713"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1742"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1761"/> <source>Depth alarm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1733"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1762"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1763"/> <source>Time alarm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1758"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1787"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/> <source>Salinity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1875"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1904"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/> <source>MM/DD/YY</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1880"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1909"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1775"/> <source>DD/MM/YY</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1885"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1914"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1776"/> <source>YY/MM/DD</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2040"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2069"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/> <source>ZH-L16 CC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2050"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2079"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/> <source>L16-GF OC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2055"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2084"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1797"/> <source>L16-GF CC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2060"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2089"/> <location filename="../build/ui_configuredivecomputerdialog.h" line="1798"/> <source>PSCR-GF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1077"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1098"/> <source>Backup files (*.xml)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1061"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1082"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1085"/> <source>Backup succeeded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1086"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1076"/> <source>Backup dive computer settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1060"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1081"/> <source>XML backup error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1076"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1097"/> <source>Restore dive computer settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1080"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1101"/> <source>XML restore error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1081"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1102"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1087"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1106"/> <source>Restore succeeded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1088"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1107"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1098"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1117"/> <source>Select firmware file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1099"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1118"/> <source>All files (*.*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1160"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1174"/> <source>Choose file for divecomputer download logfile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1161"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1175"/> <source>Log files (*.log)</source> <translation type="unfinished"></translation> </message> @@ -2769,22 +2801,22 @@ <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="104"/> + <location filename="../qt-ui/diveplanner.cpp" line="108"/> <source>Dive planner points</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="108"/> + <location filename="../qt-ui/diveplanner.cpp" line="112"/> <source>Available gases</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="133"/> + <location filename="../qt-ui/diveplanner.cpp" line="137"/> <source>Add dive data point</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="142"/> + <location filename="../qt-ui/diveplanner.cpp" line="146"/> <source>Save new</source> <translation type="unfinished"></translation> </message> @@ -3442,25 +3474,15 @@ p, li { white-space: pre-wrap; } <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1749"/> - <source>Unable to create libdivecomputer context</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../configuredivecomputerthreads.cpp" line="1784"/> + <location filename="../configuredivecomputerthreads.cpp" line="1683"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1786"/> + <location filename="../configuredivecomputerthreads.cpp" line="1688"/> <source>Firmware update failed!</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../configuredivecomputerthreads.cpp" line="1789"/> - <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>GlobeGPS</name> @@ -3486,7 +3508,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="622"/> + <location filename="../qt-ui/simplewidgets.cpp" line="633"/> <source>Location: </source> <translation type="unfinished"></translation> </message> @@ -3604,28 +3626,28 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/locationinformation.cpp" line="28"/> - <location filename="../qt-ui/locationinformation.cpp" line="209"/> + <location filename="../qt-ui/locationinformation.cpp" line="207"/> <source>Dive site management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/locationinformation.cpp" line="61"/> - <source>Merge dive Sites</source> + <location filename="../qt-ui/locationinformation.cpp" line="60"/> + <source>Merge into current site</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/locationinformation.cpp" line="70"/> + <location filename="../qt-ui/locationinformation.cpp" line="68"/> <source>Merging dive sites</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/locationinformation.cpp" line="71"/> + <location filename="../qt-ui/locationinformation.cpp" line="69"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/locationinformation.cpp" line="216"/> + <location filename="../qt-ui/locationinformation.cpp" line="214"/> <source>You are editing a dive site</source> <translation type="unfinished"></translation> </message> @@ -4046,12 +4068,12 @@ mixed from Air and using: <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1229"/> + <location filename="../qt-ui/maintab.cpp" line="1232"/> <source>Discard the changes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1230"/> + <location filename="../qt-ui/maintab.cpp" line="1233"/> <source>You are about to discard your changes.</source> <translation type="unfinished"></translation> </message> @@ -4199,7 +4221,7 @@ mixed from Air and using: <message> <location filename="../qt-ui/mainwindow.ui" line="172"/> <location filename="../build/ui_mainwindow.h" line="460"/> - <location filename="../qt-ui/mainwindow.cpp" line="339"/> + <location filename="../qt-ui/mainwindow.cpp" line="348"/> <source>Open</source> <translation type="unfinished"></translation> </message> @@ -4452,7 +4474,7 @@ mixed from Air and using: <message> <location filename="../qt-ui/mainwindow.ui" line="699"/> <location filename="../build/ui_mainwindow.h" line="560"/> - <location filename="../qt-ui/mainwindow.cpp" line="213"/> + <location filename="../qt-ui/mainwindow.cpp" line="222"/> <source>&Undo</source> <translation type="unfinished"></translation> </message> @@ -4465,7 +4487,7 @@ mixed from Air and using: <message> <location filename="../qt-ui/mainwindow.ui" line="707"/> <location filename="../build/ui_mainwindow.h" line="562"/> - <location filename="../qt-ui/mainwindow.cpp" line="214"/> + <location filename="../qt-ui/mainwindow.cpp" line="223"/> <source>&Redo</source> <translation type="unfinished"></translation> </message> @@ -4695,137 +4717,143 @@ mixed from Air and using: <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="336"/> + <location filename="../qt-ui/mainwindow.cpp" line="345"/> <source>Open file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="340"/> - <location filename="../qt-ui/mainwindow.cpp" line="445"/> + <location filename="../qt-ui/mainwindow.cpp" line="349"/> + <location filename="../qt-ui/mainwindow.cpp" line="454"/> + <location filename="../qt-ui/mainwindow.cpp" line="1800"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="441"/> + <location filename="../qt-ui/mainwindow.cpp" line="450"/> <source>Traverse image directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="444"/> + <location filename="../qt-ui/mainwindow.cpp" line="453"/> <source>Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="452"/> + <location filename="../qt-ui/mainwindow.cpp" line="461"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="505"/> + <location filename="../qt-ui/mainwindow.cpp" line="514"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="622"/> + <location filename="../qt-ui/mainwindow.cpp" line="631"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="669"/> + <location filename="../qt-ui/mainwindow.cpp" line="678"/> <source>Print runtime table</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="774"/> + <location filename="../qt-ui/mainwindow.cpp" line="783"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1032"/> + <location filename="../qt-ui/mainwindow.cpp" line="1041"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1035"/> + <location filename="../qt-ui/mainwindow.cpp" line="1044"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1040"/> + <location filename="../qt-ui/mainwindow.cpp" line="1049"/> <source>Save changes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1395"/> + <location filename="../qt-ui/mainwindow.cpp" line="1404"/> <source>Save file as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1473"/> + <location filename="../qt-ui/mainwindow.cpp" line="1482"/> <source>[cloud storage for] %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1570"/> + <location filename="../qt-ui/mainwindow.cpp" line="1579"/> <source>Opening datafile from older version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1571"/> + <location filename="../qt-ui/mainwindow.cpp" line="1580"/> <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 type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1582"/> + <location filename="../qt-ui/mainwindow.cpp" line="1591"/> <source>Open dive log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1583"/> + <location filename="../qt-ui/mainwindow.cpp" line="1592"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1041"/> + <location filename="../qt-ui/mainwindow.cpp" line="1800"/> + <source>Contacting cloud service...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="1050"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="480"/> - <location filename="../qt-ui/mainwindow.cpp" line="622"/> - <location filename="../qt-ui/mainwindow.cpp" line="697"/> - <location filename="../qt-ui/mainwindow.cpp" line="768"/> - <location filename="../qt-ui/mainwindow.cpp" line="774"/> - <location filename="../qt-ui/mainwindow.cpp" line="1628"/> + <location filename="../qt-ui/mainwindow.cpp" line="489"/> + <location filename="../qt-ui/mainwindow.cpp" line="631"/> + <location filename="../qt-ui/mainwindow.cpp" line="706"/> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="783"/> + <location filename="../qt-ui/mainwindow.cpp" line="1637"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="330"/> - <location filename="../qt-ui/mainwindow.cpp" line="375"/> - <location filename="../qt-ui/mainwindow.cpp" line="1377"/> + <location filename="../qt-ui/mainwindow.cpp" line="339"/> + <location filename="../qt-ui/mainwindow.cpp" line="384"/> + <location filename="../qt-ui/mainwindow.cpp" line="1386"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="697"/> + <location filename="../qt-ui/mainwindow.cpp" line="706"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="821"/> + <location filename="../qt-ui/mainwindow.cpp" line="830"/> <source>Yearly statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1396"/> + <location filename="../qt-ui/mainwindow.cpp" line="1405"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="768"/> - <location filename="../qt-ui/mainwindow.cpp" line="1628"/> + <location filename="../qt-ui/mainwindow.cpp" line="777"/> + <location filename="../qt-ui/mainwindow.cpp" line="1637"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"></translation> </message> @@ -4843,7 +4871,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="707"/> + <location filename="../qt-ui/simplewidgets.cpp" line="718"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"></translation> </message> @@ -4851,39 +4879,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="260"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="264"/> <source> Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="249"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/> <source>Not now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/> <source>Update firmware</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="252"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/> <source>Firmware upgrade notice</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="270"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="286"/> <source>Save the downloaded firmware as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="271"/> + <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="287"/> <source>HEX files (*.hex)</source> <translation type="unfinished"></translation> </message> @@ -4891,69 +4919,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="319"/> + <location filename="../qt-ui/diveplanner.cpp" line="323"/> <source>Open circuit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="319"/> + <location filename="../qt-ui/diveplanner.cpp" line="323"/> <source>CCR</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="319"/> + <location filename="../qt-ui/diveplanner.cpp" line="323"/> <source>pSCR</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="418"/> + <location filename="../qt-ui/diveplanner.cpp" line="422"/> <source>ft/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="419"/> + <location filename="../qt-ui/diveplanner.cpp" line="423"/> <source>Last stop at 20ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="420"/> + <location filename="../qt-ui/diveplanner.cpp" line="424"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="421"/> + <location filename="../qt-ui/diveplanner.cpp" line="425"/> <source>20ft to surface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="423"/> + <location filename="../qt-ui/diveplanner.cpp" line="427"/> <source>m/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="424"/> + <location filename="../qt-ui/diveplanner.cpp" line="428"/> <source>Last stop at 6m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="425"/> + <location filename="../qt-ui/diveplanner.cpp" line="429"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="426"/> + <location filename="../qt-ui/diveplanner.cpp" line="430"/> <source>6m to surface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="429"/> - <location filename="../qt-ui/diveplanner.cpp" line="430"/> + <location filename="../qt-ui/diveplanner.cpp" line="433"/> + <location filename="../qt-ui/diveplanner.cpp" line="434"/> <source>cuft/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="438"/> - <location filename="../qt-ui/diveplanner.cpp" line="439"/> + <location filename="../qt-ui/diveplanner.cpp" line="442"/> + <location filename="../qt-ui/diveplanner.cpp" line="443"/> <source>ℓ/min</source> <translation type="unfinished"></translation> </message> @@ -5954,7 +5982,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="55"/> + <location filename="../qt-ui/diveplanner.cpp" line="59"/> <source>Remove this point</source> <translation type="unfinished"></translation> </message> @@ -5979,6 +6007,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <translation type="unfinished"></translation> </message> <message> + <location filename="../qthelper.cpp" line="194"/> + <source>h:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qthelper.cpp" line="194"/> + <source>min</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../qthelper.cpp" line="1224"/> <source>kg</source> <translation type="unfinished"></translation> @@ -6042,20 +6080,11 @@ 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="1586"/> - <source>Unable to create libdivecomputer context</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../configuredivecomputerthreads.cpp" line="1638"/> + <location filename="../configuredivecomputerthreads.cpp" line="1584"/> + <location filename="../configuredivecomputerthreads.cpp" line="1609"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../configuredivecomputerthreads.cpp" line="1641"/> - <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>RenumberDialog</name> @@ -6081,18 +6110,8 @@ 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="1816"/> - <source>Unable to create libdivecomputer context</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../configuredivecomputerthreads.cpp" line="1837"/> - <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../configuredivecomputerthreads.cpp" line="1840"/> - <source>Could not a establish connection to the dive computer.</source> + <location filename="../configuredivecomputerthreads.cpp" line="1708"/> + <source>Reset settings failed!</source> <translation type="unfinished"></translation> </message> </context> @@ -6167,25 +6186,30 @@ Not all images have timestamps in the range between <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="173"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="137"/> + <source>Load images even if the time does not match the dive time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/shiftimagetimes.ui" line="180"/> <location filename="../build/ui_shiftimagetimes.h" line="193"/> <source>To compute the offset between the clocks of your dive computer and your camera use your camera to take a picture of your dive compuer displaying the current time. Download that image to your computer and press this button.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="183"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="190"/> <location filename="../build/ui_shiftimagetimes.h" line="195"/> <source>Determine camera time offset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="186"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="193"/> <location filename="../build/ui_shiftimagetimes.h" line="197"/> <source>Select image of divecomputer showing time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/shiftimagetimes.ui" line="208"/> + <location filename="../qt-ui/shiftimagetimes.ui" line="215"/> <location filename="../build/ui_shiftimagetimes.h" line="199"/> <source>Which date and time are displayed on the image?</source> <translation type="unfinished"></translation> @@ -6496,7 +6520,7 @@ Not all images have timestamps in the range between <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="648"/> + <location filename="../qt-ui/simplewidgets.cpp" line="659"/> <source>Suits: </source> <translation type="unfinished"></translation> </message> @@ -6523,7 +6547,7 @@ Not all images have timestamps in the range between <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="569"/> + <location filename="../qt-ui/simplewidgets.cpp" line="580"/> <source>Tags: </source> <translation type="unfinished"></translation> </message> @@ -7176,27 +7200,18 @@ Language: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1673"/> - <source>Unable to create libdivecomputer context</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../configuredivecomputerthreads.cpp" line="1692"/> - <location filename="../configuredivecomputerthreads.cpp" line="1700"/> - <location filename="../configuredivecomputerthreads.cpp" line="1710"/> + <location filename="../configuredivecomputerthreads.cpp" line="1635"/> + <location filename="../configuredivecomputerthreads.cpp" line="1642"/> + <location filename="../configuredivecomputerthreads.cpp" line="1651"/> <source>Failed!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configuredivecomputerthreads.cpp" line="1719"/> + <location filename="../configuredivecomputerthreads.cpp" line="1633"/> + <location filename="../configuredivecomputerthreads.cpp" line="1654"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../configuredivecomputerthreads.cpp" line="1722"/> - <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>YearlyStatisticsModel</name> @@ -7311,7 +7326,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../libdivecomputer.c" line="640"/> + <location filename="../libdivecomputer.c" line="643"/> <source>Error parsing the header</source> <translation type="unfinished"></translation> </message> @@ -7397,8 +7412,8 @@ Maximum</source> <message> <location filename="../divelist.c" line="482"/> <location filename="../equipment.c" line="81"/> - <location filename="../planner.c" line="1365"/> - <location filename="../planner.c" line="1368"/> + <location filename="../planner.c" line="1391"/> + <location filename="../planner.c" line="1394"/> <source>air</source> <translation type="unfinished"></translation> </message> @@ -7432,7 +7447,7 @@ Maximum</source> <location filename="../file.c" line="456"/> <location filename="../file.c" line="541"/> <location filename="../file.c" line="938"/> - <location filename="../ostctools.c" line="82"/> + <location filename="../ostctools.c" line="80"/> <source>Failed to read '%s'</source> <translation type="unfinished"></translation> </message> @@ -7656,102 +7671,102 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="624"/> + <location filename="../libdivecomputer.c" line="627"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="630"/> + <location filename="../libdivecomputer.c" line="633"/> <source>Error registering the data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="459"/> + <location filename="../libdivecomputer.c" line="462"/> <source>Error parsing the datetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="477"/> + <location filename="../libdivecomputer.c" line="480"/> <source>Dive %d: %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="486"/> <source>Error parsing the divetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="493"/> + <location filename="../libdivecomputer.c" line="496"/> <source>Error parsing the maxdepth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="512"/> + <location filename="../libdivecomputer.c" line="515"/> <source>Error parsing temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="532"/> + <location filename="../libdivecomputer.c" line="535"/> <source>Error parsing the gas mix count</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="544"/> + <location filename="../libdivecomputer.c" line="547"/> <source>Error obtaining water salinity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="553"/> + <location filename="../libdivecomputer.c" line="556"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="578"/> + <location filename="../libdivecomputer.c" line="581"/> <source>Error obtaining divemode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="598"/> + <location filename="../libdivecomputer.c" line="601"/> <source>Error parsing the gas mix</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="650"/> + <location filename="../libdivecomputer.c" line="653"/> <source>Error parsing the samples</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="787"/> + <location filename="../libdivecomputer.c" line="790"/> <source>Event: waiting for user action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="795"/> + <location filename="../libdivecomputer.c" line="798"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="859"/> + <location filename="../libdivecomputer.c" line="862"/> <source>Error registering the event handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="864"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="885"/> + <location filename="../libdivecomputer.c" line="888"/> <source>Dive data import error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="924"/> + <location filename="../libdivecomputer.c" line="927"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="931"/> + <location filename="../libdivecomputer.c" line="934"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"></translation> </message> @@ -7788,179 +7803,179 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="990"/> - <location filename="../planner.c" line="1139"/> + <location filename="../planner.c" line="1014"/> + <location filename="../planner.c" line="1165"/> <source>Can't find gas %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="341"/> + <location filename="../planner.c" line="365"/> <source>Too many gas mixes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="540"/> + <location filename="../planner.c" line="564"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="564"/> + <location filename="../planner.c" line="588"/> <source>Subsurface dive plan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="568"/> + <location filename="../planner.c" line="592"/> <source>depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="574"/> + <location filename="../planner.c" line="598"/> <source>runtime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="571"/> + <location filename="../planner.c" line="595"/> <source>duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="526"/> + <location filename="../planner.c" line="550"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="576"/> <source>based on Buhlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="560"/> + <location filename="../planner.c" line="584"/> <source>recreational mode based on Buhlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="577"/> + <location filename="../planner.c" line="601"/> <source>gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="620"/> + <location filename="../planner.c" line="644"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="628"/> + <location filename="../planner.c" line="652"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="641"/> + <location filename="../planner.c" line="665"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="648"/> + <location filename="../planner.c" line="672"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="705"/> <source>%3.0f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="684"/> - <location filename="../planner.c" line="688"/> + <location filename="../planner.c" line="708"/> + <location filename="../planner.c" line="712"/> <source>%3dmin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="697"/> - <location filename="../planner.c" line="709"/> + <location filename="../planner.c" line="721"/> + <location filename="../planner.c" line="733"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="732"/> + <location filename="../planner.c" line="756"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="734"/> + <location filename="../planner.c" line="758"/> <source>Switch gas to %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="776"/> <source>CNS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="754"/> + <location filename="../planner.c" line="778"/> <source>OTU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="758"/> + <location filename="../planner.c" line="782"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="760"/> + <location filename="../planner.c" line="784"/> <source>Gas consumption:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="542"/> - <location filename="../planner.c" line="780"/> - <location filename="../planner.c" line="785"/> - <location filename="../planner.c" line="810"/> - <location filename="../planner.c" line="820"/> + <location filename="../planner.c" line="566"/> + <location filename="../planner.c" line="804"/> + <location filename="../planner.c" line="809"/> + <location filename="../planner.c" line="834"/> + <location filename="../planner.c" line="844"/> <source>Warning:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="556"/> + <location filename="../planner.c" line="580"/> <source>based on VPM-B at nominal conservatism</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="558"/> + <location filename="../planner.c" line="582"/> <source>based on VPM-B at +%d conservatism</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="781"/> + <location filename="../planner.c" line="805"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="786"/> + <location filename="../planner.c" line="810"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="788"/> + <location filename="../planner.c" line="812"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="790"/> + <location filename="../planner.c" line="814"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="807"/> + <location filename="../planner.c" line="831"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="817"/> + <location filename="../planner.c" line="841"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="1373"/> + <location filename="../planner.c" line="1399"/> <source>ean</source> <translation type="unfinished"></translation> </message> @@ -8226,7 +8241,7 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="451"/> + <location filename="../datatrak.c" line="450"/> <location filename="../dive.c" line="22"/> <source>drift</source> <translation type="unfinished"></translation> @@ -8242,24 +8257,24 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="435"/> + <location filename="../datatrak.c" line="434"/> <location filename="../dive.c" line="23"/> <source>ice</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="437"/> + <location filename="../datatrak.c" line="436"/> <source>search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="447"/> + <location filename="../datatrak.c" line="446"/> <location filename="../dive.c" line="24"/> <source>wreck</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="433"/> + <location filename="../datatrak.c" line="432"/> <location filename="../dive.c" line="24"/> <source>cave</source> <translation type="unfinished"></translation> @@ -8280,13 +8295,13 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="449"/> + <location filename="../datatrak.c" line="448"/> <location filename="../dive.c" line="25"/> <source>river</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="431"/> + <location filename="../datatrak.c" line="430"/> <location filename="../dive.c" line="26"/> <source>night</source> <translation type="unfinished"></translation> @@ -8297,138 +8312,138 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="278"/> + <location filename="../datatrak.c" line="277"/> <source>clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="281"/> + <location filename="../datatrak.c" line="280"/> <source>misty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="284"/> + <location filename="../datatrak.c" line="283"/> <source>fog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="287"/> + <location filename="../datatrak.c" line="286"/> <source>rain</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="290"/> + <location filename="../datatrak.c" line="289"/> <source>storm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="293"/> + <location filename="../datatrak.c" line="292"/> <source>snow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="313"/> + <location filename="../datatrak.c" line="312"/> <source>No suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="316"/> + <location filename="../datatrak.c" line="315"/> <source>Shorty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="319"/> + <location filename="../datatrak.c" line="318"/> <source>Combi</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="322"/> + <location filename="../datatrak.c" line="321"/> <source>Wet suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="325"/> + <location filename="../datatrak.c" line="324"/> <source>Semidry suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="328"/> + <location filename="../datatrak.c" line="327"/> <source>Dry suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="388"/> + <location filename="../datatrak.c" line="387"/> <source>no stop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="392"/> + <location filename="../datatrak.c" line="391"/> <source>single ascent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="394"/> + <location filename="../datatrak.c" line="393"/> <source>multiple ascent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="396"/> + <location filename="../datatrak.c" line="395"/> <location filename="../dive.c" line="26"/> <source>fresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="398"/> + <location filename="../datatrak.c" line="397"/> <source>salt water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="423"/> + <location filename="../datatrak.c" line="422"/> <source>sight seeing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="425"/> + <location filename="../datatrak.c" line="424"/> <source>club dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="429"/> + <location filename="../datatrak.c" line="428"/> <source>instruction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="455"/> + <location filename="../datatrak.c" line="454"/> <source>other</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="466"/> + <location filename="../datatrak.c" line="465"/> <source>Other activities</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="490"/> + <location filename="../datatrak.c" line="489"/> <source>Datatrak/Wlog notes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="529"/> + <location filename="../datatrak.c" line="528"/> <source>Manually entered dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="580"/> + <location filename="../datatrak.c" line="579"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="662"/> + <location filename="../datatrak.c" line="661"/> <source>Error: couldn't open the file %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="675"/> + <location filename="../datatrak.c" line="674"/> <source>Error: no dive</source> <translation type="unfinished"></translation> </message> @@ -8438,7 +8453,7 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="453"/> + <location filename="../datatrak.c" line="452"/> <location filename="../dive.c" line="27"/> <source>photo</source> <translation type="unfinished"></translation> @@ -8449,13 +8464,13 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="427"/> + <location filename="../datatrak.c" line="426"/> <location filename="../dive.c" line="27"/> <source>instructor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../datatrak.c" line="390"/> + <location filename="../datatrak.c" line="389"/> <location filename="../dive.c" line="28"/> <source>deco</source> <translation type="unfinished"></translation> @@ -8473,8 +8488,8 @@ EADD: %d%s <message> <location filename="../dive.c" line="32"/> <location filename="../equipment.c" line="85"/> - <location filename="../planner.c" line="1369"/> - <location filename="../planner.c" line="1372"/> + <location filename="../planner.c" line="1395"/> + <location filename="../planner.c" line="1398"/> <source>oxygen</source> <translation type="unfinished"></translation> </message> @@ -8626,17 +8641,17 @@ EADD: %d%s <message> <location filename="../libdivecomputer.c" line="154"/> <location filename="../parse-xml.c" line="3182"/> - <location filename="../uemis-downloader.c" line="124"/> + <location filename="../uemis-downloader.c" line="123"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="455"/> + <location filename="../uemis-downloader.c" line="454"/> <source>data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="435"/> + <location filename="../uemis-downloader.c" line="434"/> <source>%s %s</source> <translation type="unfinished"></translation> </message> @@ -8661,172 +8676,172 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="483"/> + <location filename="../uemis-downloader.c" line="482"/> <source>divelog #</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="485"/> + <location filename="../uemis-downloader.c" line="484"/> <source>divespot #</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="487"/> + <location filename="../uemis-downloader.c" line="486"/> <source>details for #</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="697"/> + <location filename="../uemis-downloader.c" line="687"/> <source>wetsuit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="697"/> + <location filename="../uemis-downloader.c" line="687"/> <source>semidry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="697"/> + <location filename="../uemis-downloader.c" line="687"/> <source>drysuit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="698"/> + <location filename="../uemis-downloader.c" line="688"/> <source>shorty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="698"/> + <location filename="../uemis-downloader.c" line="688"/> <source>vest</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="698"/> + <location filename="../uemis-downloader.c" line="688"/> <source>long john</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="698"/> + <location filename="../uemis-downloader.c" line="688"/> <source>jacket</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="698"/> + <location filename="../uemis-downloader.c" line="688"/> <source>full suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="698"/> + <location filename="../uemis-downloader.c" line="688"/> <source>2 pcs full suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="699"/> + <location filename="../uemis-downloader.c" line="689"/> <source>membrane</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="1064"/> + <location filename="../uemis-downloader.c" line="1170"/> <source>Initialise communication</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="1067"/> + <location filename="../uemis-downloader.c" line="1173"/> <source>Uemis init failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis-downloader.c" line="1079"/> + <location filename="../uemis-downloader.c" line="1185"/> <source>Start download</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="189"/> + <location filename="../uemis.c" line="203"/> <source>Safety stop violation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="191"/> + <location filename="../uemis.c" line="205"/> <source>Speed alarm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="194"/> + <location filename="../uemis.c" line="208"/> <source>Speed warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="196"/> + <location filename="../uemis.c" line="210"/> <source>pO₂ green warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="199"/> + <location filename="../uemis.c" line="213"/> <source>pO₂ ascend warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="201"/> + <location filename="../uemis.c" line="215"/> <source>pO₂ ascend alarm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="205"/> + <location filename="../uemis.c" line="219"/> <source>Tank pressure info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="207"/> + <location filename="../uemis.c" line="221"/> <source>RGT warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="209"/> + <location filename="../uemis.c" line="223"/> <source>RGT alert</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="211"/> + <location filename="../uemis.c" line="225"/> <source>Tank change suggested</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="213"/> + <location filename="../uemis.c" line="227"/> <source>Depth limit exceeded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="215"/> + <location filename="../uemis.c" line="229"/> <source>Max deco time warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="217"/> + <location filename="../uemis.c" line="231"/> <source>Dive time info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="219"/> + <location filename="../uemis.c" line="233"/> <source>Dive time alert</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="221"/> + <location filename="../uemis.c" line="235"/> <source>Marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="223"/> + <location filename="../uemis.c" line="237"/> <source>No tank data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="225"/> + <location filename="../uemis.c" line="239"/> <source>Low battery warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../uemis.c" line="227"/> + <location filename="../uemis.c" line="241"/> <source>Low battery alert</source> <translation type="unfinished"></translation> </message> @@ -9173,73 +9188,73 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="206"/> - <location filename="../git-access.c" line="210"/> + <location filename="../git-access.c" line="252"/> + <location filename="../git-access.c" line="256"/> <source>Remote storage and local data diverged. Error: can't get commit (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="208"/> + <location filename="../git-access.c" line="254"/> <source>Remote storage and local data diverged. Error: failed local tree lookup (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="212"/> + <location filename="../git-access.c" line="258"/> <source>Remote storage and local data diverged. Error: failed remote tree lookup (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="214"/> + <location filename="../git-access.c" line="260"/> <source>Remote storage and local data diverged. Error: can't get commit: (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="216"/> + <location filename="../git-access.c" line="262"/> <source>Remote storage and local data diverged. Error: failed base tree lookup: (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="218"/> + <location filename="../git-access.c" line="264"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="247"/> + <location filename="../git-access.c" line="293"/> <source>Remote storage and local data diverged. Error: merge conflict - manual intervention needed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="255"/> + <location filename="../git-access.c" line="301"/> <source>Remote storage and local data diverged. Error: writing the tree failed (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="257"/> + <location filename="../git-access.c" line="303"/> <source>Remote storage and local data diverged. Error: tree lookup failed (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="259"/> + <location filename="../git-access.c" line="305"/> <source>Failed to get author: (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="261"/> + <location filename="../git-access.c" line="307"/> <source>Remote storage and local data diverged. Error: git commit create failed (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="263"/> + <location filename="../git-access.c" line="309"/> <source>Error: could not lookup the merge commit I just created (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="506"/> + <location filename="../git-access.c" line="555"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../git-access.c" line="509"/> + <location filename="../git-access.c" line="558"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"></translation> </message> @@ -9257,13 +9272,13 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ostctools.c" line="122"/> - <location filename="../ostctools.c" line="154"/> + <location filename="../ostctools.c" line="120"/> + <location filename="../ostctools.c" line="152"/> <source>Unknown DC in dive %d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ostctools.c" line="167"/> + <location filename="../ostctools.c" line="165"/> <source>Error - %s - parsing dive %d</source> <translation type="unfinished"></translation> </message> |