diff options
| -rw-r--r-- | translations/subsurface_ca.ts | 640 | ||||
| -rw-r--r-- | translations/subsurface_de_DE.ts | 632 | ||||
| -rw-r--r-- | translations/subsurface_es_ES.ts | 643 | ||||
| -rw-r--r-- | translations/subsurface_fr_FR.ts | 1132 | ||||
| -rw-r--r-- | translations/subsurface_hr_HR.ts | 1135 | ||||
| -rw-r--r-- | translations/subsurface_hu.ts | 1135 | ||||
| -rw-r--r-- | translations/subsurface_id.ts | 1137 | ||||
| -rw-r--r-- | translations/subsurface_nl_NL.ts | 644 | ||||
| -rw-r--r-- | translations/subsurface_pt_PT.ts | 642 | ||||
| -rw-r--r-- | translations/subsurface_vi.ts | 1143 |
10 files changed, 5093 insertions, 3790 deletions
diff --git a/translations/subsurface_ca.ts b/translations/subsurface_ca.ts index ff76f8b75..106ed2125 100644 --- a/translations/subsurface_ca.ts +++ b/translations/subsurface_ca.ts @@ -47,66 +47,86 @@ <translation>Selecció del dispositiu de Bluetooth remot</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Dispositius descoberts</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Desa</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Surt</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation>Mode Bluetooth</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation>Automàtic</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation>Força el clàssic</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Explora</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Neteja</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Detalls del dispositiu de Bluetooth local</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Nom:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Adreça:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth activat</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Activa/desactiva</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Seleccioneu un dispositiu:</translation> @@ -285,17 +305,17 @@ <translation>Error en cercar dispositius: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="477"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>No disponible</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="484"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>No es pot accedir a l'adaptador de Bluetooth local.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="534"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>No s'ha creat l'agent de cerca de dispositius perquè l'adreça %1 no coincideix amb l'adreça de l'adaptador físic de cap dispositiu de Bluetooth.</translation> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Sense companys</translation> </message> @@ -1636,82 +1656,82 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Fes una còpia de seguretat de l'arranjament</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> <source>Backup files</source> <translation>Fitxers de còpia de seguretat</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>Error en la còpia de seguretat de l'XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>S'ha produït un error mentre es desava el fitxer de la còpia de seguretat. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Còpia de seguretat correcta</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>S'ha desat el vostre arranjament a: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Restableix l'arranjament de l'ordinador de busseig</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>Error en restaurar l'XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>S'ha produït un error mentre es restaurava el fitxer de la còpia de seguretat. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Restauració correcta</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>El vostre arranjament s'ha restaurat correctament.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Selecciona un fitxer de microprogramari</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> <source>All files</source> <translation>Tots els fitxers</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> <source>Log files</source> <translation>Fitxers de registre</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> <source>Choose file for dive computer download logfile</source> <translation>Tria un fitxer per a fer de registre de la baixada des de l'ordinador de busseig</translation> </message> @@ -1927,27 +1947,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Detalls de la immersió</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Suprimeix la immersió</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation>Cancel·la l'edició</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Mostra al mapa</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Múltiples companys</translation> </message> @@ -1955,104 +1975,104 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Immersió %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Data:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Ubicació:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Coordenades:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Ubica la posició GPS actual:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Profunditat:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Durada:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Temp. de l'aire:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Temp. de l'aigua:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Vestit:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Company:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Líder de busseig:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Llast:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Ampolla:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Barreja de gas:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Pressió inicial:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Pressió final:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Valoració:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation>Visibilitat:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Notes:</translation> </message> @@ -2128,23 +2148,23 @@ GPS actual:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation> (amp. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Canvi manual a OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> començament</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> final</translation> @@ -2925,7 +2945,7 @@ majoria dels detalls però no la informació sobre el perfil.</translation> <translation><numerusform>(%n immersions)</numerusform><numerusform>(%n immersió)</numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Múltiples companys</translation> </message> @@ -2971,38 +2991,38 @@ majoria dels detalls però no la informació sobre el perfil.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="157"/> <source>unknown</source> <translation>Desconeguda</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="192"/> + <location filename="../qt-models/diveplannermodel.cpp" line="277"/> <source>cyl.</source> <translation>cil.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Final depth</source> <translation>Profunditat final</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Run time</source> <translation>Temps acumulat</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Duration</source> <translation>Durada</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Used gas</source> <translation>Gas emprat</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>CC setpoint</source> <translation>Punt d'ajust amb CC</translation> </message> @@ -3038,107 +3058,107 @@ majoria dels detalls però no la informació sobre el perfil.</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Profunditat</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Hora</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Pressió</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Color</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Introduïda per l'usuari</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Pressió S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Pressió I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Sostre</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Punt d'ajust</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Pressió ambiental</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Ritme cardíac</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Factor de degradat</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Mitjana de la profunditat @ s</translation> </message> @@ -3458,68 +3478,68 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Baixa</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Tria el mode de baixada Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation>S'està connectant amb l'ordinador de busseig</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="227"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Troba l'ordinador de busseig Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>Cancel·la la baixada</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="369"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>Tria un fitxer per a fer de registre de la baixada des de l'ordinador de busseig</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="370"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> <source>Log files</source> <translation>Fitxers de registre</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="395"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>Tria un fitxer pel bolcat binari des de l'ordinador de busseig</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="396"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> <source>Dump files</source> <translation>Fitxers de bolcat</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> <source>Retry download</source> <translation>Reprèn la baixada</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Avís</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="384"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>S'està desant el bolcat de «libdivecomputer», això NO baixarà les immersions a la llista d'immersions.</translation> @@ -3908,7 +3928,7 @@ a la llista d'immersions.</translation> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Sense ubicació</translation> </message> @@ -4302,7 +4322,7 @@ Segur que voleu continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="543"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="560"/> <source>Open</source> <translation>Obre</translation> </message> @@ -4644,63 +4664,63 @@ Segur que voleu continuar?</translation> <translation>Pren l'emmagatzematge al núvol en línia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="354"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Connect to</source> <translation>Connecta a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> <source>Disconnect from</source> <translation>Desconnecta de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="579"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1656"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="596"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans d'obrir un altre fitxer.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="540"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="557"/> <source>Open file</source> <translation>Obre un fitxer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="544"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="656"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Cancel</source> <translation>Cancel·la</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="611"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>No desis un registre buit al núvol</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="652"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> <source>Traverse image directories</source> <translation>Travessa els directoris amb imatges</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="655"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> <source>Scan</source> <translation>Explora</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="663"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> <source>Scanning images...(this can take a while)</source> <translation>S'estan cercant les imatges... (això pot trigar una estona)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="835"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="945"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1033"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1039"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Warning</source> <translation>Avís</translation> </message> @@ -4710,202 +4730,230 @@ Segur que voleu continuar?</translation> <translation>S'estan intentant fusionar les immersions amb un interval d'entre %1 min.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <source>Template backup created</source> + <translation>S'ha creat una còpia de seguretat de la plantilla</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation>S'han creat les següents còpies de seguretat de les plantilles d'impressió: + +%1 + +Ubicació: +%2 + +Tingueu en compte que, a partir d'aquesta versió del Subsurface, les +plantilles predeterminades són de només lectura i no s'han d'editar +directament, ja que l'aplicació les pot sobreescriure quan s'inicia.</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="731"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans de tancar el fitxer.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="835"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans d'intentar afegir-ne una altra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="887"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="909"/> <source>Print runtime table</source> <translation>Imprimeix la taula del temps acumulat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="945"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>S'està intentant tornar a planificar una immersió que encara havia estat planificada.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1033"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Si us plau, finalitzeu l'edició actual abans d'intentar fer-ne una altra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1039"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>S'està intentant editar una immersió que no ha estat afegida manualment.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1086"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> <source>Yearly statistics</source> <translation>Estadístiques anuals</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> <source>Dive log files</source> <translation>Fitxers del diari de busseig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1684"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>Subsurface files</source> <translation>Fitxers del Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1286"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1332"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1290"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1291"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1335"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1292"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1336"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1294"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1338"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1339"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1340"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>MkVI files</source> <translation>Fitxers MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1297"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1341"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>APD log viewer</source> <translation>Visor del registre de la APD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1298"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1342"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1330"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>All files</source> <translation>Tots els fitxers</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Voleu desar els canvis que heu fet en el fitxer %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Voleu desar els canvis que heu fet en el fitxer de dades?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Save changes?</source> <translation>Deso els canvis?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <source>Changes will be lost if you don't save them.</source> <translation>Si sortiu sense desar, els canvis es perdran.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1683"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1705"/> <source>Save file as</source> <translation>Desa el fitxer com a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1771"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1793"/> <source>[local cache for] %1</source> <translation>[cau local per a] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1773"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/> <source>[cloud storage for] %1</source> <translation>[emmagatzematge al núvol de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1880"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1902"/> <source>Opening datafile from older version</source> <translation>S'està obrint el fitxer de dades d'una versió anterior</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1881"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1903"/> <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>Has obert un fitxer de dades d'una versió anterior del Subsurface. Recomanem llegir el manual per aprendre sobre els canvis en la nova versió, especialment la gestió dels punts d'immersió que ha variat significativament. El Subsurface ja ha intentat omplir les dades, però potser valdrà la pena perdre un moment en donar una ullada al nou sistema per a la gestió dels punts d'immersió, per assegurar-vos que tot està correcte.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1892"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1914"/> <source>Open dive log file</source> <translation>Obre un fitxer de diari de busseig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Contacting cloud service...</source> <translation>S'està contactant amb el servei al núvol...</translation> </message> @@ -5022,89 +5070,89 @@ Si el vostre dispositiu usa Bluetooth, feu els mateixos preparatius que per a ba <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>Open circuit</source> <translation>Circuit obert</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="466"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> <source>Last stop at 20ft</source> <translation>Última parada a 20 peus</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>50% avg. depth to 20ft</source> <translation>50% de la prof. mitja a 20 peus</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="468"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>20ft to surface</source> <translation>De 20 peus a la superfície</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="469"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="471"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="472"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>Last stop at 6m</source> <translation>Última parada a 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="473"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>50% avg. depth to 6m</source> <translation>50% de la prof. mitja a 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="474"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>6m to surface</source> <translation>De 6 m a la superfície</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="475"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="478"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="479"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> <source>cuft/min</source> <translation>peus/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="487"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="488"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> <source>psi</source> <translation>psi</translation> </message> @@ -5913,29 +5961,55 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation>Plantilla de només lectura!</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and connot be edited. +Please export this template to a different file.</source> + <translation>La plantilla «%1» és de només lectura i no es pot editar. +Exporteu aquesta plantilla a un fitxer diferent.</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Importa un fitxer de plantilla</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> <source>HTML files</source> <translation>Fitxers en HTML</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation>La plantilla de destinació «%1» és de només lectura i no es pot sobreescriure.</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Exporta els fitxers de plantilla com a</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Aquesta acció no es podrà desfer!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Suprimeixo la plantilla %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation>Suprimeixo la plantilla «%1»?</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation>La plantilla «%1» és de només lectura i no es pot suprimir.</translation> </message> </context> <context> @@ -5961,11 +6035,6 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Afegeix un canvi de gas</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation>(Ampolla %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Crea el primer ordinador de busseig</translation> @@ -5986,6 +6055,11 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Suprimeix aquest ordinador de busseig</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation> (amp. %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Afegeix un canvi de punt d'ajust</translation> @@ -6018,7 +6092,7 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Ajusta la pressió de l'ampolla %1 (actualment interpolada com %2)</translation> </message> <message> @@ -6303,7 +6377,7 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6311,7 +6385,7 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>h</translation> </message> @@ -6319,7 +6393,7 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>seg</translation> </message> @@ -6761,7 +6835,7 @@ Fitxers amb una data/hora inapropiada</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation>Importa els missatges (errors, avisos, etc.)</translation> </message> <message> @@ -7043,7 +7117,7 @@ Fitxers amb una data/hora inapropiada</translation> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>No s'ha establert cap vestit</translation> </message> @@ -7371,7 +7445,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Etiquetes buides</translation> </message> @@ -8054,8 +8128,8 @@ Idioma: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="557"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="588"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Cap error</translation> </message> @@ -8179,7 +8253,7 @@ Màxim</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Error en analitzar la capçalera</translation> </message> @@ -8602,12 +8676,12 @@ Màxim</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> + <location filename="../core/dive.c" line="1879"/> <source>(%s) or (%s)</source> <translation>(%s) o (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> <location filename="../core/planner.c" line="1140"/> <location filename="../core/planner.c" line="1143"/> @@ -8981,62 +9055,62 @@ Màxim</translation> <translation>Error en analitzar la mescla de gas</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>No s'ha pogut crear l'analitzador per a %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Error en enregistrar les dades</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Error en analitzar les mostres</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation>La immersió ja s'ha baixat a %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Esdeveniment: s'està a l'espera d'una acció de l'usuari</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s microprogramari=%u sèrie=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Error en enregistrar el manegador d'esdeveniments.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Error en enregistrar el manegador de cancel·lació.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Error en importar les dades de les immersions</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>No s'ha pogut crear un context de «libdivecomputer»</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>No s'ha pogut obrir %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9045,7 +9119,7 @@ En la majoria dels casos, per a depurar aquest problema, serà útil un fitxer d Podeu crear aquest fitxer de registre seleccionant la casella de selecció corresponent al diàleg de baixada.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation>No hi ha cap immersió nova baixada des de l'ordinador de busseig</translation> </message> @@ -9142,11 +9216,6 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation>pla d'immersió</b> (S'han detectat immersions superposades)</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="114"/> <source>Runtime: %dmin %s</source> <translation>Temps acumulat: %dmin %s</translation> @@ -9291,6 +9360,11 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>Pla d'immersió</b> creat a</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation>pla d'immersió</b> (s'han detectat immersions superposades)</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Model de descompressió Bühlmann ZHL-16C amb GFBaix = %d%% i GFAlt = %d%%</translation> @@ -9361,7 +9435,7 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1332"/> + <location filename="../core/profile.c" line="1373"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9370,83 +9444,83 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1385"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1350"/> + <location filename="../core/profile.c" line="1391"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1353"/> + <location filename="../core/profile.c" line="1394"/> <source>SAC: %.*f%s/min </source> <translation>CAS: %.*f%s/min. </translation> </message> <message> - <location filename="../core/profile.c" line="1355"/> + <location filename="../core/profile.c" line="1396"/> <source>CNS: %u%% </source> <translation>SNC: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1398"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1359"/> + <location filename="../core/profile.c" line="1400"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1402"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1364"/> + <location filename="../core/profile.c" line="1405"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1445"/> <source>Deco: %umin @ %.0f%s </source> <translation>Parada de desco: %u min. @ %.0f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1437"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Parada de seguretat: %u min. @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1381"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1372"/> + <location filename="../core/profile.c" line="1414"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9455,7 +9529,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1376"/> + <location filename="../core/profile.c" line="1420"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9464,163 +9538,163 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1379"/> + <location filename="../core/profile.c" line="1425"/> <source>Density: %.1fg/ℓ </source> <translation>Densitat: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1393"/> + <location filename="../core/profile.c" line="1440"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Parada de seguretat: temps desc. @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1401"/> + <location filename="../core/profile.c" line="1448"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Parada de desco: temps desc. @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1405"/> + <location filename="../core/profile.c" line="1452"/> <source>In deco </source> <translation>En descompressió</translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1454"/> <source>NDL: %umin </source> <translation>NDL: %u min. </translation> </message> <message> - <location filename="../core/profile.c" line="1410"/> + <location filename="../core/profile.c" line="1457"/> <source>TTS: %umin </source> <translation>TTS: %u min. </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1460"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Parada de desco: %u min. @ %.0f%s (calc)</translation> </message> <message> - <location filename="../core/profile.c" line="1421"/> + <location filename="../core/profile.c" line="1468"/> <source>In deco (calc) </source> <translation>En descompressió (calc)</translation> </message> <message> - <location filename="../core/profile.c" line="1424"/> + <location filename="../core/profile.c" line="1471"/> <source>NDL: %umin (calc) </source> <translation>NDL: %u min. (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1426"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: >2h (calc) </source> <translation>LND: >2 h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1430"/> + <location filename="../core/profile.c" line="1477"/> <source>TTS: %umin (calc) </source> <translation>TTS: %u min. (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1432"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2 h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1482"/> <source>RBT: %umin </source> <translation>RBT: %u min. </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1485"/> <source>Calculated ceiling %.0f%s </source> <translation>Sostre calculat %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1444"/> + <location filename="../core/profile.c" line="1491"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Teixit %.0fmin: %.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1497"/> <source>heart rate: %d </source> <translation>Ritme cardíac: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1452"/> + <location filename="../core/profile.c" line="1499"/> <source>bearing: %d </source> <translation>Orientació: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1455"/> + <location filename="../core/profile.c" line="1502"/> <source>mean depth to here %.1f%s </source> <translation>Prof. mitja fins aquí %.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1551"/> + <location filename="../core/profile.c" line="1599"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1555"/> - <location filename="../core/profile.c" line="1559"/> - <location filename="../core/profile.c" line="1563"/> + <location filename="../core/profile.c" line="1603"/> + <location filename="../core/profile.c" line="1607"/> + <location filename="../core/profile.c" line="1611"/> <source>%s %sD:%.1f%s</source> <translation>%s %sProf:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1567"/> + <location filename="../core/profile.c" line="1615"/> <source>%s %sD:%.1f%s </source> <translation>%s %sProf:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1619"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1575"/> - <location filename="../core/profile.c" line="1579"/> + <location filename="../core/profile.c" line="1623"/> + <location filename="../core/profile.c" line="1627"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1586"/> + <location filename="../core/profile.c" line="1634"/> <source>%s %sP:%d %s</source> <translation>%s %sPres:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1611"/> + <location filename="../core/profile.c" line="1659"/> <source>%s SAC: %.*f%s</source> <translation>%s CAS: %.*f%s</translation> </message> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index fad399dda..e8ca156da 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -46,66 +46,86 @@ <translation>Auswahl des externen Bluetooth-Geräts</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Erkannte Geräte</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Durchsuchen</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Löschen</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Lokale Bluetooth-Gerätedetails</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Name: </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Adresse:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth eingeschaltet</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Ein-/ausschalten</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Gerät auswählen:</translation> @@ -284,17 +304,17 @@ <translation>Geräterkennungsfehler: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="477"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Nicht verfügbar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="484"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Auf den lokalen Bluetooth-Adapter kann nicht zugegriffen werden.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="534"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Der Geräteerkennungsassistent wurde nicht erstellt, da Adresse %1 nicht der Adapteradresse eines lokalen Bluetooth-Geräts entspricht.</translation> </message> @@ -315,7 +335,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Keine Tauchpartner</translation> </message> @@ -1635,82 +1655,82 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Tauchcomputereinstellungen sichern</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> <source>Backup files</source> <translation>Sicherungs Dateien</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>XML-Sicherungsfehler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Beim Speichern der Datensicherungsdatei ist ein Fehler aufgetreten. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Sicherung abgeschlossen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Ihre Einstellungen wurden gespeichert nach: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Tauchcomputereinstellungen wiederherstellen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>XML-Wiederherstellungsfehler</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Beim Wiederherstellen der Datensicherungsdatei ist ein Fehler aufgetreten. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Wiederherstellung abgeschlossen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Ihre Einstellungen wurden erfolgreich wiederhergestellt.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Firmwaredatei auswählen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> <source>Log files</source> <translation>Log Dateien</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> <source>Choose file for dive computer download logfile</source> <translation>Wählen Sie die Datei für das Tauchcomputer-Download-Protokoll aus</translation> </message> @@ -1925,27 +1945,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Tauchgangsdetails</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Tauchgang löschen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation>Bearbeiten abbrechen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Kartenansicht</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>mehrere Tauchpartner</translation> </message> @@ -1953,104 +1973,104 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Tauchgang %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Position:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Koordinaten:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Momentante GPS- Position verwenden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Tiefe:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Dauer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Lufttemp.:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Wassertemp.: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Tauchpartner:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Gewicht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Flasche:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Gemisch:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Anfangsdruck:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Enddruck:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation>Sicht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Notizen:</translation> </message> @@ -2126,23 +2146,23 @@ Position verwenden</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation> (Fl. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Manueller Wechsel auf OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> Anfang</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> Ende</translation> @@ -2921,7 +2941,7 @@ Position verwenden</translation> <translation><numerusform>(%n Tauchgang)</numerusform><numerusform>(%n Tauchgänge)</numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>mehrere Tauchpartner</translation> </message> @@ -2967,38 +2987,38 @@ Position verwenden</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="157"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="192"/> + <location filename="../qt-models/diveplannermodel.cpp" line="277"/> <source>cyl.</source> <translation>Fl.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Final depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Run time</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Used gas</source> <translation>Verw. Gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>CC setpoint</source> <translation>CC Setpoint</translation> </message> @@ -3034,107 +3054,107 @@ Position verwenden</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Zeit</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Druck</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Farbe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Benutzer Eingabe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Druck S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Druck I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Auftauchgrenze</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>AMV</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Umgebungsdruck</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Pulsrate</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Gradientenfaktor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Mittlere Tiefe @ s</translation> </message> @@ -3454,68 +3474,68 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Herunterladen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Bluetooth-Modus auswählen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation>Verbinde mit Tauchcomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="227"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Finde Uemis Tauchcomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>Herunterladen abbrechen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="369"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>Wählen Sie die Datei für das Tauchcomputer-Download-Protokoll aus</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="370"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> <source>Log files</source> <translation>Log Dateien</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="395"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>Wählen Sie die Datei aus, in die der libdivecomputer Dump gespeichert werden soll</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="396"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> <source>Dump files</source> <translation>Dump Dateien</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> <source>Retry download</source> <translation>Herunterladen wiederholen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="384"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt.</translation> </message> @@ -3903,7 +3923,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Keine Position festgelegt</translation> </message> @@ -4297,7 +4317,7 @@ Trotzdem fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="543"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="560"/> <source>Open</source> <translation>Öffnen</translation> </message> @@ -4639,63 +4659,63 @@ Trotzdem fortfahren?</translation> <translation>Verbinden zum Cloud-Dienst</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="354"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Connect to</source> <translation>Verbinden mit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> <source>Disconnect from</source> <translation>Trennen von</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="579"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1656"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="596"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor eine neue Datei geöffnet wird.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="540"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="557"/> <source>Open file</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="544"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="656"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="611"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>Kein leeres Logbuch in der Cloud speichern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="652"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> <source>Traverse image directories</source> <translation>Bildverzeichnisse durchsuchen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="655"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> <source>Scan</source> <translation>Durchsuchen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="663"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> <source>Scanning images...(this can take a while)</source> <translation>Bilder werden gesucht...(dies kann eine Weile dauern)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="835"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="945"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1033"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1039"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Warning</source> <translation>Warnung</translation> </message> @@ -4705,202 +4725,221 @@ Trotzdem fortfahren?</translation> <translation>Es wird versucht, Tauchgänge mit %1min Oberflächenpause zusammenzuführen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="731"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor die Datei geschlossen wird.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="835"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchgang hinzugefügt werden kann.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="887"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="909"/> <source>Print runtime table</source> <translation>Runtimetabelle anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="945"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Es wird versucht, einen Tauchgang, der ursprünglich nicht im Planer erstellt wurde, im Planer zu öffnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1033"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Bitte zuerst die aktuelle Bearbeitung abschließen um eine neue zu beginnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1039"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Es wird versucht, einen nicht Tauchgang, der nicht manuell erstellt wurde, zu editieren.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1086"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> <source>Dive log files</source> <translation>Logbuch Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1684"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>Subsurface files</source> <translation>Subsurface Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1286"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1332"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1290"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1291"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1335"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1292"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1336"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1294"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1338"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1339"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1340"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>MkVI files</source> <translation>MkVI Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1297"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1341"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>APD log viewer</source> <translation>APD Log Viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1298"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1342"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1330"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>All files</source> <translation>Alle Dateien</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Möchtest Sie Ihre Änderungen in der Datendatei speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <source>Changes will be lost if you don't save them.</source> <translation>Änderungen gehen verloren, wenn Du sie nicht speicherst.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1683"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1705"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1771"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1793"/> <source>[local cache for] %1</source> <translation>[Lokaler Zwischenspeicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1773"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/> <source>[cloud storage for] %1</source> <translation>[Cloud-Speicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1880"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1902"/> <source>Opening datafile from older version</source> <translation>Datendatei von älterer Version wird geöffnet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1881"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1903"/> <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>Es wurde eine Datei von einer älteren Subsurface-Version geöffnet. Wir empfehlen das Handbuch zu lesen, um die Unterschiede der neuen Version insbesondere in der Tauchplatzverwaltung kennen zu lernen. Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die neue Tauchplatzverwaltung anzuschauen und sicher zu stellen, dass alles richtig aussieht. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1892"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1914"/> <source>Open dive log file</source> <translation>Logbuchdatei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Contacting cloud service...</source> <translation>Kontaktaufnahme mit dem Cloud-Dienst...</translation> </message> @@ -5017,89 +5056,89 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>Open circuit</source> <translation>Offenes System</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="466"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> <source>Last stop at 20ft</source> <translation>Letzter Stopp auf 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>50% avg. depth to 20ft</source> <translation>50% mittlerer Tiefe bis 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="468"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>20ft to surface</source> <translation>20ft bis Oberfläche</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="469"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="471"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="472"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>Last stop at 6m</source> <translation>Letzter Stopp auf 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="473"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>50% avg. depth to 6m</source> <translation>50% mittlerer Tiefe bis 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="474"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>6m to surface</source> <translation>6m bis Oberfläche</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="475"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="478"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="479"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> <source>cuft/min</source> <translation>cft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="487"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="488"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> <source>psi</source> <translation>psi</translation> </message> @@ -5908,29 +5947,54 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and connot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Vorlagendatei importieren</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> <source>HTML files</source> <translation>HTML Dateien</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Vorlagendateien exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Diese Aktion kann nicht rückgängig gemacht werden!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Vorlage löschen: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5956,11 +6020,6 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation> (Tank %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Als ersten Tauchcomputer setzen</translation> @@ -5981,6 +6040,11 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Diesen Tauchcomputer entfernen</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation> (Fl. %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>CC Setpoint-Wechsel setzen</translation> @@ -6013,8 +6077,8 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Druck in Flasche %1 (momentan zu %2 interpoliert)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation>Druck in Flasche %1 anpassen (momentan zu %2 interpoliert)</translation> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -6298,7 +6362,7 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6306,7 +6370,7 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>h</translation> </message> @@ -6314,7 +6378,7 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>s</translation> </message> @@ -6755,7 +6819,7 @@ Dateien mit unpassendem Datum/Zeit</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation>Nachrichten (Fehlermeldungen, Warnungen usw.) importieren</translation> </message> <message> @@ -7040,7 +7104,7 @@ Dateien mit unpassendem Datum/Zeit</translation> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>Kein Anzug eingetragen</translation> </message> @@ -7369,7 +7433,7 @@ den folgenden Gasen gemischt werden: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Leere Tags</translation> </message> @@ -8052,8 +8116,8 @@ Sprache: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="557"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="588"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Kein Fehler</translation> </message> @@ -8177,7 +8241,7 @@ Durchschnitt</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Fehler beim Lesen der Kopfdaten</translation> </message> @@ -8600,12 +8664,12 @@ Durchschnitt</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> + <location filename="../core/dive.c" line="1879"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> <location filename="../core/planner.c" line="1140"/> <location filename="../core/planner.c" line="1143"/> @@ -8979,62 +9043,62 @@ Durchschnitt</translation> <translation>Fehler beim Lesen des Gasgemischs</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Nicht in der Lage, einen Parser für %s %s zu erstellen</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Fehler beim Registrieren der Daten</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Fehler beim Lesen der Segmente</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation>Tauchgang bereits heruntergeladen am %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9043,7 +9107,7 @@ In solchen Fällen ist oft eine libdivecomputer Logdatei hilfreich. Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation>Keine neuen Tauchgänge vom Tauchcomputer heruntergeladen</translation> </message> @@ -9143,11 +9207,6 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation>Plan</b> (Überlappende Tauchgänge erkannt)</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="114"/> <source>Runtime: %dmin %s</source> <translation>Runtime: %dmin %s</translation> @@ -9292,6 +9351,11 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>Plan</b> erstellt am</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation>Plan</b> (überlappende Tauchgänge erkannt)</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomodell: Bühlmann ZHL-16C mit GF niedrig = %d%% und GF hoch = %d%%</translation> @@ -9362,7 +9426,7 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1332"/> + <location filename="../core/profile.c" line="1373"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9371,84 +9435,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1385"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1350"/> + <location filename="../core/profile.c" line="1391"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1353"/> + <location filename="../core/profile.c" line="1394"/> <source>SAC: %.*f%s/min </source> <translation>AMV: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1355"/> + <location filename="../core/profile.c" line="1396"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1398"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1359"/> + <location filename="../core/profile.c" line="1400"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1402"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1364"/> + <location filename="../core/profile.c" line="1405"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1445"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1437"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Sicherheitsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1381"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1372"/> + <location filename="../core/profile.c" line="1414"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9457,7 +9521,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1376"/> + <location filename="../core/profile.c" line="1420"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9466,168 +9530,168 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1379"/> + <location filename="../core/profile.c" line="1425"/> <source>Density: %.1fg/ℓ </source> <translation>Dichte: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1393"/> + <location filename="../core/profile.c" line="1440"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1401"/> + <location filename="../core/profile.c" line="1448"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deko: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1405"/> + <location filename="../core/profile.c" line="1452"/> <source>In deco </source> <translation>In Deko </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1454"/> <source>NDL: %umin </source> <translation>Nullzeit: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1410"/> + <location filename="../core/profile.c" line="1457"/> <source>TTS: %umin </source> <translation>Gesamtaufstiegszeit: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1460"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1421"/> + <location filename="../core/profile.c" line="1468"/> <source>In deco (calc) </source> <translation>Deko (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1424"/> + <location filename="../core/profile.c" line="1471"/> <source>NDL: %umin (calc) </source> <translation>Nullzeit: %umin (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1426"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: >2h (calc) </source> <translation>Nullzeit: > 2h (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1430"/> + <location filename="../core/profile.c" line="1477"/> <source>TTS: %umin (calc) </source> <translation>Gesamtaufstiegszeit: %umin (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1432"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: >2h (calc) </source> <translation>Gesamtaufstiegszeit: > 2h (berechnet) </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1482"/> <source>RBT: %umin </source> <translation>Restgrundzeit: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1485"/> <source>Calculated ceiling %.0f%s </source> <translation>Berechnete Auftauchgrenze %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1444"/> + <location filename="../core/profile.c" line="1491"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Gewebe %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1497"/> <source>heart rate: %d </source> <translation>Puslrate: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1452"/> + <location filename="../core/profile.c" line="1499"/> <source>bearing: %d </source> <translation>Peilung: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1455"/> + <location filename="../core/profile.c" line="1502"/> <source>mean depth to here %.1f%s </source> <translation>Durchschnittstiefe bis hier %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1551"/> + <location filename="../core/profile.c" line="1599"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1555"/> - <location filename="../core/profile.c" line="1559"/> - <location filename="../core/profile.c" line="1563"/> + <location filename="../core/profile.c" line="1603"/> + <location filename="../core/profile.c" line="1607"/> + <location filename="../core/profile.c" line="1611"/> <source>%s %sD:%.1f%s</source> <translation>%s %sTiefe:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1567"/> + <location filename="../core/profile.c" line="1615"/> <source>%s %sD:%.1f%s </source> <translation>%s %sTiefe:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1619"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1575"/> - <location filename="../core/profile.c" line="1579"/> + <location filename="../core/profile.c" line="1623"/> + <location filename="../core/profile.c" line="1627"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1586"/> + <location filename="../core/profile.c" line="1634"/> <source>%s %sP:%d %s</source> <translation>%s %sDruck:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1611"/> + <location filename="../core/profile.c" line="1659"/> <source>%s SAC: %.*f%s</source> <translation>%s AMV: %.*f %s</translation> </message> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index fa1a6c571..473abb691 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -47,66 +47,86 @@ <translation>Selección de dispositivo Bluetooth remoto</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Dispositivos encontrados</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Salir</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation>Modo Bluetooth</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation>Auto</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation>Forzar LE</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation>Forzar clásico</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Buscar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Limpiar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Detalles del dispositivo Bluetooth local</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Nombre:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Dirección:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth activado</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Activar/desactivar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Seleccionar dispositivo:</translation> @@ -285,17 +305,17 @@ <translation>Error en la busqueda de dispositivos: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="477"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>No disponible</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="484"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>No se puede acceder al adaptador de Bluetooth local.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="534"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>No se creó el agente de busqueda de dispositivos porque la dirección %1 no coincide con la dirección del adaptador físico de ningún dispositivo Bluetooth.</translation> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Sin compañeros</translation> </message> @@ -1636,82 +1656,82 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Hacer copia de seguridad de los ajustes</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> <source>Backup files</source> <translation>Copia de seguirdad</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>Error en la copia de seguridad XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Se produjo un error al guardar la copia de seguridad. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Copia de seguridad correcta</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Se han guardado los ajustes en: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Recuperar ajustes del ordenador de buceo</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>Error al recuperar el XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ocurrió un error al recuperar la copia de seguridad. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Recuperación correcta</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Los ajustes se han recuperado correctamente.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Seleccionar archivo de firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> <source>All files</source> <translation>Todos los archivos</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> <source>Log files</source> <translation>Archivos de registro</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> <source>Choose file for dive computer download logfile</source> <translation>Seleccionar archivo de registro para descarga desde ordenador de buceo</translation> </message> @@ -1928,27 +1948,27 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Detalles de inmersión</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Eliminar inmersión</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation>Cancelar edición</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Mostrar en el mapa</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Varios Compañeros</translation> </message> @@ -1956,104 +1976,104 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Inmersión %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Fecha:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Ubicación:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Coordenadas:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Utilizar posición GPS actual:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Profundidad:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Duración:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Temp. del aire:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Temp. del agua:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Traje:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Compañero:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Peso:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Botella:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Mezcla de gas:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Presión inicial:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Presión final:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Calificación:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation>Visibilidad:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Notas:</translation> </message> @@ -2129,23 +2149,23 @@ GPS actual:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation>(bot. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Cambio manual a OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation>comienzo</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation>fin</translation> @@ -2924,7 +2944,7 @@ GPS actual:</translation> <translation><numerusform>(%n inmersión(es))</numerusform><numerusform>(%n inmersión(es))</numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Varios Compañeros</translation> </message> @@ -2970,38 +2990,38 @@ GPS actual:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="157"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="192"/> + <location filename="../qt-models/diveplannermodel.cpp" line="277"/> <source>cyl.</source> <translation>bot.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Final depth</source> <translation>Profundidad final</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Run time</source> <translation>Tiempo acumulado</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Used gas</source> <translation>Gas usado</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -3037,107 +3057,107 @@ GPS actual:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Profundidad</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Hora de entrada</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Presión</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Color</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Introducido por el usuario</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Presión S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Presión I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Techo</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Presión ambiental</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Ritmo cardiaco</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Factor de gradiente</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Profundidad/es media/s</translation> </message> @@ -3457,68 +3477,68 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Descargar</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Elegir modo de descarga Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation>Conectado con el ordenador de buceo</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="227"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Encontrar ordenador de buceo Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>Cancelar descarga</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="369"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>Seleccionar archivo de registro para descarga desde ordenador de buceo</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="370"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> <source>Log files</source> <translation>Archivos de registro</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="395"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>Selecciona archivo para el volcado binario desde el ordenador de buceo</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="396"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> <source>Dump files</source> <translation>Archivos de volcado</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> <source>Retry download</source> <translation>Reintentar descarga</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="384"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Guardar el volcado de libdivecomputer NO descargará buceos a la lista de inmersiones.</translation> </message> @@ -3906,7 +3926,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Sin localización</translation> </message> @@ -4300,7 +4320,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="543"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="560"/> <source>Open</source> <translation>Abrir</translation> </message> @@ -4642,63 +4662,63 @@ p, li { white-space: pre-wrap; } <translation>Activar almacenamiento en la nube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="354"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Connect to</source> <translation>Conectar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> <source>Disconnect from</source> <translation>Desconectar de </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="579"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1656"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="596"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de abrir otro archivo.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="540"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="557"/> <source>Open file</source> <translation>Abrir archivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="544"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="656"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="611"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>No guardar un divelog vacío en la nube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="652"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> <source>Traverse image directories</source> <translation>Buscar en directorios de imágenes</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="655"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> <source>Scan</source> <translation>Escanear</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="663"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> <source>Scanning images...(this can take a while)</source> <translation>Buscando imágenes ... (esto puede llevar un tiempo)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="835"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="945"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1033"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1039"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Warning</source> <translation>Advertencia</translation> </message> @@ -4708,202 +4728,229 @@ p, li { white-space: pre-wrap; } <translation>Intentando fusionar inmersiones con %1min de intervalo entre ellas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <source>Template backup created</source> + <translation>Creada plantilla de respaldo</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation>Se han creado las siguientes plantillas de respaldo: + +%1 + +Ubicación: + +%2 + +Desde esta versión de Subsurface, las plantillas predefinidas serán de solo lectura y no deben editarse directamente, ya que la aplicación puede sobre escribirlas al iniciarse.</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="731"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de cerrar el archivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="835"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de intentar añadir otra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="887"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="909"/> <source>Print runtime table</source> <translation>Imprimir tabla de tiempo acumulado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="945"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Se está intentando re-planificar un buceo que no ha sido planificado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1033"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Por favor, termina la edición actual antes de intentar hacer otra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1039"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Intentando editar una inmersión que no se ha añadido manualmente.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1086"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> <source>Yearly statistics</source> <translation>Estadísticas anuales</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> <source>Dive log files</source> <translation>Archivos de registro de inmersiones </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1684"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>Subsurface files</source> <translation>archivos de Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1286"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1332"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1290"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1291"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1335"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1292"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1336"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1294"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1338"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1339"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1340"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>MkVI files</source> <translation>archivos MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1297"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1341"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>APD log viewer</source> <translation>APD Log Viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1298"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1342"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>OSTCtools</source> <translation>OSTCtool</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1330"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>All files</source> <translation>Todos los archivos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>¿Quieres guardar los cambios realizados en el archivo %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>¿Quieres guardar los cambios que has hecho en el archivo de datos?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Save changes?</source> <translation>¿Guardar cambios?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <source>Changes will be lost if you don't save them.</source> <translation>Se perderán los cambios si no los guarda.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1683"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1705"/> <source>Save file as</source> <translation>Guardar archivo como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1771"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1793"/> <source>[local cache for] %1</source> <translation>[caché local de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1773"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/> <source>[cloud storage for] %1</source> <translation>[almacenamiento en la nube de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1880"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1902"/> <source>Opening datafile from older version</source> <translation>Abriendo archivo de datos de una versión anterior</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1881"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1903"/> <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>Has abierto un archivo de datos de una versión anterior de Subsurface. Te recomendaamos leer el manual para informarte acerca de los cambios de la nueva versión, especialmente sobre la gestión de puntos de buceo que ha variado significativamente. Subsurface ya ha intentado cargar los datos pero puede que merezca la pena perder un momento en echar una mirada al nuevo sistema de gestión de puntos de buceo para asegurarte de que todo este correcto.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1892"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1914"/> <source>Open dive log file</source> <translation>Abrir archivo de registro de inmersiones</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Contacting cloud service...</source> <translation>Contactando con el servicio en la nube ...</translation> </message> @@ -5020,89 +5067,89 @@ Si tu dispositivo usa Bluetooth, efectúa los mismos preparativos que para desca <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>Open circuit</source> <translation>Circuito abierto</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="466"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> <source>Last stop at 20ft</source> <translation>Última parada a 20pies</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>50% avg. depth to 20ft</source> <translation>De 50% de prof. media a 20 pies</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="468"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>20ft to surface</source> <translation>De 20 pies a superficie</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="469"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="471"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="472"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>Last stop at 6m</source> <translation>Última parada a 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="473"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>50% avg. depth to 6m</source> <translation>De 50% prof. media a 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="474"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>6m to surface</source> <translation>De 6m a superficie</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="475"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="478"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="479"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> <source>cuft/min</source> <translation>pies3/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="487"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="488"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> <source>psi</source> <translation>psi</translation> </message> @@ -5911,29 +5958,55 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation>¡Plantilla de solo lectura!</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and connot be edited. +Please export this template to a different file.</source> + <translation>La plantilla '%1' es de solo-lectura y no puede editarse. +Por favor, copia esta plantilla a un archivo distinto.</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Importar archivo de plantilla</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> <source>HTML files</source> <translation>archivo HTML</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation>La plantilla de destino '%1' es de solo-lectura y no puede ser sobre escrita.</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Exportar archivos de plantilla como</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>¡Esta acción no puede deshacerse!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>¿Borrar plantilla %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation>¿ Borrar plantilla '%1' ?</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation>La plantilla '%1' es de solo-lectura y no puede ser borrada.</translation> </message> </context> <context> @@ -5959,11 +6032,6 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Añadir cambio de gas</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation>(Botella %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Convertir en ordenador de buceo principal</translation> @@ -5984,6 +6052,11 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Borrar este ordenador de buceo</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation>(bot. %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Añadir cambio de "set-point"</translation> @@ -6016,8 +6089,8 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Ajustar presión de botella %1 (actualmente calculada como %2)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation>Ajusta la presión de Bot. %1 (actualmente interpolada como %2)</translation> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -6301,7 +6374,7 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6309,7 +6382,7 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>h</translation> </message> @@ -6317,7 +6390,7 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>seg</translation> </message> @@ -6760,8 +6833,8 @@ Archivos con fecha/hora incorrectas</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>Mensajes de importación (Errores, avisos, etc)</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation>Mensajes de la importación (errores, avisos, etc)</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -7045,7 +7118,7 @@ Archivos con fecha/hora incorrectas</translation> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>Sin traje definido</translation> </message> @@ -7374,7 +7447,7 @@ a partir de aire y usando: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Etiquetas vacío</translation> </message> @@ -8057,8 +8130,8 @@ Idioma: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="557"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="588"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Sin errores</translation> </message> @@ -8182,7 +8255,7 @@ Media</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Error al analizar la cabecera</translation> </message> @@ -8605,12 +8678,12 @@ Media</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> + <location filename="../core/dive.c" line="1879"/> <source>(%s) or (%s)</source> <translation>(%s) o (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> <location filename="../core/planner.c" line="1140"/> <location filename="../core/planner.c" line="1143"/> @@ -8984,62 +9057,62 @@ Media</translation> <translation>Error al analizar la mezcla de gas</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>No es posible crear el analizador para %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Error al registrar los datos</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Error al analizar las muestras</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation>Inmersión ya descargada en %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Evento: esperando acción del usuario</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation>modelo=%s firmware=%u serie=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Error al registrar el manejador de eventos</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Error al registrar el manejador de cancelación</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Error al importar datos de inmersiones</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>No es posible crear el contexto de libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>No se pudo abrir %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9048,7 +9121,7 @@ En la mayoría de los casos, para depurar este problema, sería útil un archivo Puedes crear el archivo de registro seleccionando la casilla correspondiente en el diálogo de descargas.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation>No hay nuevas inmersiones descargadas del ordenador de buceo</translation> </message> @@ -9148,11 +9221,6 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en <translation>BÜHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation>Plan de inmersión</b> (Se ha detectado superposición de inmersiones)</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="114"/> <source>Runtime: %dmin %s</source> <translation>Runtime: %dmin %s</translation> @@ -9297,6 +9365,11 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en <translation>plan de buceo</b> creado en</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation>plan de buceo</b> (detectadas inmersiones solapadas)</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modelo deco: Bühlmann ZHL-16C con GFbajo = %d%% y GFalto = %d%%</translation> @@ -9367,7 +9440,7 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1332"/> + <location filename="../core/profile.c" line="1373"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9376,84 +9449,84 @@ Prof: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1385"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1350"/> + <location filename="../core/profile.c" line="1391"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1353"/> + <location filename="../core/profile.c" line="1394"/> <source>SAC: %.*f%s/min </source> <translation>CAS: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1355"/> + <location filename="../core/profile.c" line="1396"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1398"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1359"/> + <location filename="../core/profile.c" line="1400"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1402"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1364"/> + <location filename="../core/profile.c" line="1405"/> <source>MOD: %d%s </source> <translation>PMO: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1445"/> <source>Deco: %umin @ %.0f%s </source> <translation>Parada deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1437"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Parada de seguridad: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1381"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1372"/> + <location filename="../core/profile.c" line="1414"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9462,7 +9535,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1376"/> + <location filename="../core/profile.c" line="1420"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9471,168 +9544,168 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1379"/> + <location filename="../core/profile.c" line="1425"/> <source>Density: %.1fg/ℓ </source> <translation>Densidad: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1393"/> + <location filename="../core/profile.c" line="1440"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Parada de seguridad: duración desconocida @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1401"/> + <location filename="../core/profile.c" line="1448"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Parada deco: duración desconocida @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1405"/> + <location filename="../core/profile.c" line="1452"/> <source>In deco </source> <translation>En deco </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1454"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1410"/> + <location filename="../core/profile.c" line="1457"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1460"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Parada deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1421"/> + <location filename="../core/profile.c" line="1468"/> <source>In deco (calc) </source> <translation>En deco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1424"/> + <location filename="../core/profile.c" line="1471"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1426"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: >2h (calc) </source> <translation>LND: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1430"/> + <location filename="../core/profile.c" line="1477"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1432"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1482"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1485"/> <source>Calculated ceiling %.0f%s </source> <translation>Techo calculado %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1444"/> + <location filename="../core/profile.c" line="1491"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tejido %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1497"/> <source>heart rate: %d </source> <translation>ritmo cardiaco: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1452"/> + <location filename="../core/profile.c" line="1499"/> <source>bearing: %d </source> <translation>Soporte: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1455"/> + <location filename="../core/profile.c" line="1502"/> <source>mean depth to here %.1f%s </source> <translation>Prof. media hasta aquí %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1551"/> + <location filename="../core/profile.c" line="1599"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1555"/> - <location filename="../core/profile.c" line="1559"/> - <location filename="../core/profile.c" line="1563"/> + <location filename="../core/profile.c" line="1603"/> + <location filename="../core/profile.c" line="1607"/> + <location filename="../core/profile.c" line="1611"/> <source>%s %sD:%.1f%s</source> <translation>%s %sProf:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1567"/> + <location filename="../core/profile.c" line="1615"/> <source>%s %sD:%.1f%s </source> <translation>%s %sProf:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1619"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1575"/> - <location filename="../core/profile.c" line="1579"/> + <location filename="../core/profile.c" line="1623"/> + <location filename="../core/profile.c" line="1627"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1586"/> + <location filename="../core/profile.c" line="1634"/> <source>%s %sP:%d %s</source> <translation>%s %sPres:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1611"/> + <location filename="../core/profile.c" line="1659"/> <source>%s SAC: %.*f%s</source> <translation>%s CAS: %.*f%s</translation> </message> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 571b81745..7f7f23ed1 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -47,66 +47,86 @@ <translation>Sélection du périphérique Bluetooth distant</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Périphériques découverts</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Sauvegarder</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Quitter</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation>Mode Bluetooth</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation>Auto</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Scanner</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Effacer</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Détails du périphérique Bluetooth local</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Nom : </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Adresse :</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth activé</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Allumer/éteindre</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Sélectionner le périphérique :</translation> @@ -117,22 +137,22 @@ <translation>Nom :</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation>Impossible d'initialiser Winsock version 2.2</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Tentative d'activation du périphérique Bluetooth local ...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Tentative de désactivation du périphérique Bluetooth local ...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation>La liste des périphériques distants a été supprimée.</translation> </message> @@ -164,22 +184,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>PAIRED</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>APPAIRAGE_AUTORISÉ</translation> </message> @@ -189,113 +209,113 @@ <translation>%1 (%2) [État : %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Le périphérique %1 peut être utilisé pour la connexion. Vous pouvez cliquer sur le bouton Enregistrer.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Le périphérique %1 doit être appairé pour être utilisé. Veuillez utiliser le menu pour les options d'appairage.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation>Un périphérique a besoin d'une adresse non nulle pour une connexion</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>Le périphérique local a été modifié.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>Appairer</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>Supprimer l'appairage</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>Tentative d'appairage avec le périphérique %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>Tentative de desappairage avec le périphérique %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>Le périphérique %1 a été désappairé.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>Le périphérique %1 a été appairé.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>Le périphérique %1 a été appairé et est autorisé.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Le périphérique %1 peut maintenant être utilisé pour la connexion. Vous pouvez cliquer sur le bouton Enregistrer.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>Erreur du périphérique local : %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Erreur d'appairage. Si le périphérique distant nécessite un code PIN personnalisé, veuillez essayer d'appairer votre périphérique avec votre système d'exploitation. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>Erreur inconnue</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>L'adaptateur Bluetooth est éteint, l'allumer avant de lancer la recherche.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>L'écriture ou la lecture sur le périphérique a provoqué une erreur.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation>Une erreur inconnue s'est produite.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation>Erreur de découverte de périphérique : %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Non disponible</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Impossible de communiquer avec l'interface Bluetooth locale</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>L'agent de découverte des périphériques n'a pas été créé car l'adresse %1 ne correspond à aucune adresse de périphérique Bluetooth local.</translation> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Aucun partenaire</translation> </message> @@ -1636,84 +1656,84 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Sauvegarder les paramètres de l'ordinateur de plongée</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Sauvegarder les fichiers (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation>Fichiers de sauvegarde (backup)</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>Erreur de sauvegarde XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Une erreur s'est produite lors de l'enregistrement du fichier de sauvegarde. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Sauvegarde réussie</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Vos paramètres ont été enregistrés vers : %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Restaurer les paramètres de l'ordinateur de plongée</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>Erreur de restauration XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Une erreur s'est produite lors de la restauration du fichier de sauvegarde. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>La restauration s'est effectuée avec succès</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Vos paramètres ont été restaurés avec succès.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Sélectionner le fichier de firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Tous les fichiers (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation>Tous les fichiers</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> - <translation>Choisir le fichier pour le téléchargement du fichier log de l'ordinateur de plongée</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> + <translation>Fichiers log</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Fichier de log (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation>Choisir le fichier pour le téléchargement du fichier log de l'ordinateur de plongée</translation> </message> </context> <context> @@ -1793,27 +1813,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Retirer ce bloc.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Profondeur de changement pour le gaz de déco. Calculé en utilisant les préférences de pO2 de déco, à moins qu'elle ne soit définie manuellement.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Calculé en utilisant les préférences de pO2 de fond. La modification du MOD ajuste le taux d'O₂ sur '*' permettant un meilleur taux à la profondeur max.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Calculé en utilisant les préférences du Meilleur Mélange du END. La modification du MND ajuste le taux d'He sur '*' permettant un meilleur taux à la profondeur max.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Ce gaz est utilisé. Seuls les blocs qui ne sont pas utilisés dans la plongée peuvent être retirés.</translation> </message> @@ -1927,27 +1947,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Détails de la plongée</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Supprimer la plongée</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation>Annuler les modifications</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Afficher sur la carte</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Equipiers multiples</translation> </message> @@ -1955,104 +1975,104 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Plongée n°%1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Date :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Lieu :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Coordonnées :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Utiliser la position GPS actuelle :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Profondeur :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Durée :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Température de l'air :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Température de l'eau :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Combinaison :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Équipier :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Moniteur / Guide de palanquée :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Poids:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Bloc :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Mélange de Gaz</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Pression initiale</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Pression finale</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Évaluation :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation>Visibilité :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Notes :</translation> </message> @@ -2128,23 +2148,23 @@ GPS actuelle :</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation>(Bloc. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Passer manuellement sur OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> début</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> fin</translation> @@ -2309,12 +2329,12 @@ GPS actuelle :</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="373"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Créer un nouveau site de plongée, en copiant les informations pertinentes de la plongée actuelle.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="374"/> <source>Create a new dive site with this name</source> <translation>Créer un nouveau site de plongée avec ce nom</translation> </message> @@ -2565,8 +2585,30 @@ GPS actuelle :</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>Fichiers UDDF (*.uddf *.UDDF)</translation> + <source>UDDF files</source> + <translation>Fichiers UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <source>CSV files</source> + <translation>Fichiers CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <source>HTML files</source> + <translation>Fichiers HTML</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <source>Subsurface files</source> + <translation>Fichiers Subsurface</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <source>TeX files</source> + <translation>Fichiers TeX</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> @@ -2575,33 +2617,16 @@ GPS actuelle :</translation> <translation>Exporter le fichier CSV en</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>Fichiers CSV (*.csv *.CSV)</translation> - </message> - <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Export world map</source> <translation>Exporter la carte mondiale</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>Fichiers HTML (*.html)</translation> - </message> - <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> <source>Export Subsurface XML</source> <translation>Exporter vers fichier XML Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>Fichiers XML (*.xml *.ssrf)</translation> - </message> - <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> <source>Save image depths</source> <translation>Sauvegarder la profondeur de l'image</translation> @@ -2612,11 +2637,6 @@ GPS actuelle :</translation> <translation>Exporter dans un fichier TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation>Fichiers TeX (*.tex)</translation> - </message> - <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> <source>Export HTML files as</source> <translation>Exporter le fichier HTML comme</translation> @@ -2923,7 +2943,7 @@ GPS actuelle :</translation> <translation><numerusform>(%n plongé(e)s)</numerusform><numerusform>(%n plongé(e)s)</numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Equipiers multiples</translation> </message> @@ -2969,38 +2989,38 @@ GPS actuelle :</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="157"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="192"/> + <location filename="../qt-models/diveplannermodel.cpp" line="277"/> <source>cyl.</source> <translation>bloc</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Final depth</source> <translation>Prof. finale</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Run time</source> <translation>Durée de plongée</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Used gas</source> <translation>Gaz utilisés</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>CC setpoint</source> <translation>Setpoint CC</translation> </message> @@ -3036,107 +3056,107 @@ GPS actuelle :</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Profondeur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Heure</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Pression</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Température</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Couleur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Entré par l'utilisateur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Pression S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Pression I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Plafond</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Consigne</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Capteur 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Capteur 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Capteur 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Pression ambiante</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Freq. cardiaque</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Facteur de gradient (GF)</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Prof. moyenne @ s</translation> </message> @@ -3456,71 +3476,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Télécharger</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Choisir le mode de téléchargement Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation>Connexion vers l'ordinateur de plongée</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Trouver l'ordinateur de plongée Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>Annuler le téléchargement</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>Choisir le fichier pour le téléchargement du fichier log de l'ordinateur de plongée</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation>Fichiers log</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>Choisir le fichier pour les données brutes binaires de libdivecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> - <translation>Réessayer</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> + <translation>Fichiers dump</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Fichiers de log (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation>Réessayer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Sauvegarder les données brutes de libdivecomputer NE téléchargera PAS les plongées dans la liste des plongées.</translation> </message> - <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> - <translation>Fichiers de données brutes (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3706,12 +3726,12 @@ p, li { white-space: pre-wrap; } <translation>Se connecter à Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Déconnectez-vous de Facebook en utilisant le menu 'Partager sur'.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Identifiez-vous à Facebook afin de publier vos plongées sur votre profil</translation> </message> @@ -3905,7 +3925,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Lieu non défini</translation> </message> @@ -3985,29 +4005,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="253"/> <source>Dive site management</source> <translation>Gestion des sites de plongée</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="64"/> <source>Merge into current site</source> <translation>Fusionner dans le site actuel</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="73"/> <source>Merging dive sites</source> <translation>Fusion des sites de plongée</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="74"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>Vous êtes sur le point de fusionner les sites de plongée. Il n'est pas possible d'annuler cette opération. Voulez-vous vraiment continuer ?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="260"/> <source>You are editing a dive site</source> <translation>Vous modifiez un site de plongée</translation> </message> @@ -4299,7 +4319,7 @@ cette opération. Voulez-vous vraiment continuer ?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="560"/> <source>Open</source> <translation>Ouvrir</translation> </message> @@ -4595,13 +4615,13 @@ cette opération. Voulez-vous vraiment continuer ?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> <source>&Undo</source> <translation>&Annuler</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> <source>&Redo</source> <translation>&Refaire</translation> </message> @@ -4641,63 +4661,63 @@ cette opération. Voulez-vous vraiment continuer ?</translation> <translation>Passer en mode hors-ligne</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Connect to</source> <translation>Se connecter à</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> <source>Disconnect from</source> <translation>Se déconnecter de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="596"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d'ouvrir un nouveau fichier.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="557"/> <source>Open file</source> <translation>Ouvrir un fichier</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Cancel</source> <translation>Annuler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>Ne pas enregistrer un journal vide dans le cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> <source>Traverse image directories</source> <translation>Traverser les dossiers d'images</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> <source>Scan</source> <translation>Scanner</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> <source>Scanning images...(this can take a while)</source> <translation>Analyse des images ... (merci de patienter)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Warning</source> <translation>Avertissement</translation> </message> @@ -4707,105 +4727,221 @@ cette opération. Voulez-vous vraiment continuer ?</translation> <translation>Tentative de fusion des plongées compris dans un intervalle de temps de %1 minutes</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="731"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant de fermer le fichier.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d'ajouter une nouvelle plongée.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="909"/> <source>Print runtime table</source> <translation>Imprimer le tableau de runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Tentative de replanification d'une plongée qui n'est pas une plongée planifiée.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Merci de finir l'édition en cours avant d'en commencer une autre.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Tentative de modification d'une plongée qui n'a pas été ajoutée manuellement.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> <source>Yearly statistics</source> <translation>Statistiques annuelles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <source>Dive log files</source> + <translation>Fichiers de carnet de plongées</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <source>Subsurface files</source> + <translation>Fichiers Subsurface</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> + <source>Cochran</source> + <translation>Cochran</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <source>DiveLogs.de</source> + <translation>DiveLogs.de</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <source>JDiveLog</source> + <translation>JDiveLog</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <source>Liquivision</source> + <translation>Liquivision</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <source>Suunto</source> + <translation>Suunto</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <source>UDCF</source> + <translation>UDCF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>XML</source> + <translation>XML</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>Divesoft</source> + <translation>Divesoft</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>Datatrak/WLog</source> + <translation>Datatrak/WLog</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>MkVI files</source> + <translation>Fichiers MkVI</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>APD log viewer</source> + <translation>Visualiseur de log APD</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>OSTCtools</source> + <translation>OSTCtools</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>DAN DL7</source> + <translation>DAN DL7</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>All files</source> + <translation>Tous les fichiers</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Voulez-vous enregistrer les modifications du fichier %1 ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Voulez-vous enregistrer les modifications du fichier de données ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Save changes?</source> <translation>Enregistrer les modifications ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <source>Changes will be lost if you don't save them.</source> <translation>Les modifications seront perdues si vous ne les enregistrez pas.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1705"/> <source>Save file as</source> <translation>Enregistrer le fichier sous</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1793"/> <source>[local cache for] %1</source> <translation>[cache local pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/> <source>[cloud storage for] %1</source> <translation>[stockage dans le cloud pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1902"/> <source>Opening datafile from older version</source> <translation>Ouverture du fichier de données à partir d'une version antérieure</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1903"/> <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>Vous avez ouvert un fichier de données d'une version plus ancienne de Subsurface. Nous vous recommandons de lire le manuel à propos des modifications apportées par la nouvelle version, particulièrement à propos de la gestion des sites de plongées qui a été grandement modifiée. Subsurface a déjà essayé de pré-remplir les données mais il est préférable que vous regardiez le nouveau système de gestion des sites de plongées pour vous assurer que tout est correct.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1914"/> <source>Open dive log file</source> <translation>Ouvrir le fichier de carnet de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;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);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation>Fichiers log de plongée (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;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);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Contacting cloud service...</source> <translation>Contact du service cloud...</translation> </message> @@ -4813,7 +4949,7 @@ Subsurface a déjà essayé de pré-remplir les données mais il est préférabl <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Déplacer le lieu de plongée sélectionné</translation> </message> @@ -4821,22 +4957,22 @@ Subsurface a déjà essayé de pré-remplir les données mais il est préférabl <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation>Afficher le lieu dans Google Maps</translation> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation>Copier le lieu dans le presse papier (décimal)</translation> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation>Copier le lieu dans le presse papier (sexadécimal)</translation> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation>Sélectionner les lieux de plongées visibles</translation> </message> @@ -4844,7 +4980,7 @@ Subsurface a déjà essayé de pré-remplir les données mais il est préférabl <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation>Échec du chargement de MapWidget.qml ! @@ -4897,8 +5033,8 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> - <translation>Fichiers firmware (*.hex *.bin)</translation> + <source>Firmware files</source> + <translation>Fichiers firmware</translation> </message> </context> <context> @@ -4922,89 +5058,89 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>Open circuit</source> <translation>Circuit ouvert</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>CCR</source> <translation>CCR (Recycleur)</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> <source>Last stop at 20ft</source> <translation>Dernier palier à 20 pieds</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>50% avg. depth to 20ft</source> <translation>50% de la prof. moyenne à 20 pieds</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>20ft to surface</source> <translation>de 20 pieds à la surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>Last stop at 6m</source> <translation>Dernier palier à 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>50% avg. depth to 6m</source> <translation>50% de la profondeur moyenne à 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>6m to surface</source> <translation>de 6m à la surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> <source>psi</source> <translation>psi</translation> </message> @@ -5118,8 +5254,8 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation>Fichiers Subsurface</translation> </message> </context> <context> @@ -5333,33 +5469,33 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu <translation>Format de date</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>Format de date préféré. Les champs courament utilisés sont</p><p>d (jour du mois)</p><p>ddd (abbrev. nom du jour)</p><p>M (numéro de mois)</p><p>MMM (abbrev. nom du mois)</p><p>yy/yyyy (année sur 2/4 caractères)</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation>Utiliser les paramètres par défaut</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation>Utilisé en remplacement ou il n'y a pas assez d'espace pour afficher la date complète.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation>Format court</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Format de l'heure</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>Format d'heure préféré</p><p>Les champs courament utilisés sont </p><p>h (heure au format 12h)</p><p>H (heure au format 24h)</p><p>mm (minutes)</p><p>ss (secondes)</p><p>t/tt (a/p ou am/pm)</p></body></html></translation> </message> @@ -5369,30 +5505,41 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu <translation>Langue</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Redémarrage nécessaire</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Vous devez redémarrer Subsurface pour prendre en compte la nouvelle langue.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation>Cela sera utilisé tel quel. Ce n'est peut-être pas ce que vous attendiez. +Voir http://doc.qt.io/qt-5/qdatetime.html#toString</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation>Caractères littéraux</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> - <translation>Caractère(s) non-spécial(-aux) dans le format de date. -Il sera utilisé tel quel. Ce n'est peut-être pas ce que vous désiriez. -Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> +</source> + <translation>Caractères non spéciaux dans le format de date. +</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> + <translation>Caractères non spéciaux dans le format de date. +</translation> </message> </context> <context> @@ -5802,29 +5949,54 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation>Modèle en lecture seule!</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and connot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Importer un fichier modèle</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>Fichiers HTML (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation>Fichiers HTML</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Exporter le fichier modèle</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Cette action ne peut être annulée !</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Supprimer le modèle : %1 ?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5850,11 +6022,6 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Ajouter un changement de gaz</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation> (Bloc %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Choisir comme odinateur principale</translation> @@ -5875,6 +6042,11 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Supprimer cet ordinateur de plongée</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation>(Bloc. %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Ajouter un changement de setpoint</translation> @@ -5907,8 +6079,8 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Ajuster la pression du bloc %1 (actuellement interpolé comme %2)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -6192,7 +6364,7 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6200,7 +6372,7 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>h</translation> </message> @@ -6208,7 +6380,7 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>sec</translation> </message> @@ -6535,8 +6707,8 @@ de 30 minutes avant le début de la plongée et 30 minutes après la fin.</trans </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> - <translation>Fichiers image (*.jpg *.jpeg)</translation> + <source>Image files</source> + <translation>Fichiers image</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> @@ -6650,8 +6822,8 @@ Fichiers avec dates/heures incorrectes</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>Importer les messages (Erreurs, avertissements , etc)</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation>Importer les messages (erreurs, alertes, etc.)</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -6660,81 +6832,87 @@ Fichiers avec dates/heures incorrectes</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> - <translation>Fichiers SmartTrak (*.sgl *.SGL);;Tous les fichiers (*)</translation> + <source>SmartTrak files</source> + <translation>Fichiers SmartTrack</translation> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> - <translation>Ouvrir les fichiers Subsurface</translation> + <source>All files</source> + <translation>Tous les fichiers</translation> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> - <translation>Fichiers Subsurface (*.ssrf *SSRF *.xml *.XML);;Tous les fichiers (*)</translation> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation>Fichiers Subsurface</translation> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> + <translation>Ouvrir les fichiers Subsurface</translation> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation>Petit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Moyen</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>Date de plongée : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>Durée : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>Lieu de plongée : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>Équipier(s) : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation>Guide/Moniteur : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6929,7 +7107,7 @@ Fichiers avec dates/heures incorrectes</translation> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>Pas de combinaison définie</translation> </message> @@ -7258,7 +7436,7 @@ mélangés à partir de l'air et en utilisant : <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Étiquettes vides</translation> </message> @@ -7942,8 +8120,8 @@ Langue : %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Aucune erreur</translation> </message> @@ -8067,22 +8245,12 @@ Maximum</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Erreur d'analyse de l'entête</translation> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation>Densité : %.1fg/ℓ -</translation> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8415,8 +8583,8 @@ Maximum</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1144"/> + <location filename="../core/planner.c" line="1147"/> <source>oxygen</source> <translation>oxygène</translation> </message> @@ -8501,15 +8669,15 @@ Maximum</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> + <location filename="../core/dive.c" line="1879"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1140"/> + <location filename="../core/planner.c" line="1143"/> <source>air</source> <translation>air</translation> </message> @@ -8738,7 +8906,7 @@ Maximum</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> + <location filename="../core/parse-xml.c" line="3481"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>inconnu</translation> @@ -8880,62 +9048,62 @@ Maximum</translation> <translation>Erreur d'analyse du mélange gazeux</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Impossible de créer un analyseur pour %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Impossible d'enregistrer les données</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Erreur d'analyse des échantillons</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation>Plongées déjà téléchargées le %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Évènement : attente d'une action de l'utilisateur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation>modèle=%s firmware=%u série=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Erreur d'enregistrement du gestionnaire d'évènements.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Erreur d'enregistrement du gestionnaire d'annulation.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Erreur d'import des données de plongées</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Impossible de créer un contexte libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Impossible d'ouvrir %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -8944,13 +9112,13 @@ La plupart du temps, pour déboguer ce problème, un fichier log de libdivecompu Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans la fenêtre de téléchargement.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation>Aucune nouvelle plongée téléchargée depuis l'ordinateur de plongée</translation> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1280"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>Emplacement GPS multiples pour le site de plongée; également %s @@ -8958,7 +9126,7 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse-xml.c" line="1342"/> <source>additional name for site: %s </source> <translation>Noms supplémentaires pour le site : %s @@ -8993,12 +9161,12 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="2104"/> <source>Failed to parse '%s'</source> <translation>Impossible d'analyser '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="4003"/> <source>Can't open stylesheet %s</source> <translation>Impossible d'ouvrir le feuille de style %s</translation> </message> @@ -9017,8 +9185,8 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Avertissement :</translation> </message> @@ -9044,11 +9212,6 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation>Planification de la plongée</b>(Chevauchement de plongées détecté)</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="114"/> <source>Runtime: %dmin %s</source> <translation>Runtime : %dmin %s</translation> @@ -9156,6 +9319,21 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>Consommation d'air (SAC)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation>%.0f%s/%.0f%s de <span style='color: red;'><b>%s</b></span></translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation>%.0f%s de <span style='color: red;'><b>%s</b></span> (%.0f%s en remontée planifiée)</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation>%.0f%s de <span style='color: red;'><b>%s</b></span></translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9178,6 +9356,11 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>Plannification de la plongée </b> crée le</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modèle de déco : Bühlmann ZHL-16C avec GF Low = %d%% et GF High = %d%%</translation> @@ -9223,22 +9406,17 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>La quantité de gaz minimum nécessaire pour une remontée dépasse la quantité initialement disponible dans le bloc !</translation> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s en remontée planifiée)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation>%.0f%s (%.0f%s pendant la remontée planifiée) de %s</translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valeur pO₂ haute %.2f à %d:%02u avec le gaz %s à la profondeur de %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valeur pO₂ basse %.2f à %d:%02u avec le gaz %s à la profondeur de %.*f %s</translation> </message> @@ -9248,12 +9426,12 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>Impossible de trouver le gaz %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1148"/> <source>ean</source> <translation>nitrox</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1373"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9262,84 +9440,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1385"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1391"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1394"/> <source>SAC: %.*f%s/min </source> <translation>SAC : %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1396"/> <source>CNS: %u%% </source> <translation>SNC : %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1398"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1400"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1402"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1405"/> <source>MOD: %d%s </source> <translation>MOD : %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1445"/> <source>Deco: %umin @ %.0f%s </source> <translation>Déco : %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1437"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Palier de sécurité : %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1381"/> <source>P: %d%s (%s) </source> <translation>P : %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1414"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9348,7 +9526,7 @@ EADD : %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1420"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9357,56 +9535,63 @@ EADD : %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1425"/> + <source>Density: %.1fg/ℓ +</source> + <translation>Densité : %.1fg/ℓ +</translation> + </message> + <message> + <location filename="../core/profile.c" line="1440"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Palier de sécurité : temps inconnu @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1448"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Déco : temps inconnu @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1452"/> <source>In deco </source> <translation>En déco </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1454"/> <source>NDL: %umin </source> <translation>LND : %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1457"/> <source>TTS: %umin </source> <translation>DTR : %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1460"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Déco : %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1468"/> <source>In deco (calc) </source> <translation>En déco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1471"/> <source>NDL: %umin (calc) </source> <translation>LND : %umin (calc) @@ -9414,104 +9599,104 @@ EADD : %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: >2h (calc) </source> <translation>LND : >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1477"/> <source>TTS: %umin (calc) </source> <translation>DTR : %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: >2h (calc) </source> <translation>DTR : >2h (calc)</translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1482"/> <source>RBT: %umin </source> <translation>RBT : %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1485"/> <source>Calculated ceiling %.0f%s </source> <translation>Plafond calculé %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1491"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tissus %.0fmin : %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1497"/> <source>heart rate: %d </source> <translation>rythme cardiaque %d </translation> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1499"/> <source>bearing: %d </source> <translation>palier : %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1502"/> <source>mean depth to here %.1f%s </source> <translation>Profondeur moyenne jusqu'à %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1599"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1603"/> + <location filename="../core/profile.c" line="1607"/> + <location filename="../core/profile.c" line="1611"/> <source>%s %sD:%.1f%s</source> <translation>%s %sPd:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1615"/> <source>%s %sD:%.1f%s </source> <translation>%s %sPd:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1619"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1623"/> + <location filename="../core/profile.c" line="1627"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1634"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1659"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC : %.*f%s</translation> </message> @@ -10617,51 +10802,56 @@ p, li { white-space: pre-wrap; } <translation>Planification</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation>Durée min. de changement % d'O₂ en dessous de 100%</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation>Déco VPM-B</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation>Déco Bühlmann</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation>Gaz de réserve</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation>Reporter le changement de gaz si un arrêt n'est pas nécessaire</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation>Changer uniquement aux paliers requis</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>Planifier une pause sur le gaz de fond</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10681,153 +10871,153 @@ p, li { white-space: pre-wrap; } <translation>Mode loisir</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Descendre jusqu’à la première profondeur</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation>Durée minimale de changement</translation> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation>Palier de sécurité</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation>Niveau de conservatisme</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Mode de plongée</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Options des gaz</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation>Calculer les variations de plan (coût en performance)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation>Afficher les variations de plan</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation>Facteur du SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation>Utilisé pour calculer la quantité de gaz minimum dans le cadre d'une possible augmentation de SAC à deux plongeurs après une situation de panne d'air "Out of Gas".</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation>Durée pour résoudre des incidents</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation>Utilisé pour calculer la quantité de gaz minimum. Temps supplémentaire à la profondeur max après une situation de panne d'air "Out of Gas".</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>Utilisé pour calculer le meilleur mélange. Sélectionnez la profondeur du meilleur mélange dans le tableau 'gaz disponibles' en entrant la profondeur du gaz, suivi de "B" (meilleur mélange trimix) ou "BN" (meilleur mélange nitrox)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GF Low</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GF High</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC au fond</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>pO₂ au fond</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation>Meilleur mélange END</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Sur la planification, afficher le runtime (durée absolue) des paliers</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Afficher le runtime</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>Sur la planification, afficher la durée (durée relative) des paliers</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>Afficher la durée du segment des paliers</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>Sur la planification, lister les transitions ou les traiter comme implicites</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>Afficher les transitions dans la décompression</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>Planification de la plongée en format texte</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>pO₂ en déco</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>SAC en déco</translation> </message> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index 1898dad21..01776baa7 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -43,66 +43,86 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Izlaz</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation type="unfinished"/> @@ -113,22 +133,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation type="unfinished"/> </message> @@ -160,22 +180,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> @@ -185,113 +205,113 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -312,7 +332,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1632,81 +1652,81 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> </context> @@ -1787,27 +1807,27 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1920,27 +1940,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Obriši uron</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -1948,103 +1968,103 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Dubina:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Težina:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation type="unfinished"/> </message> @@ -2120,23 +2140,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> započni</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> završi</translation> @@ -2301,12 +2321,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="373"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="374"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2557,55 +2577,55 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> + <source>UDDF files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <source>TeX files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> - <source>Save image depths</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Export Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>Export to TeX file</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <source>Save image depths</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> + <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> @@ -2915,7 +2935,7 @@ GPS location:</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -2961,38 +2981,38 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="157"/> <source>unknown</source> <translation>nepoznato</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="192"/> + <location filename="../qt-models/diveplannermodel.cpp" line="277"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -3028,107 +3048,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Dubina</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Vrijeme</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Pritisak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3442,69 +3462,69 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Greška</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> - <source>Choose file for dive computer binary dump file</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> - <source>Warning</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> - <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> + <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> + <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> </context> @@ -3692,12 +3712,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3891,7 +3911,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3971,28 +3991,28 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="253"/> <source>Dive site management</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="64"/> <source>Merge into current site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="73"/> <source>Merging dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="74"/> <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"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="260"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4284,7 +4304,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="560"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -4580,13 +4600,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4626,63 +4646,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="596"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="557"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -4692,104 +4712,220 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="731"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="909"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <source>UDDF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> + <source>CSV</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1705"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1793"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1902"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1903"/> <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"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1914"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;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);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4797,7 +4933,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4805,22 +4941,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4828,7 +4964,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4878,7 +5014,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> + <source>Firmware files</source> <translation type="unfinished"/> </message> </context> @@ -4903,89 +5039,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>Open circuit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> <source>psi</source> <translation>psi</translation> </message> @@ -5099,7 +5235,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> + <source>Subsurface files</source> <translation type="unfinished"/> </message> </context> @@ -5314,33 +5450,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation type="unfinished"/> </message> @@ -5350,27 +5486,37 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> <translation type="unfinished"/> </message> </context> @@ -5781,28 +5927,53 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> - <source>Import template file</source> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> + <source>The template '%1' is read-only and connot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> + <source>Import template file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> <translation type="unfinished"/> </message> </context> @@ -5829,11 +6000,6 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> @@ -5854,6 +6020,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> @@ -5886,7 +6057,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> @@ -6171,7 +6342,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6179,7 +6350,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation type="unfinished"/> </message> @@ -6187,7 +6358,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation type="unfinished"/> </message> @@ -6512,7 +6683,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6626,7 +6797,7 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation type="unfinished"/> </message> <message> @@ -6636,76 +6807,82 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> + <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> + <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> <translation type="unfinished"/> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation type="unfinished"/> @@ -6899,7 +7076,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7226,7 +7403,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7904,8 +8081,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8019,21 +8196,12 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8364,8 +8532,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1144"/> + <location filename="../core/planner.c" line="1147"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8450,15 +8618,15 @@ Maximum</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> + <location filename="../core/dive.c" line="1879"/> <source>(%s) or (%s)</source> <translation>(%s) ili (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1140"/> + <location filename="../core/planner.c" line="1143"/> <source>air</source> <translation>zrak</translation> </message> @@ -8671,23 +8839,23 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> + <location filename="../core/parse-xml.c" line="3481"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>nepoznato</translation> @@ -8829,82 +8997,82 @@ Maximum</source> <translation>Greška pri parsiranju mješavine plinova</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Ne mogu kreirati parser za %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Greška pri registraciji podataka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Greška pri parsiranju uzoraka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Događaj: čekanje na korisničku akciju</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Greška pri registraciji event handlera.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Greška pri registraciji cancellation handlera</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Greška pri uvozu podataka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Ne mogu kreirati libdivecomputer kontekst</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Nije uspjelo otvaranje %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1280"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse-xml.c" line="1342"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8938,12 +9106,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="2104"/> <source>Failed to parse '%s'</source> <translation>Nije uspjelo parsiranje '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="4003"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -8962,8 +9130,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -8989,11 +9157,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="114"/> <source>Runtime: %dmin %s</source> <translation type="unfinished"/> @@ -9101,6 +9264,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9123,6 +9301,11 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> @@ -9168,22 +9351,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> @@ -9193,235 +9371,241 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1148"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1373"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1385"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1391"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1394"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1396"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1398"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1400"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1402"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1405"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1445"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1437"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1381"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1414"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1420"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1425"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1440"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1448"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1452"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1454"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1457"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1460"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1468"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1471"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1477"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1482"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1485"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1491"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1497"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1499"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1502"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1599"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1603"/> + <location filename="../core/profile.c" line="1607"/> + <location filename="../core/profile.c" line="1611"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1615"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1619"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1623"/> + <location filename="../core/profile.c" line="1627"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1634"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1659"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -10309,117 +10493,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> <source>Apply GPS Fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Pomoć</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation type="unfinished"/> </message> @@ -10522,51 +10706,56 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10586,153 +10775,153 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> + <source>Safety stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> - <source>Safety stop</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> + <source>Conservatism level</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> - <source>Conservatism level</source> + <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> - <source>+</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Bilješke</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts index 4af350199..f7d796ffb 100644 --- a/translations/subsurface_hu.ts +++ b/translations/subsurface_hu.ts @@ -47,66 +47,86 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Elérhető eszközök</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Mentés</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Kilépés</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Név:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation type="unfinished"/> @@ -117,22 +137,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation type="unfinished"/> </message> @@ -164,22 +184,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> @@ -189,113 +209,113 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1636,81 +1656,81 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> </context> @@ -1791,27 +1811,27 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1924,27 +1944,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Merülés törélse</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -1952,103 +1972,103 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Dátum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Mélység:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation type="unfinished"/> </message> @@ -2124,23 +2144,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation>kezdés</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation>befejezés</translation> @@ -2305,12 +2325,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="373"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="374"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2561,55 +2581,55 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> + <source>UDDF files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <source>TeX files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> - <source>Save image depths</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Export Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>Export to TeX file</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <source>Save image depths</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> + <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> @@ -2919,7 +2939,7 @@ GPS location:</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -2965,38 +2985,38 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="157"/> <source>unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="192"/> + <location filename="../qt-models/diveplannermodel.cpp" line="277"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -3032,107 +3052,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Mélység</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Idő</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3446,69 +3466,69 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> - <source>Choose file for dive computer binary dump file</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> - <source>Warning</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> - <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> + <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> + <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> </context> @@ -3696,12 +3716,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3895,7 +3915,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3975,28 +3995,28 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="253"/> <source>Dive site management</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="64"/> <source>Merge into current site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="73"/> <source>Merging dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="74"/> <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"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="260"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4288,7 +4308,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="560"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -4584,13 +4604,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4630,63 +4650,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="596"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="557"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -4696,104 +4716,220 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="731"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="909"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <source>UDDF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> + <source>CSV</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1705"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1793"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1902"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1903"/> <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"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1914"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;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);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4801,7 +4937,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4809,22 +4945,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4832,7 +4968,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4882,7 +5018,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> + <source>Firmware files</source> <translation type="unfinished"/> </message> </context> @@ -4907,89 +5043,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>Open circuit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> <source>bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> <source>psi</source> <translation type="unfinished"/> </message> @@ -5103,7 +5239,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> + <source>Subsurface files</source> <translation type="unfinished"/> </message> </context> @@ -5318,33 +5454,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Dátumformátum</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation type="unfinished"/> </message> @@ -5354,27 +5490,37 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Nyelv</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> <translation type="unfinished"/> </message> </context> @@ -5785,28 +5931,53 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> - <source>Import template file</source> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> + <source>The template '%1' is read-only and connot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> + <source>Import template file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> <translation type="unfinished"/> </message> </context> @@ -5833,11 +6004,6 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> @@ -5858,6 +6024,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> @@ -5890,7 +6061,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> @@ -6175,7 +6346,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation type="unfinished"/> </message> @@ -6183,7 +6354,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation type="unfinished"/> </message> @@ -6191,7 +6362,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation type="unfinished"/> </message> @@ -6516,7 +6687,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6630,7 +6801,7 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation type="unfinished"/> </message> <message> @@ -6640,76 +6811,82 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> + <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> + <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> <translation type="unfinished"/> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation type="unfinished"/> @@ -6903,7 +7080,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7230,7 +7407,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7908,8 +8085,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8023,21 +8200,12 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8368,8 +8536,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1144"/> + <location filename="../core/planner.c" line="1147"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8454,15 +8622,15 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="1856"/> + <location filename="../core/dive.c" line="1879"/> <source>(%s) or (%s)</source> <translation>(%s) vagy (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1140"/> + <location filename="../core/planner.c" line="1143"/> <source>air</source> <translation type="unfinished"/> </message> @@ -8675,23 +8843,23 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> + <location filename="../core/parse-xml.c" line="3481"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation type="unfinished"/> @@ -8833,82 +9001,82 @@ Maximum</source> <translation>Hiba a gáz keverék feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Hiba az adat regisztrálása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Hiba a minták feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Esemény: várakozás a felhasználóra</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Hiba az esemény kezelő regisztrálása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Hiba a visszavonás kezelő regisztrálása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Merülési adat importálási hiba</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1280"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse-xml.c" line="1342"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8941,12 +9109,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="2104"/> <source>Failed to parse '%s'</source> <translation>'%s' értelmezése meghiúsult.</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="4003"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -8965,8 +9133,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -8992,11 +9160,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="114"/> <source>Runtime: %dmin %s</source> <translation type="unfinished"/> @@ -9104,6 +9267,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9126,6 +9304,11 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> @@ -9171,22 +9354,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> @@ -9196,235 +9374,241 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1148"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1373"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1385"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1391"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1394"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1396"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1398"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1400"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1402"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1405"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1445"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1437"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1381"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1414"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1420"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1425"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1440"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1448"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1452"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1454"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1457"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1460"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1468"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1471"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1477"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1482"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1485"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1491"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1497"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1499"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1502"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1599"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1603"/> + <location filename="../core/profile.c" line="1607"/> + <location filename="../core/profile.c" line="1611"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1615"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1619"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1623"/> + <location filename="../core/profile.c" line="1627"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1634"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1659"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -10312,117 +10496,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation>Merülés lista</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Beállítások</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> <source>Apply GPS Fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Segítség</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation>Névjegy</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation type="unfinished"/> </message> @@ -10525,51 +10709,56 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation type="unfinished"/> </message> @@ -10589,153 +10778,153 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> + <source>Safety stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> - <source>Safety stop</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> + <source>Conservatism level</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> - <source>Conservatism level</source> + <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> - <source>+</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index bcac9039a..b912efe24 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -43,66 +43,86 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Simpan</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation type="unfinished"/> @@ -113,22 +133,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation type="unfinished"/> </message> @@ -160,22 +180,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> @@ -185,113 +205,113 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -312,7 +332,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Tidak ada teman</translation> </message> @@ -1632,81 +1652,81 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> </context> @@ -1787,27 +1807,27 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1920,27 +1940,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -1948,103 +1968,103 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation type="unfinished"/> </message> @@ -2120,23 +2140,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation>Mulai</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation>Akhir</translation> @@ -2301,12 +2321,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="373"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="374"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2557,55 +2577,55 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> + <source>UDDF files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <source>TeX files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> - <source>Save image depths</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Export Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>Export to TeX file</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <source>Save image depths</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> + <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> @@ -2915,7 +2935,7 @@ GPS location:</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -2961,38 +2981,38 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="157"/> <source>unknown</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="192"/> + <location filename="../qt-models/diveplannermodel.cpp" line="277"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -3028,107 +3048,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>edalaman</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Waktu</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Tekanan</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Suhu</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3442,69 +3462,69 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Kesalahan</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> - <source>Choose file for dive computer binary dump file</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> - <source>Warning</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> - <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> + <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> + <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> </context> @@ -3692,12 +3712,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3891,7 +3911,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3971,28 +3991,28 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="253"/> <source>Dive site management</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="64"/> <source>Merge into current site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="73"/> <source>Merging dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="74"/> <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"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="260"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4284,7 +4304,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="560"/> <source>Open</source> <translation>Buka</translation> </message> @@ -4580,13 +4600,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4626,63 +4646,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="596"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="557"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Cancel</source> <translation>Batal</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -4692,104 +4712,220 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="731"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="909"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <source>UDDF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> + <source>CSV</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <source>Changes will be lost if you don't save them.</source> <translation>Perubahan akan hilang jika anda tidak simpan.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1705"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1793"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1902"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1903"/> <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"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1914"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;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);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4797,7 +4933,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4805,22 +4941,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4828,7 +4964,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4878,7 +5014,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> + <source>Firmware files</source> <translation type="unfinished"/> </message> </context> @@ -4903,89 +5039,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>Open circuit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> <source>psi</source> <translation>psi</translation> </message> @@ -5099,8 +5235,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5314,33 +5450,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation type="unfinished"/> </message> @@ -5350,27 +5486,37 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> <translation type="unfinished"/> </message> </context> @@ -5781,28 +5927,53 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> - <source>Import template file</source> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> + <source>The template '%1' is read-only and connot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> + <source>Import template file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> <translation type="unfinished"/> </message> </context> @@ -5829,11 +6000,6 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> @@ -5854,6 +6020,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> @@ -5886,7 +6057,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> @@ -6171,7 +6342,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>menit</translation> </message> @@ -6179,7 +6350,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation type="unfinished"/> </message> @@ -6187,7 +6358,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation type="unfinished"/> </message> @@ -6512,7 +6683,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6626,7 +6797,7 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation type="unfinished"/> </message> <message> @@ -6636,76 +6807,82 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> + <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> + <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> <translation type="unfinished"/> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>menit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation type="unfinished"/> @@ -6899,7 +7076,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7226,7 +7403,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7904,8 +8081,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8027,21 +8204,12 @@ Rata-rata</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8372,8 +8540,8 @@ Rata-rata</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1144"/> + <location filename="../core/planner.c" line="1147"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8458,15 +8626,15 @@ Rata-rata</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> + <location filename="../core/dive.c" line="1879"/> <source>(%s) or (%s)</source> <translation>(%s) or (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1140"/> + <location filename="../core/planner.c" line="1143"/> <source>air</source> <translation>udara</translation> </message> @@ -8679,23 +8847,23 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> + <location filename="../core/parse-xml.c" line="3481"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>Tak dikenal</translation> @@ -8837,82 +9005,82 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>tidak dapat membuat pengurai untuk %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Gagal mendaftarkan data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1280"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse-xml.c" line="1342"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8945,12 +9113,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="2104"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="4003"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -8969,8 +9137,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -8996,11 +9164,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="114"/> <source>Runtime: %dmin %s</source> <translation type="unfinished"/> @@ -9108,6 +9271,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9130,6 +9308,11 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> @@ -9175,22 +9358,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> @@ -9200,235 +9378,241 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1148"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1373"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1385"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1391"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1394"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1396"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1398"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1400"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1402"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1405"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1445"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1437"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1381"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1414"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1420"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1425"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1440"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1448"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1452"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1454"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1457"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1460"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1468"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1471"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1477"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1482"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1485"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1491"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1497"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1499"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1502"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1599"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1603"/> + <location filename="../core/profile.c" line="1607"/> + <location filename="../core/profile.c" line="1611"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1615"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1619"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1623"/> + <location filename="../core/profile.c" line="1627"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1634"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1659"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -10316,117 +10500,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> <source>Apply GPS Fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation type="unfinished"/> </message> @@ -10525,51 +10709,56 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>menit</translation> </message> @@ -10589,153 +10778,153 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> + <source>Safety stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> - <source>Safety stop</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> + <source>Conservatism level</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> - <source>Conservatism level</source> + <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> - <source>+</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC bawah</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Catatan</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index 8e1990eea..e8777d79c 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -47,66 +47,86 @@ <translation>Extern Bluetooth toestel selecteren </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Gevonden toestellen</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Opslaan</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Afsluiten</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation>Bluetooth mode</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation>Auto</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation>Dwing LE af</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation>Dwing klassiek af</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Wissen</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Details voor lokaal Bluetooth toestel</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Naam:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Adres:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth staat aan</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Aan/uitzetten</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Kiest toestel:</translation> @@ -285,17 +305,17 @@ <translation>Toestel vind-fout: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="477"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Niet beschikbaar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="484"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Geen toegang tot het lokale Bluetooth toestel.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="534"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>De vind-agent was niet aangemaakt omdat het %1 adres niet overeenkomt met het fysieke adapter adres van enig lokaal Bluetooth toestel.</translation> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Geen buddies</translation> </message> @@ -1636,82 +1656,82 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Backup duikcomputer instellingen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> <source>Backup files</source> <translation>Backup bestanden</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>Fout in XML backup</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Fout tijdens het opslaan van het backup bestand %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Backup geslaagd</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Uw instellingen zijn bewaard in: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Instellingen duikcomputer herstellen</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>Fout bij het herstellen van XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Fout tijdens het herstellen van het backup bestand. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Herstelling geslaagd</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Uw instellingen zijn hersteld.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Firmware bestand selecteren</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> <source>All files</source> <translation>Alle bestanden</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> <source>Log files</source> <translation>Log bestanden</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> <source>Choose file for dive computer download logfile</source> <translation>Kies een bestand om duikcomputer log te downloaden</translation> </message> @@ -1927,27 +1947,27 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Duikdetails</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Duik verwijderen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation>Onderbreek edit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Toon op kaart</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Meerdere Buddies</translation> </message> @@ -1955,104 +1975,104 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Duik %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Locatie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Coördinaten:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Gebruik huidige GPS locatie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Diepte:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Duur:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Lucht Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Water Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Duikpak:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Gewicht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Fles:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Gas mix:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Startdruk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Einddruk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Beoordeling:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation>Zicht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Notities:</translation> </message> @@ -2128,23 +2148,23 @@ GPS locatie:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation> (fles %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Handmatig overschakelen naar OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> begin</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> eind</translation> @@ -2923,7 +2943,7 @@ GPS locatie:</translation> <translation><numerusform>(%n duik)</numerusform><numerusform>(%n duiken)</numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Meerdere Buddies</translation> </message> @@ -2969,38 +2989,38 @@ GPS locatie:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="157"/> <source>unknown</source> <translation>onbekend</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="192"/> + <location filename="../qt-models/diveplannermodel.cpp" line="277"/> <source>cyl.</source> <translation>cyl.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Final depth</source> <translation>Eind diepte</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Used gas</source> <translation>Gebruikt Gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -3036,107 +3056,107 @@ GPS locatie:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Diepte</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Tijd</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Druk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Kleur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Ingevoerd door gebruiker</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Druk S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Druk I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Plafond</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>Gasverbruik</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Omgevingsdruk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Hartslag</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Gradiënt Factor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Gemiddelde diepte @ s</translation> </message> @@ -3456,68 +3476,68 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Downloaden</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Kies Bluetooth download mode</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation>Verbinden met duikcomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="227"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Fout</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Uemis duikcomputer zoeken</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>Onderbreek downloaden</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="369"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>Kies een bestand om duikcomputer log te downloaden</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="370"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> <source>Log files</source> <translation>Log bestanden</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="395"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>Kies een bestand voor de duikcomputer binaire dump</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="396"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> <source>Dump files</source> <translation>Dump bestanden</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> <source>Retry download</source> <translation>Download opnieuw</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="384"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Duiken worden NIET in de duiklijst geladen als u de libdivecomputer dump opslaat.</translation> </message> @@ -3905,7 +3925,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Locatie niet ingesteld</translation> </message> @@ -4299,7 +4319,7 @@ Bent u zeker?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="543"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="560"/> <source>Open</source> <translation>Open</translation> </message> @@ -4641,63 +4661,63 @@ Bent u zeker?</translation> <translation>Maak cloud storage online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="354"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Connect to</source> <translation>Verbind met</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> <source>Disconnect from</source> <translation>Verbreek verbinding met</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="579"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1656"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="596"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor u een nieuw bestand opent.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="540"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="557"/> <source>Open file</source> <translation>Bestand openen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="544"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="656"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Cancel</source> <translation>Annuleren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="611"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>Bewaar geen lege duiklog in de cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="652"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> <source>Traverse image directories</source> <translation>Doorloop mappen met afbeeldingen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="655"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="663"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> <source>Scanning images...(this can take a while)</source> <translation>Scan afbeeldingen...(even geduld aub)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="835"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="945"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1033"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1039"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> @@ -4707,202 +4727,230 @@ Bent u zeker?</translation> <translation>Je probeert duiken samen te voegen met een %1min oppervlakteinterval</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <source>Template backup created</source> + <translation>Template backup aangemaakt</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation>De volgende backup afdruk sjablonen zijn aangemaakt: + +%1 + +Locatie: +%2 + +Let op dat sinds deze versie van Subsurface de standaard sjablonen +alleen leesbaar zijn, en deze dienen niet gewerkt te worden, want de +applicatie kan deze overschrijven bij opnieuw opstarten.</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="731"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor U het bestand sluit.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="835"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor U een duik toevoegt.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="887"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="909"/> <source>Print runtime table</source> <translation>Runtime tabel afdrukken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="945"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>U probeert een duik te herplannen die geen geplande duik is.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1033"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Rond de huidige wijziging af vooraleer een volgende te beginnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1039"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>U probeert een duik aan te passen die niet handmatig is toegevoegd.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1086"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> <source>Yearly statistics</source> <translation>Jaarlijkse statistieken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> <source>Dive log files</source> <translation>Duiklog bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1684"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>Subsurface files</source> <translation>Subsurface bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1286"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1332"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1290"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1291"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1335"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1292"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1336"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1294"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1338"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1339"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1340"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>MkVI files</source> <translation>MkVI bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1297"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1341"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1298"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1342"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1330"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>All files</source> <translation>Alle bestanden</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Wilt u de wijzigingen in bestand %1 bewaren?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Wilt u de wijzigingen bewaren in het bestand?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Save changes?</source> <translation>Aanpassingen opslaan?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <source>Changes will be lost if you don't save them.</source> <translation>Wijzigingen gaan verloren als u deze niet bewaart.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1683"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1705"/> <source>Save file as</source> <translation>Bestand bewaren als</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1771"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1793"/> <source>[local cache for] %1</source> <translation>[locale cache voor] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1773"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/> <source>[cloud storage for] %1</source> <translation>[cloud opslag voor] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1880"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1902"/> <source>Opening datafile from older version</source> <translation>Opent een databestand van een oudere versie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1881"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1903"/> <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>U heeft een databestand van een oudere versie van Subsurface geopend. Wij raden u aan de handleiding te lezen met betrekking tot de nieuwe versie, in het bijzonder de sterk veranderde duikstek-afhandeling. Subsurface heeft reeds gesprobeerd de data te converteren, maar het is nuttig zelf vast te stellen dat de conversie correct is verlopen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1892"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1914"/> <source>Open dive log file</source> <translation>Open duiklogboek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Contacting cloud service...</source> <translation>Contact opnemen met cloud service...</translation> </message> @@ -5019,89 +5067,89 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>Open circuit</source> <translation>Open circuit</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="466"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> <source>Last stop at 20ft</source> <translation>Laatste stop op 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>50% avg. depth to 20ft</source> <translation>50% gem. diepte tot 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="468"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>20ft to surface</source> <translation>20ft tot oppervlakte</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="469"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="471"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="472"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>Last stop at 6m</source> <translation>Laatste stop op 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="473"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>50% avg. depth to 6m</source> <translation>50% gem. diepte tot 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="474"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>6m to surface</source> <translation>6m tot oppervlakte</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="475"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="478"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="479"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="487"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="488"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> <source>psi</source> <translation>psi</translation> </message> @@ -5910,29 +5958,55 @@ Zie http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation>Alleen leesbaar sjabloon!</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and connot be edited. +Please export this template to a different file.</source> + <translation>Sjabloon '%1' is alleen leesbaar en kan niet worden bewerkt. +Exporteer naar een ander bestand.</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Importeer sjabloonbestand</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> <source>HTML files</source> <translation>HTML bestanden</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation>Het doel sjabloon '%1' is alleen leesbaar en kan niet worden overschreven.</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Exporteer sjabloonbestand als</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Deze actie kan niet ongedaan gemaakt worden!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Verwijder sjabloon: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation>Verwijder sjaboon '%1'?</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation>Het doel sjabloon '%1' is alleen leesbaar en kan niet worden verwijderd.</translation> </message> </context> <context> @@ -5958,11 +6032,6 @@ Zie http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Gaswissel toevoegen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation> (Fles %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Maak eerste duikcomputer</translation> @@ -5983,6 +6052,11 @@ Zie http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Verwijder deze duikcomputer</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation> (fles %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Voeg setpoint wissel toe</translation> @@ -6015,8 +6089,8 @@ Zie http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Druk van fles %1 aanpassen (nu geschat op %2)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation>Pas drukken aan van cilinder %1 (nu geinterpoleerd als %2)</translation> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -6301,7 +6375,7 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6309,7 +6383,7 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>h</translation> </message> @@ -6317,7 +6391,7 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>sec</translation> </message> @@ -6758,8 +6832,8 @@ Bestanden met onjuiste datum/tijd</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>Importeer berichten (Fouten, waarschuwingen, etc)</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation>Importeer berichten (fouten, waarschuwingen, etc)</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -7043,7 +7117,7 @@ Bestanden met onjuiste datum/tijd</translation> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>Geen duikpak geselecteerd</translation> </message> @@ -7372,7 +7446,7 @@ worden uit lucht en: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Lege trefwoorden</translation> </message> @@ -8055,8 +8129,8 @@ Taal: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="557"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="588"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Geen fout</translation> </message> @@ -8180,7 +8254,7 @@ Maximum</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Fout bij het verwerken van de header</translation> </message> @@ -8603,12 +8677,12 @@ Maximum</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> + <location filename="../core/dive.c" line="1879"/> <source>(%s) or (%s)</source> <translation>(%s) of (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> <location filename="../core/planner.c" line="1140"/> <location filename="../core/planner.c" line="1143"/> @@ -8982,62 +9056,62 @@ Maximum</translation> <translation>Fout bij het verwerken van het gasmengsel</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Kan geen parser creëren voor %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Fout bij het registreren van de data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Fout bij het verwerken van de samples</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation>Duik al gedownload op %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Event: wachten op handeling van gebruiker</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serienummer=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Fout bij het registreren van de event handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Fout bij het registreren van de cancellation handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Fout bij importeren van duikdata</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Kan geen context creëren voor libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Fout bij openen van %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9046,7 +9120,7 @@ Vaak is het, om software fouten te vinden, nuttig om een libdivecomputer te make Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeveld.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation>Geen nieuwe duiken uit duikcomputer geladen</translation> </message> @@ -9146,11 +9220,6 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation>duikplan</b> (Overlappende duiken vastgesteld)</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="114"/> <source>Runtime: %dmin %s</source> <translation>Runtime: %dmin %s</translation> @@ -9295,6 +9364,11 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve <translation>duikplan</b> gemaakt op</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation>duikplan</b> (overlappende duiken vastgesteld)</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Deco model: Bühlmann ZHL-16C met GFLow = %d%% en GFHigh = %d%%</translation> @@ -9365,7 +9439,7 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve <translation>EAN</translation> </message> <message> - <location filename="../core/profile.c" line="1332"/> + <location filename="../core/profile.c" line="1373"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9374,84 +9448,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1385"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1350"/> + <location filename="../core/profile.c" line="1391"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1353"/> + <location filename="../core/profile.c" line="1394"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1355"/> + <location filename="../core/profile.c" line="1396"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1398"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1359"/> + <location filename="../core/profile.c" line="1400"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1402"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1364"/> + <location filename="../core/profile.c" line="1405"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1445"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1437"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Veiligheidsstop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1381"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1372"/> + <location filename="../core/profile.c" line="1414"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9460,7 +9534,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1376"/> + <location filename="../core/profile.c" line="1420"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9469,168 +9543,168 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1379"/> + <location filename="../core/profile.c" line="1425"/> <source>Density: %.1fg/ℓ </source> <translation>Dichtheid: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1393"/> + <location filename="../core/profile.c" line="1440"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Veiligheidsstop: onbekende tijd @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1401"/> + <location filename="../core/profile.c" line="1448"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deco: onbekende tijd @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1405"/> + <location filename="../core/profile.c" line="1452"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1454"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1410"/> + <location filename="../core/profile.c" line="1457"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1460"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1421"/> + <location filename="../core/profile.c" line="1468"/> <source>In deco (calc) </source> <translation>In deco (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1424"/> + <location filename="../core/profile.c" line="1471"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1426"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1430"/> + <location filename="../core/profile.c" line="1477"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1432"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (berekend) </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1482"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1485"/> <source>Calculated ceiling %.0f%s </source> <translation>Berekend plafond %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1444"/> + <location filename="../core/profile.c" line="1491"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Compartiment %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1497"/> <source>heart rate: %d </source> <translation>hartslag: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1452"/> + <location filename="../core/profile.c" line="1499"/> <source>bearing: %d </source> <translation>koers: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1455"/> + <location filename="../core/profile.c" line="1502"/> <source>mean depth to here %.1f%s </source> <translation>gemiddelde diepte tot nu toe %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1551"/> + <location filename="../core/profile.c" line="1599"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1555"/> - <location filename="../core/profile.c" line="1559"/> - <location filename="../core/profile.c" line="1563"/> + <location filename="../core/profile.c" line="1603"/> + <location filename="../core/profile.c" line="1607"/> + <location filename="../core/profile.c" line="1611"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1567"/> + <location filename="../core/profile.c" line="1615"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1619"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1575"/> - <location filename="../core/profile.c" line="1579"/> + <location filename="../core/profile.c" line="1623"/> + <location filename="../core/profile.c" line="1627"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1586"/> + <location filename="../core/profile.c" line="1634"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1611"/> + <location filename="../core/profile.c" line="1659"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index f3a79b016..2e26e418c 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -47,66 +47,86 @@ <translation>Selecção do dispositivo bluetooth remoto</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Dispositivos encontrados</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Gravar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Sair</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation>Modo Bluetooth</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation>Automático</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation>Forçar LE</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation>Forçar modo clássico</translation> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Procurar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Limpar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Detalhes do dispositivo bluetooth local</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Nome:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Endereço:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth ligado</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Ligar/desligar</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Seleccionar dispositivo:</translation> @@ -285,17 +305,17 @@ <translation>Erro na descoberta do dispositivo: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="477"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Não disponível</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="484"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Não é possível aceder ao adaptador Bluetooth local. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="534"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>O agente de descoberta de dispositivos não foi criado porque o endereço %1 não coincide com o endereço físico de nenhum dos dispositivos Bluetooth locais.</translation> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Sem companheiros</translation> </message> @@ -1636,82 +1656,82 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Cópia de segurança das configurações do computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> <source>Backup files</source> <translation>Ficheiros de backup</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>Erro na cópia de segurança XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Ocorreu um erro ao efectuar a cópia de segurança. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Cópia de segurança efectuada com sucesso</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>As suas configurações foram gravadas em: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Restaurar configurações do computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>Erro ao restaurar XML</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ocorreu um erro ao restaurar a cópia de segurança. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Reposição efectuada com sucesso</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>As suas definições foram restauradas com sucesso.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Seleccionar ficheiro de firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> <source>All files</source> <translation>Todos os ficheiros</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> <source>Log files</source> <translation>Ficheiros de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> <source>Choose file for dive computer download logfile</source> <translation>Seleccionar o ficheiro para descarregar o registo de mergulhos</translation> </message> @@ -1927,27 +1947,27 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Detalhes do mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Eliminar mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation>Cancelar edições</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Mostrar no mapa</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Múltiplos companheiros</translation> </message> @@ -1955,104 +1975,104 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Mergulho %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Data:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Local:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Coordenadas:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Usar a localização do GPS actual:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Profundidade:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Duração:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Temperatura do ar:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Temperatura da água:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Fato:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Companheiros:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Guia:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Peso:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Garrafa:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Mistura respiratória:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Pressão inicial:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Pressão final:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Classificação:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation>Visibilidade:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Notas:</translation> </message> @@ -2128,23 +2148,23 @@ do GPS actual:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation>(garr. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Mudança manual para circuito aberto</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation>iniciar</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation>fim</translation> @@ -2923,7 +2943,7 @@ do GPS actual:</translation> <translation><numerusform>(%n mergulho)</numerusform><numerusform>(%n mergulhos)</numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Múltiplos companheiros</translation> </message> @@ -2969,38 +2989,38 @@ do GPS actual:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="157"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="192"/> + <location filename="../qt-models/diveplannermodel.cpp" line="277"/> <source>cyl.</source> <translation>garr.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Final depth</source> <translation>Profundidade final</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Run time</source> <translation>Tempo de mergulho</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Used gas</source> <translation>Gás usado</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>CC setpoint</source> <translation>Setpoint Circuito fechado</translation> </message> @@ -3036,107 +3056,107 @@ do GPS actual:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Tempo</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Pressão</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Côr</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Inserido pelo utilizador</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Pressão S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Pressão I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Tecto</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>Consumo</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Setpoint fixo</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Pressão ambiente</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Frequência cardíaca</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Factor de gradiente</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Profundidade média @ s</translation> </message> @@ -3456,68 +3476,68 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Transferir</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Seleccione o modo de descarga Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation>A ligar ao computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="227"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Procurar computador de mergulho Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>Cancelar a descarga</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="369"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>Seleccionar o ficheiro para descarregar o registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="370"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> <source>Log files</source> <translation>Ficheiros de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="395"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>Escolher o ficheiro para a descarga do ficheiro binário do computador de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="396"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> <source>Dump files</source> <translation>Ficheiros dump (Registos da memória do computador de mergulho)</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> <source>Retry download</source> <translation>Tentar a descarga novamente</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="384"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Gravar a descarga do libdivecomputer não transfere os mergulhos para a lista</translation> </message> @@ -3905,7 +3925,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Não foi definido um local</translation> </message> @@ -4299,7 +4319,7 @@ Tem a certeza que quer continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="543"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="560"/> <source>Open</source> <translation>Abrir</translation> </message> @@ -4641,63 +4661,63 @@ Tem a certeza que quer continuar?</translation> <translation>Colocar online o armazenamento remoto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="354"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="390"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Connect to</source> <translation>Ligar a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="384"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> <source>Disconnect from</source> <translation>Desligar de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="579"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1656"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="596"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de abrir um novo ficheiro.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="540"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="557"/> <source>Open file</source> <translation>Abrir Ficheiro</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="544"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="656"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="611"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation>Não gravar um ficheiro vazio remotamente</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="652"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> <source>Traverse image directories</source> <translation>Atravessar as pastas das imagens</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="655"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> <source>Scan</source> <translation>Procurar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="663"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> <source>Scanning images...(this can take a while)</source> <translation>A procurar imagens... (pode demorar um pouco)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="835"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="945"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1033"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1039"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Warning</source> <translation>Aviso</translation> </message> @@ -4707,202 +4727,228 @@ Tem a certeza que quer continuar?</translation> <translation>A tentar juntar mergulhos com %1min de intervalo entre eles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <source>Template backup created</source> + <translation>Criada cópia de segurança do modelo</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation>Foram criadas cópias de segurança dos seguintes modelos: + +%1 + +Localização: +%2 + +Por favor tenha em atenção que a partir desta versão do Subsurface os modelos padrão são ficheiros apenas de leitura e não devem ser editados directamente, uma vez que a aplicação poderá criá-los novamente no arranque.</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="731"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de fechar o ficheiro.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="835"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de adicionar outro mergulho.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="887"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="909"/> <source>Print runtime table</source> <translation>Imprimir tabela de runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="945"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Está a tentar planear novamente um mergulho que não foi criado no planeador de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1033"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Por favor, termine a edição em curso antes de iniciar outra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1039"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>A tentar editar um mergulho que não foi criado manualmente.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1086"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> <source>Yearly statistics</source> <translation>Estatísticas anuais</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> <source>Dive log files</source> <translation>Ficheiros de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1684"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>Subsurface files</source> <translation>Ficheiros do Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1286"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1331"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1332"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1290"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1291"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1335"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1292"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1336"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1294"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1338"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1339"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1340"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> <source>MkVI files</source> <translation>MkVI files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1297"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1341"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1298"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1342"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1330"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> <source>All files</source> <translation>Todos os ficheiros</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Deseja gravar as alterações feitas no ficheiro %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Deseja gravar as alterações feitas no ficheiro de dados?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Save changes?</source> <translation>Guardar alterações?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <source>Changes will be lost if you don't save them.</source> <translation>As alterações serão perdidas se não forem gravadas.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1683"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1705"/> <source>Save file as</source> <translation>Guardar ficheiro como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1771"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1793"/> <source>[local cache for] %1</source> <translation>[cache local para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1773"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/> <source>[cloud storage for] %1</source> <translation>[armazenamento remoto para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1880"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1902"/> <source>Opening datafile from older version</source> <translation>A abrir ficheiro de uma versão mais antiga</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1881"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1903"/> <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>Abriu um ficheiro de uma versão antiga do Subsurface. Recomendamos que leia o manual para saber mais sobre as alterações para esta nova versão, especialmente no que respeita a gestão de locais de mergulho, que sofreu alterações importantes. O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sistema de gestão dos locais de mergulho para garantir que tudo está correcto.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1892"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1914"/> <source>Open dive log file</source> <translation>Abrir ficheiro de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Contacting cloud service...</source> <translation>A contactar o serviço remoto...</translation> </message> @@ -5019,89 +5065,89 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>Open circuit</source> <translation>Circuito aberto</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="372"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="466"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> <source>Last stop at 20ft</source> <translation>Última paragem aos 20 ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>50% avg. depth to 20ft</source> <translation>50% da profundidade média para 6 m/20 ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="468"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>20ft to surface</source> <translation>6 m/20 ft para a superfície</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="469"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>ft</source> <translation>pé</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="471"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="472"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>Last stop at 6m</source> <translation>Última paragem aos 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="473"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>50% avg. depth to 6m</source> <translation>50% da profundidade média para 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="474"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>6m to surface</source> <translation>6 m para a superfície</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="475"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="478"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="479"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="487"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="488"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> <source>psi</source> <translation>psi</translation> </message> @@ -5909,29 +5955,55 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation>Modelo de leitura apenas!</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and connot be edited. +Please export this template to a different file.</source> + <translation>O modelo '%1' é de leitura apenas e não pode ser editado. +Por favor exporte este modelo para um ficheiro diferente.</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Importar modelo</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> <source>HTML files</source> <translation>Ficheiros HTML</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation>O modelo de destino '%1' é de leitura apenas e não pode ser substituído.</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Exportar modelo como</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Esta acção não pode ser desfeita!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Eliminar o modelo: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation>Apagar o modelo '%1'?</translation> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation>O modelo '%1' é de leitura apenas e não pode ser editado.</translation> </message> </context> <context> @@ -5957,11 +6029,6 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Adicionar mudança de gás</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation>(Garrafa %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Marca do computador de mergulho principal</translation> @@ -5982,6 +6049,11 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Apagar este computador de mergulho</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation>(garr. %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Adicionar mudança no setpoint</translation> @@ -6014,8 +6086,8 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Ajustar pressão da garrafa %1 (actualmente interpolada como %2)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation>Ajustar a pressão da garrafa %1 (presentemente interpolada como %2)</translation> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -6299,7 +6371,7 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6307,7 +6379,7 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>h</translation> </message> @@ -6315,7 +6387,7 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>seg</translation> </message> @@ -6756,8 +6828,8 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>Importar mensagens (Erros, avisos, etc.)</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation>Importar mensagens (erros, avisos, etc.)</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -7041,7 +7113,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>Fato não definido</translation> </message> @@ -7370,7 +7442,7 @@ obtidos a partir do ar usando: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Categorias vazias</translation> </message> @@ -8053,8 +8125,8 @@ Linguagem: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="557"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="588"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Sem erros</translation> </message> @@ -8178,7 +8250,7 @@ Média</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Erro ao analisar o cabeçalho</translation> </message> @@ -8601,12 +8673,12 @@ Média</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> + <location filename="../core/dive.c" line="1879"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> <location filename="../core/planner.c" line="1140"/> <location filename="../core/planner.c" line="1143"/> @@ -8980,62 +9052,62 @@ Média</translation> <translation>Erro na análise da mistura de gás</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Não é possivel criar o "parser" para %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Erro no registo de dados</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation>Mergulho já descarregado em %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Evento: à espera de acção do utilizador</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation>modelo=%s firmware=%u numserie=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Erro no registo do "event handler".</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do "cancellation handler".</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Erro a importar os dados do mergulho</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto do libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> @@ -9044,7 +9116,7 @@ Na maioria dos cados, será útil obter um ficheiro log do libdivecomputer para Poderá criar este ficheiro seleccionando a opção respectiva no menu de download.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation>Não foram descarregados novos mergulhos do computador de mergulho</translation> </message> @@ -9144,11 +9216,6 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation>plano de mergulho</b> (foram detectados mergulhos sobrepostos)</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="114"/> <source>Runtime: %dmin %s</source> <translation>Runtime: %dmin %s</translation> @@ -9293,6 +9360,11 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo <translation>plano de mergulho</b> criado a</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation>plano de mergulho </b> (foram detectados mergulhos sobrepostos)</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modelo Deco: Bühlmann ZHL-16C com GFLow = %d%% e GFHigh = %d%%</translation> @@ -9363,7 +9435,7 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1332"/> + <location filename="../core/profile.c" line="1373"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9372,84 +9444,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1385"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1350"/> + <location filename="../core/profile.c" line="1391"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1353"/> + <location filename="../core/profile.c" line="1394"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1355"/> + <location filename="../core/profile.c" line="1396"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1398"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1359"/> + <location filename="../core/profile.c" line="1400"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1402"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1364"/> + <location filename="../core/profile.c" line="1405"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1445"/> <source>Deco: %umin @ %.0f%s </source> <translation>Descompressão: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1437"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Paragem de segurança: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1381"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1372"/> + <location filename="../core/profile.c" line="1414"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9458,7 +9530,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1376"/> + <location filename="../core/profile.c" line="1420"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9467,168 +9539,168 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1379"/> + <location filename="../core/profile.c" line="1425"/> <source>Density: %.1fg/ℓ </source> <translation>Densidade: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1393"/> + <location filename="../core/profile.c" line="1440"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Paragem de segurança: duração desconhecida @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1401"/> + <location filename="../core/profile.c" line="1448"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Descompressão: duração desconhecida @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1405"/> + <location filename="../core/profile.c" line="1452"/> <source>In deco </source> <translation>Em descompressão </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1454"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1410"/> + <location filename="../core/profile.c" line="1457"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1413"/> + <location filename="../core/profile.c" line="1460"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Descompressão: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1421"/> + <location filename="../core/profile.c" line="1468"/> <source>In deco (calc) </source> <translation>Em descompressão (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1424"/> + <location filename="../core/profile.c" line="1471"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1426"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1430"/> + <location filename="../core/profile.c" line="1477"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1432"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1482"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1438"/> + <location filename="../core/profile.c" line="1485"/> <source>Calculated ceiling %.0f%s </source> <translation>Tecto calculado %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1444"/> + <location filename="../core/profile.c" line="1491"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Compartimento %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1497"/> <source>heart rate: %d </source> <translation>frequência cardíaca: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1452"/> + <location filename="../core/profile.c" line="1499"/> <source>bearing: %d </source> <translation>Rumo: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1455"/> + <location filename="../core/profile.c" line="1502"/> <source>mean depth to here %.1f%s </source> <translation>profundidade média até aqui %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1551"/> + <location filename="../core/profile.c" line="1599"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1555"/> - <location filename="../core/profile.c" line="1559"/> - <location filename="../core/profile.c" line="1563"/> + <location filename="../core/profile.c" line="1603"/> + <location filename="../core/profile.c" line="1607"/> + <location filename="../core/profile.c" line="1611"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1567"/> + <location filename="../core/profile.c" line="1615"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1619"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1575"/> - <location filename="../core/profile.c" line="1579"/> + <location filename="../core/profile.c" line="1623"/> + <location filename="../core/profile.c" line="1627"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1586"/> + <location filename="../core/profile.c" line="1634"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1611"/> + <location filename="../core/profile.c" line="1659"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index 4715aa536..70e5952d9 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -43,66 +43,86 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Lưu lại</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Thoát</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation type="unfinished"/> @@ -113,22 +133,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation type="unfinished"/> </message> @@ -160,22 +180,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> @@ -185,113 +205,113 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -312,7 +332,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1632,81 +1652,81 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> </context> @@ -1787,27 +1807,27 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Click vào đây sẽ loại bỏ này xi lanh.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Khí này hiện đang được sử dụng. Chỉ các xi lanh không được sử dụng khi lặn có thể được gỡ bỏ.</translation> </message> @@ -1921,27 +1941,27 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Xóa lần lặn</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -1949,103 +1969,103 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Ngày tháng:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Độ sâu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Cân nặng:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation type="unfinished"/> </message> @@ -2121,23 +2141,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation>bắt đầu</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation>kết thúc</translation> @@ -2302,12 +2322,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="373"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="374"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2558,8 +2578,30 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF files (*.uddf *.UDDF)</translation> + <source>UDDF files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <source>CSV files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> @@ -2568,33 +2610,16 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>CSV files (*.csv *.CSV)</translation> - </message> - <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>HTML files (*.html)</translation> - </message> - <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> <source>Export Subsurface XML</source> <translation>Xuất dữ liệu dưới dạng Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>XML files (*.xml *.ssrf)</translation> - </message> - <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> <source>Save image depths</source> <translation type="unfinished"/> @@ -2605,11 +2630,6 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> <source>Export HTML files as</source> <translation>Xuất dữ liệu từ tập tin HTML dưới dạng</translation> @@ -2916,7 +2936,7 @@ GPS location:</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -2962,38 +2982,38 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="157"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="192"/> + <location filename="../qt-models/diveplannermodel.cpp" line="277"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -3029,107 +3049,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Thời gian</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Áp suất</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Nhiệt độ</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3443,69 +3463,69 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Lỗi</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> - <source>Choose file for dive computer binary dump file</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> - <source>Warning</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> - <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> + <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> + <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> </context> @@ -3693,12 +3713,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3892,7 +3912,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3972,28 +3992,28 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="253"/> <source>Dive site management</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="64"/> <source>Merge into current site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="73"/> <source>Merging dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="74"/> <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"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="260"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4285,7 +4305,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="560"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -4581,13 +4601,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4627,63 +4647,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="596"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="557"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -4693,104 +4713,220 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="731"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="909"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1705"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1793"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1902"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1903"/> <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"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1914"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;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);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4798,7 +4934,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4806,22 +4942,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4829,7 +4965,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4879,7 +5015,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> + <source>Firmware files</source> <translation type="unfinished"/> </message> </context> @@ -4904,89 +5040,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>Open circuit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> <source>psi</source> <translation>psi</translation> </message> @@ -5100,7 +5236,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> + <source>Subsurface files</source> <translation type="unfinished"/> </message> </context> @@ -5315,33 +5451,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation type="unfinished"/> </message> @@ -5351,27 +5487,37 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> <translation type="unfinished"/> </message> </context> @@ -5782,28 +5928,53 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> - <source>Import template file</source> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>HTML files (*.html)</translation> + <source>The template '%1' is read-only and connot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> + <source>Import template file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> <translation type="unfinished"/> </message> </context> @@ -5830,11 +6001,6 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> @@ -5855,6 +6021,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> @@ -5887,7 +6058,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> @@ -6172,7 +6343,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>nhỏ nhất</translation> </message> @@ -6180,7 +6351,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation type="unfinished"/> </message> @@ -6188,7 +6359,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation type="unfinished"/> </message> @@ -6513,7 +6684,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6627,7 +6798,7 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation type="unfinished"/> </message> <message> @@ -6637,76 +6808,82 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> + <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> + <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> <translation type="unfinished"/> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation type="unfinished"/> @@ -6900,7 +7077,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7227,7 +7404,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7905,8 +8082,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8020,21 +8197,12 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8365,8 +8533,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1144"/> + <location filename="../core/planner.c" line="1147"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8451,15 +8619,15 @@ Maximum</source> <translation>ký</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> + <location filename="../core/dive.c" line="1879"/> <source>(%s) or (%s)</source> <translation>(%s) hoặc (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1140"/> + <location filename="../core/planner.c" line="1143"/> <source>air</source> <translation>không khí</translation> </message> @@ -8672,23 +8840,23 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> + <location filename="../core/parse-xml.c" line="3481"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>chưa rõ</translation> @@ -8830,82 +8998,82 @@ Maximum</source> <translation>Lỗi khi chuyển thông số hỗn hợp dưỡng khí</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Không thể tạo việc chuyển thông số cho %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Lỗi khi đăng ký dữ liệu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Lỗi khi chuyển thông số các mẫu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Sự kiện: đang đợi thao tác từ người dùng</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Lỗi khi đăng ký quản lý sự kiện.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Lỗi khi đăng ký việc hủy bỏ quản lý.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Lỗi khi nhập dữ liệu lặn</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Không thể tạo nội dung cho thiết bị đo lặn</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Không thể mở %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1280"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse-xml.c" line="1342"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8939,12 +9107,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="2104"/> <source>Failed to parse '%s'</source> <translation>Thất bại khi chuyển thông số '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="4003"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -8963,8 +9131,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -8990,11 +9158,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="114"/> <source>Runtime: %dmin %s</source> <translation type="unfinished"/> @@ -9102,6 +9265,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9124,6 +9302,11 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> @@ -9169,22 +9352,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> @@ -9194,235 +9372,241 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1148"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1373"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1385"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1391"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1394"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1396"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1398"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1400"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1402"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1405"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1445"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1437"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1381"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1414"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1420"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1425"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1440"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1448"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1452"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1454"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1457"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1460"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1468"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1471"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1477"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1482"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1485"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1491"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1497"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1499"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1502"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1599"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1603"/> + <location filename="../core/profile.c" line="1607"/> + <location filename="../core/profile.c" line="1611"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1615"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1619"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1623"/> + <location filename="../core/profile.c" line="1627"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1634"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1659"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -10310,117 +10494,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Thiết lập</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> <source>Apply GPS Fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Trợ giúp</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation type="unfinished"/> </message> @@ -10523,51 +10707,56 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>nhỏ nhất</translation> </message> @@ -10587,153 +10776,153 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> + <source>Safety stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> - <source>Safety stop</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> + <source>Conservatism level</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> - <source>Conservatism level</source> + <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> - <source>+</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Ghi chú</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation type="unfinished"/> </message> |