diff options
Diffstat (limited to 'translations/subsurface_fr_FR.ts')
| -rw-r--r-- | translations/subsurface_fr_FR.ts | 1662 |
1 files changed, 1037 insertions, 625 deletions
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 1dfb73c54..61a295281 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -2318,42 +2318,135 @@ Sylvestre Ledru</translation> </message> </context> <context> + <name>CSVImportDialog</name> + <message> + <location filename="../qt-ui/csvimportdialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/csvimportdialog.ui" line="42"/> + <source>Import File (CSV)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/csvimportdialog.ui" line="64"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/csvimportdialog.ui" line="78"/> + <source>Field Separator</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/csvimportdialog.ui" line="101"/> + <source>Field Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/csvimportdialog.ui" line="117"/> + <source>Time</source> + <translation type="unfinished">Temps</translation> + </message> + <message> + <location filename="../qt-ui/csvimportdialog.ui" line="134"/> + <source>Depth</source> + <translation type="unfinished">Profondeur</translation> + </message> + <message> + <location filename="../qt-ui/csvimportdialog.ui" line="148"/> + <source>Temp</source> + <translation type="unfinished">Temp.</translation> + </message> + <message> + <location filename="../qt-ui/csvimportdialog.ui" line="165"/> + <source>Po2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/csvimportdialog.ui" line="182"/> + <source>Cns</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/csvimportdialog.ui" line="199"/> + <source>Stopdepth</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/csvimportdialog.ui" line="227"/> + <source>Pre-configured imports</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/csvimportdialog.cpp" line="69"/> + <source>Open CSV Log File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/csvimportdialog.cpp" line="69"/> + <source>CSV Files (*.csv)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="62"/> + <location filename="../qt-ui/models.cpp" line="65"/> <source>Type</source> <translation type="unfinished">Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="62"/> + <location filename="../qt-ui/models.cpp" line="65"/> <source>Size</source> <translation type="unfinished">Taille</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="62"/> + <location filename="../qt-ui/models.cpp" line="65"/> <source>WorkPress</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="62"/> + <location filename="../qt-ui/models.cpp" line="65"/> <source>StartPress</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="62"/> + <location filename="../qt-ui/models.cpp" line="65"/> <source>EndPress</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="62"/> + <location filename="../qt-ui/models.cpp" line="65"/> <source>O2%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="62"/> + <location filename="../qt-ui/models.cpp" line="65"/> <source>HE</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="65"/> + <source>Switch at</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="163"/> + <source>Clicking here will remove this cylinder.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="385"/> + <source>Cylinder cannot be removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="386"/> + <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -2377,30 +2470,35 @@ Sylvestre Ledru</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1138"/> + <location filename="../qt-ui/models.cpp" line="1235"/> <source>Device ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1138"/> + <location filename="../qt-ui/models.cpp" line="1235"/> <source>Model</source> <translation type="unfinished">Modèle</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1138"/> + <location filename="../qt-ui/models.cpp" line="1235"/> <source>Nickname</source> <translation type="unfinished">Surnom</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="1257"/> + <source>Clicking here will remove this divecomputer.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1009"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> l/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1011"/> + <location filename="../qt-ui/models.cpp" line="1098"/> <source> cuft/min</source> <translation type="unfinished"></translation> </message> @@ -2408,186 +2506,206 @@ Sylvestre Ledru</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="39"/> + <location filename="../qt-ui/divelistview.cpp" line="41"/> <source>Show Search Box</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="398"/> + <location filename="../qt-ui/divelistview.cpp" line="634"/> <source>expand all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="399"/> + <location filename="../qt-ui/divelistview.cpp" line="635"/> <source>collapse all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="400"/> - <source>collapse</source> + <location filename="../qt-ui/divelistview.cpp" line="636"/> + <source>collapse others</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="402"/> - <source>remove dive from trip</source> + <location filename="../qt-ui/divelistview.cpp" line="638"/> + <source>remove dive(s) from trip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="405"/> - <source>Merge trip with trip above</source> - <translation type="unfinished">Fusionner le groupe avec le groupe au dessus</translation> + <location filename="../qt-ui/divelistview.cpp" line="639"/> + <source>create new trip above</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="406"/> - <source>Merge trip with trip below</source> - <translation type="unfinished">Fusionner le groupe avec le groupe en dessous</translation> + <location filename="../qt-ui/divelistview.cpp" line="640"/> + <source>add dive(s) to trip immideately above</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="410"/> - <source>delete dive</source> + <location filename="../qt-ui/divelistview.cpp" line="643"/> + <source>merge trip with trip above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="412"/> - <source>merge selected dives</source> + <location filename="../qt-ui/divelistview.cpp" line="644"/> + <source>merge trip with trip below</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="14"/> - <source>Form</source> + <location filename="../qt-ui/divelistview.cpp" line="648"/> + <source>delete dive(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="74"/> - <source>Bottom SAC</source> + <location filename="../qt-ui/divelistview.cpp" line="652"/> + <source>save As</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="81"/> - <source>High GF</source> + <location filename="../qt-ui/divelistview.cpp" line="653"/> + <source>export As UDDF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="88"/> - <source>SAC on DECO Stop</source> + <location filename="../qt-ui/divelistview.cpp" line="654"/> + <source>shift times</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="101"/> - <source>Low GF</source> + <location filename="../qt-ui/divelistview.cpp" line="681"/> + <source>Save Dives As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="114"/> - <source>Last Stop at 6m</source> + <location filename="../qt-ui/divelistview.cpp" line="700"/> + <source>Save File as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> - <source>Start Time</source> + <location filename="../qt-ui/divelistview.cpp" line="701"/> + <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> - <source>ATM Pressure</source> + <source>Merge trip with trip above</source> + <translation type="obsolete">Fusionner le groupe avec le groupe au dessus</translation> + </message> + <message> + <source>Merge trip with trip below</source> + <translation type="obsolete">Fusionner le groupe avec le groupe en dessous</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="650"/> + <source>merge selected dives</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>DivePlannerGraphics</name> + <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="143"/> - <source>10m</source> + <location filename="../qt-ui/diveplanner.ui" line="14"/> + <source>Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="145"/> - <source>30ft</source> + <location filename="../qt-ui/diveplanner.ui" line="74"/> + <source>Bottom SAC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="146"/> - <source>Increase maximum depth by %1</source> + <location filename="../qt-ui/diveplanner.ui" line="88"/> + <source>SAC on DECO Stop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="147"/> - <source>Decreases maximum depth by %1</source> + <location filename="../qt-ui/diveplanner.ui" line="81"/> + <source>GFHigh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="148"/> - <source>Increase minimum time by %1</source> + <location filename="../qt-ui/diveplanner.ui" line="101"/> + <source>GFLow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="148"/> - <location filename="../qt-ui/diveplanner.cpp" line="149"/> - <source>10min</source> + <location filename="../qt-ui/diveplanner.ui" line="108"/> + <location filename="../qt-ui/diveplanner.ui" line="121"/> + <source>%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="149"/> - <source>Decreases minimum time by %1</source> + <location filename="../qt-ui/diveplanner.ui" line="131"/> + <source>Last Stop at 6m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> - <source>Handler Position Error</source> + <location filename="../qt-ui/diveplanner.ui" line="180"/> + <source>Start Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="386"/> - <source>One or more of your stops will be lost with this operations, -Please, remove them first.</source> + <location filename="../qt-ui/diveplanner.ui" line="187"/> + <source>ATM Pressure</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>DivePlannerGraphics</name> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="134"/> + <source>10m</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="136"/> + <source>30ft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <source>Handler Position Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="415"/> - <source>Air</source> + <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <source>One or more of your stops will be lost with this operations, +Please, remove them first.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="420"/> - <location filename="../qt-ui/diveplanner.cpp" line="421"/> - <location filename="../qt-ui/diveplanner.cpp" line="424"/> - <location filename="../qt-ui/diveplanner.cpp" line="425"/> - <source>Air</source> - <translation type="unfinished"></translation> + <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <source>AIR</source> + <translation type="unfinished">AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="986"/> + <location filename="../qt-ui/diveplanner.cpp" line="1070"/> <source>Final Depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="987"/> + <location filename="../qt-ui/diveplanner.cpp" line="1071"/> <source>Duration</source> <translation type="unfinished">Durée</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="988"/> + <location filename="../qt-ui/diveplanner.cpp" line="1072"/> <source>Used Gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="989"/> + <location filename="../qt-ui/diveplanner.cpp" line="1073"/> <source>CC Set Point</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1141"/> + <location filename="../qt-ui/diveplanner.cpp" line="1268"/> <source>Discard the Plan?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1142"/> + <location filename="../qt-ui/diveplanner.cpp" line="1269"/> <source>You are about to discard your plan.</source> <translation type="unfinished"></translation> </message> @@ -2595,75 +2713,85 @@ Please, remove them first.</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="851"/> + <location filename="../qt-ui/diveplanner.cpp" line="934"/> <source>Dive Planner Points</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="937"/> + <source>Available Gases</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="954"/> + <source>add dive data point</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1051"/> + <location filename="../qt-ui/models.cpp" line="1139"/> <source>#</source> <translation type="unfinished">N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1052"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>Date</source> <translation type="unfinished">Date</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1054"/> + <location filename="../qt-ui/models.cpp" line="1142"/> <source>m</source> <translation type="unfinished">m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1054"/> + <location filename="../qt-ui/models.cpp" line="1142"/> <source>ft</source> <translation type="unfinished">pied</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1055"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>min</source> <translation type="unfinished">min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1057"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>kg</source> <translation type="unfinished">kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1057"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>lbs</source> <translation type="unfinished">livre US</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1058"/> + <location filename="../qt-ui/models.cpp" line="1146"/> <source>Suit</source> <translation type="unfinished">Combinaison</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1059"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>Cyl</source> <translation type="unfinished">Blk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1061"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>SAC</source> <translation type="unfinished">Consommation d'air</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1062"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>OTU</source> <translation type="unfinished">OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1063"/> + <location filename="../qt-ui/models.cpp" line="1151"/> <source>maxCNS</source> <translation type="unfinished">SNCmax</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1064"/> + <location filename="../qt-ui/models.cpp" line="1152"/> <source>Location</source> <translation type="unfinished">Lieu</translation> </message> @@ -2671,14 +2799,20 @@ Please, remove them first.</source> <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="138"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/> + <source>OK</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/> <source>Error</source> <translation type="unfinished">Erreur</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="142"/> - <source>retry</source> - <translation type="unfinished"></translation> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/> + <source>Retry</source> + <translation type="unfinished">Essayer à nouveau</translation> </message> </context> <context> @@ -2738,6 +2872,7 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/maintab.ui" line="21"/> + <location filename="../qt-ui/maintab.cpp" line="322"/> <source>Dive Notes</source> <translation type="unfinished">Notes de plongée</translation> </message> @@ -2752,225 +2887,238 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="80"/> - <source>M/d/yy h:mm</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-ui/maintab.ui" line="108"/> - <location filename="../qt-ui/maintab.cpp" line="307"/> + <location filename="../qt-ui/maintab.ui" line="112"/> + <location filename="../qt-ui/maintab.cpp" line="345"/> <source>Location</source> <translation type="unfinished">Lieu</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="122"/> + <location filename="../qt-ui/maintab.ui" line="140"/> <source>Coordinates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="136"/> + <location filename="../qt-ui/maintab.ui" line="161"/> <source>Divemaster</source> <translation type="unfinished">Chef de palanquée</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="143"/> + <location filename="../qt-ui/maintab.ui" line="147"/> <source>Buddy</source> <translation type="unfinished">Binôme</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="166"/> + <location filename="../qt-ui/maintab.ui" line="119"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="177"/> <source>Rating</source> <translation type="unfinished">Évaluation</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="173"/> + <location filename="../qt-ui/maintab.ui" line="184"/> <source>Visibility</source> <translation type="unfinished">Visibilité</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="182"/> + <location filename="../qt-ui/maintab.ui" line="200"/> <source>Suit</source> <translation type="unfinished">Combinaison</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="206"/> - <location filename="../qt-ui/maintab.cpp" line="308"/> + <location filename="../qt-ui/maintab.ui" line="217"/> + <location filename="../qt-ui/maintab.cpp" line="346"/> <source>Notes</source> <translation type="unfinished">Notes</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="232"/> + <location filename="../qt-ui/maintab.ui" line="261"/> <source>Equipment</source> <translation type="unfinished">Équipement</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="319"/> + <location filename="../qt-ui/maintab.ui" line="348"/> <source>Dive Info</source> <translation type="unfinished">Détails de plongée</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="361"/> + <location filename="../qt-ui/maintab.ui" line="390"/> <source>Date</source> <translation type="unfinished">Date</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="380"/> + <location filename="../qt-ui/maintab.ui" line="409"/> <source>Interval</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="399"/> + <location filename="../qt-ui/maintab.ui" line="428"/> <source>Gases Used</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="418"/> + <location filename="../qt-ui/maintab.ui" line="447"/> <source>Gas Consumed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="437"/> - <location filename="../qt-ui/maintab.ui" line="692"/> + <location filename="../qt-ui/maintab.ui" line="466"/> + <location filename="../qt-ui/maintab.ui" line="721"/> <source>SAC</source> <translation type="unfinished">Consommation d'air</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="456"/> + <location filename="../qt-ui/maintab.ui" line="485"/> <source>Max. Depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="475"/> + <location filename="../qt-ui/maintab.ui" line="504"/> <source>Ave. Depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="494"/> + <location filename="../qt-ui/maintab.ui" line="523"/> <source>OTU</source> <translation type="unfinished">OTU</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="513"/> + <location filename="../qt-ui/maintab.ui" line="542"/> <source>Air Pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="532"/> + <location filename="../qt-ui/maintab.ui" line="561"/> <source>Air Temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="551"/> + <location filename="../qt-ui/maintab.ui" line="580"/> <source>Water Temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="570"/> + <location filename="../qt-ui/maintab.ui" line="599"/> <source>Dive Time</source> <translation type="unfinished">Temps de plongée</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="589"/> + <location filename="../qt-ui/maintab.ui" line="618"/> <source>Salinity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="626"/> + <location filename="../qt-ui/maintab.ui" line="655"/> <source>Stats</source> <translation type="unfinished">Stats</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="668"/> + <location filename="../qt-ui/maintab.ui" line="697"/> <source>Depth</source> <translation type="unfinished">Profondeur</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="680"/> + <location filename="../qt-ui/maintab.ui" line="709"/> <source>Temperature</source> <translation type="unfinished">Température</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="704"/> + <location filename="../qt-ui/maintab.ui" line="733"/> <source>Duration</source> <translation type="unfinished">Durée</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="716"/> + <location filename="../qt-ui/maintab.ui" line="745"/> <source>Total Time</source> <translation type="unfinished">Temps total</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="735"/> + <location filename="../qt-ui/maintab.ui" line="764"/> <source>Dives</source> <translation type="unfinished">Plongées</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="68"/> + <location filename="../qt-ui/maintab.cpp" line="69"/> <source>Cylinders</source> <translation type="unfinished">Blocs</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="69"/> + <location filename="../qt-ui/maintab.cpp" line="70"/> <source>Add Cylinder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="72"/> + <location filename="../qt-ui/maintab.cpp" line="73"/> <source>Weights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="73"/> + <location filename="../qt-ui/maintab.cpp" line="74"/> <source>Add Weight System</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="129"/> - <location filename="../qt-ui/maintab.cpp" line="131"/> - <source>This trip is being edited. Select Save or Undo when ready.</source> + <location filename="../qt-ui/maintab.cpp" line="317"/> + <source>Trip Location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="137"/> - <location filename="../qt-ui/maintab.cpp" line="139"/> - <source>This dive is being edited. Select Save or Undo when ready.</source> + <location filename="../qt-ui/maintab.cpp" line="296"/> + <location filename="../qt-ui/maintab.cpp" line="319"/> + <source>Trip Notes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="286"/> - <source>Trip Location</source> + <location filename="../qt-ui/maintab.cpp" line="134"/> + <location filename="../qt-ui/maintab.cpp" line="136"/> + <source>This trip is being edited. Select Save or Cancel when done.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="288"/> - <source>Trip Notes</source> + <location filename="../qt-ui/maintab.cpp" line="143"/> + <location filename="../qt-ui/maintab.cpp" line="144"/> + <source>Multiple dives are being edited. Select Save or Cancel when done.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="322"/> - <location filename="../qt-ui/maintab.cpp" line="337"/> - <location filename="../qt-ui/maintab.cpp" line="338"/> - <location filename="../qt-ui/maintab.cpp" line="339"/> + <location filename="../qt-ui/maintab.cpp" line="146"/> + <location filename="../qt-ui/maintab.cpp" line="147"/> + <source>This dive is being edited. Select Save or Cancel when done.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="362"/> + <location filename="../qt-ui/maintab.cpp" line="370"/> + <location filename="../qt-ui/maintab.cpp" line="399"/> + <location filename="../qt-ui/maintab.cpp" line="400"/> + <location filename="../qt-ui/maintab.cpp" line="401"/> <source>/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="731"/> + <location filename="../qt-ui/maintab.cpp" line="364"/> + <source>unknown</source> + <translation type="unfinished">inconnu</translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="854"/> <source>N</source> <translation type="unfinished">N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="731"/> + <location filename="../qt-ui/maintab.cpp" line="854"/> <source>S</source> <translation type="unfinished">S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="732"/> + <location filename="../qt-ui/maintab.cpp" line="855"/> <source>E</source> <translation type="unfinished">E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="732"/> + <location filename="../qt-ui/maintab.cpp" line="855"/> <source>W</source> <translation type="unfinished">O</translation> </message> @@ -2983,308 +3131,432 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="177"/> <source>File</source> - <translation type="unfinished">Fichier</translation> + <translation type="obsolete">Fichier</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="196"/> <source>Log</source> - <translation type="unfinished">Journal</translation> + <translation type="obsolete">Journal</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="211"/> <source>View</source> - <translation type="unfinished">Vue</translation> + <translation type="obsolete">Vue</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="226"/> + <location filename="../qt-ui/mainwindow.ui" line="218"/> <source>Filter</source> <translation type="unfinished">Filtrer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="232"/> <source>Help</source> - <translation type="unfinished">Aide</translation> + <translation type="obsolete">Aide</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="245"/> + <location filename="../qt-ui/mainwindow.ui" line="177"/> + <source>&File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="192"/> + <source>&Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="203"/> + <source>&View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="224"/> + <source>&Help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="231"/> + <source>&Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="248"/> + <source>&New logbook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="251"/> <source>New</source> <translation type="unfinished">Nouveau</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="248"/> + <location filename="../qt-ui/mainwindow.ui" line="254"/> <source>Ctrl+N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="253"/> + <location filename="../qt-ui/mainwindow.ui" line="259"/> + <source>&Open logbook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="262"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="256"/> + <location filename="../qt-ui/mainwindow.ui" line="265"/> <source>Ctrl+O</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="261"/> + <location filename="../qt-ui/mainwindow.ui" line="270"/> + <source>&Save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="273"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="264"/> + <location filename="../qt-ui/mainwindow.ui" line="276"/> <source>Ctrl+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="269"/> + <location filename="../qt-ui/mainwindow.ui" line="281"/> + <location filename="../qt-ui/mainwindow.ui" line="284"/> <source>Save as</source> <translation type="unfinished">Enregistrer sous</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="272"/> + <location filename="../qt-ui/mainwindow.ui" line="287"/> <source>Ctrl+Shift+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="277"/> + <location filename="../qt-ui/mainwindow.ui" line="292"/> + <location filename="../qt-ui/mainwindow.ui" line="295"/> <source>Close</source> <translation type="unfinished">Fermer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="280"/> + <location filename="../qt-ui/mainwindow.ui" line="298"/> <source>Ctrl+W</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="285"/> - <location filename="../qt-ui/mainwindow.cpp" line="176"/> + <location filename="../qt-ui/mainwindow.ui" line="303"/> + <location filename="../qt-ui/mainwindow.ui" line="306"/> + <location filename="../qt-ui/mainwindow.cpp" line="167"/> <source>Import Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="288"/> + <location filename="../qt-ui/mainwindow.ui" line="309"/> <source>Ctrl+I</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="293"/> - <source>Export UDDF</source> + <location filename="../qt-ui/mainwindow.ui" line="314"/> + <source>Export &UDDF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="298"/> - <source>Print</source> + <location filename="../qt-ui/mainwindow.ui" line="317"/> + <source>Ctrl+U</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="301"/> - <source>Ctrl+P</source> + <location filename="../qt-ui/mainwindow.ui" line="322"/> + <source>&Print</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="306"/> - <source>Preferences</source> - <translation type="unfinished">Préférences</translation> + <location filename="../qt-ui/mainwindow.ui" line="333"/> + <source>Ctrl+,</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="311"/> - <source>Quit</source> - <translation type="unfinished">Quitter</translation> + <location filename="../qt-ui/mainwindow.ui" line="338"/> + <source>&Quit</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="314"/> - <source>Ctrl+Q</source> + <location filename="../qt-ui/mainwindow.ui" line="346"/> + <source>Import from &dive computer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="319"/> - <source>Download from Dive computer</source> + <location filename="../qt-ui/mainwindow.ui" line="354"/> + <source>Import &GPS data from Subsurface Service</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="322"/> - <source>Ctrl+D</source> + <location filename="../qt-ui/mainwindow.ui" line="357"/> + <source>Ctrl+G</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="327"/> - <source>Download from Web Service</source> + <location filename="../qt-ui/mainwindow.ui" line="362"/> + <source>&Edit Device Names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="332"/> - <source>Edit Device Names</source> - <translation type="unfinished">Modifier le nom du périphérique</translation> + <location filename="../qt-ui/mainwindow.ui" line="370"/> + <source>Ctrl++</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="337"/> - <source>Add Dive</source> + <location filename="../qt-ui/mainwindow.ui" line="375"/> + <source>&Renumber</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="342"/> - <source>Renumber</source> - <translation type="unfinished">Renuméroter</translation> + <location filename="../qt-ui/mainwindow.ui" line="378"/> + <source>Ctrl+R</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="347"/> - <source>Auto Group</source> + <location filename="../qt-ui/mainwindow.ui" line="391"/> + <source>Toggle &Zoom</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="352"/> - <source>Toggle Zoom</source> - <translation type="unfinished">Changer de zoom</translation> + <location filename="../qt-ui/mainwindow.ui" line="396"/> + <source>&Yearly Statistics</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="357"/> - <source>Yearly Statistics</source> - <translation type="unfinished">Statistiques annuelles</translation> + <location filename="../qt-ui/mainwindow.ui" line="399"/> + <source>Ctrl+Y</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="362"/> - <source>View List</source> + <location filename="../qt-ui/mainwindow.ui" line="404"/> + <source>Dive List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="365"/> - <source>Ctrl+2</source> + <location filename="../qt-ui/mainwindow.ui" line="412"/> + <source>Profile</source> + <translation type="unfinished">Profil</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="420"/> + <source>Info</source> + <translation type="unfinished">Informations</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="428"/> + <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="370"/> - <source>View Profile</source> + <location filename="../qt-ui/mainwindow.ui" line="467"/> + <source>User &Manual</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="373"/> - <source>Ctrl+3</source> + <location filename="../qt-ui/mainwindow.ui" line="475"/> + <source>Globe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="378"/> - <source>View Info</source> + <location filename="../qt-ui/mainwindow.ui" line="483"/> + <source>P&lan Dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="381"/> - <source>Ctrl+4</source> + <location filename="../qt-ui/mainwindow.ui" line="486"/> + <source>Ctrl+L</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="491"/> + <source>Import CSV</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="494"/> + <source>Import CS&V</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="499"/> + <source>Import from Divelogs.de</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="325"/> + <source>Ctrl+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="330"/> + <source>Preferences</source> + <translation type="unfinished">Préférences</translation> + </message> + <message> + <source>Quit</source> + <translation type="obsolete">Quitter</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="341"/> + <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../qt-ui/mainwindow.ui" line="349"/> + <source>Ctrl+D</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Edit Device Names</source> + <translation type="obsolete">Modifier le nom du périphérique</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="367"/> + <source>Add Dive</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Renumber</source> + <translation type="obsolete">Renuméroter</translation> + </message> + <message> <location filename="../qt-ui/mainwindow.ui" line="386"/> - <source>View All</source> + <source>Auto Group</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="389"/> + <source>Toggle Zoom</source> + <translation type="obsolete">Changer de zoom</translation> + </message> + <message> + <source>Yearly Statistics</source> + <translation type="obsolete">Statistiques annuelles</translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="407"/> + <source>Ctrl+2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="415"/> + <source>Ctrl+3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="423"/> + <source>Ctrl+4</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>Ctrl+1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="394"/> + <location filename="../qt-ui/mainwindow.ui" line="436"/> <source>Prev DC</source> <translation type="unfinished">Ordinateur précédent</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="397"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="402"/> + <location filename="../qt-ui/mainwindow.ui" line="444"/> <source>Next DC</source> <translation type="unfinished">Ordinateur suivant</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="405"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Right</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="410"/> + <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>Select Events</source> <translation type="unfinished">Sélection des événements</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="415"/> + <location filename="../qt-ui/mainwindow.ui" line="457"/> <source>Input Plan</source> <translation type="unfinished">Saisir le plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="462"/> <source>About Subsurface</source> <translation type="unfinished">À propos de Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> <source>User Manual</source> - <translation type="unfinished">Manuel utilisateur</translation> + <translation type="obsolete">Manuel utilisateur</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="470"/> <source>F1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> - <source>View Globe</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="478"/> <source>Ctrl+5</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> - <source>Dive Planner</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Open File</source> <translation type="unfinished">Ouvrir un Fichier</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="271"/> - <source>manually added dive</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="408"/> + <location filename="../qt-ui/mainwindow.cpp" line="495"/> <source>Cannot find the Subsurface manual</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="448"/> + <location filename="../qt-ui/mainwindow.cpp" line="527"/> <source>Do you want to save the changes you made in the file %1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="450"/> + <location filename="../qt-ui/mainwindow.cpp" line="529"/> <source>Do you want to save the changes you made in the datafile?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="455"/> + <location filename="../qt-ui/mainwindow.cpp" line="534"/> <source>Save Changes?</source> <translation type="unfinished">Enregistrement des changements ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="456"/> + <location filename="../qt-ui/mainwindow.cpp" line="535"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="695"/> + <location filename="../qt-ui/mainwindow.cpp" line="196"/> + <location filename="../qt-ui/mainwindow.cpp" line="724"/> <source>Save File as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="696"/> + <location filename="../qt-ui/mainwindow.cpp" line="107"/> + <location filename="../qt-ui/mainwindow.cpp" line="144"/> + <location filename="../qt-ui/mainwindow.cpp" line="223"/> + <location filename="../qt-ui/mainwindow.cpp" line="250"/> + <location filename="../qt-ui/mainwindow.cpp" line="286"/> + <location filename="../qt-ui/mainwindow.cpp" line="842"/> + <source>Warning</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="197"/> + <source>UDDF files (*.uddf *.UDDF)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="725"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"></translation> </message> @@ -3347,215 +3619,235 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="218"/> + <location filename="../qt-ui/preferences.ui" line="199"/> + <source>Default Cylinder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="205"/> + <source>Use Default Cylinder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="241"/> <source>System</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="225"/> + <location filename="../qt-ui/preferences.ui" line="248"/> <source>Metric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="235"/> + <location filename="../qt-ui/preferences.ui" line="258"/> <source>Imperial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="245"/> + <location filename="../qt-ui/preferences.ui" line="268"/> <source>Personalize</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="269"/> + <location filename="../qt-ui/preferences.ui" line="292"/> <source>Depth</source> <translation type="unfinished">Profondeur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="276"/> + <location filename="../qt-ui/preferences.ui" line="299"/> <source>Meter</source> <translation type="unfinished">Mètre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="286"/> + <location filename="../qt-ui/preferences.ui" line="309"/> <source>Feet</source> <translation type="unfinished">Pieds</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="319"/> <source>Pressure</source> <translation type="unfinished">Pression</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="303"/> + <location filename="../qt-ui/preferences.ui" line="326"/> <source>Bar</source> <translation type="unfinished">bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="313"/> + <location filename="../qt-ui/preferences.ui" line="336"/> <source>Psi</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="323"/> + <location filename="../qt-ui/preferences.ui" line="346"/> <source>Volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="330"/> + <location filename="../qt-ui/preferences.ui" line="353"/> <source>Liter</source> <translation type="unfinished">Litre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="340"/> + <location filename="../qt-ui/preferences.ui" line="363"/> <source>CuFt</source> <translation type="unfinished">Pieds³</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="350"/> + <location filename="../qt-ui/preferences.ui" line="373"/> <source>Temperature</source> <translation type="unfinished">Température</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="357"/> + <location filename="../qt-ui/preferences.ui" line="380"/> <source>Celsius</source> <translation type="unfinished">Celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="367"/> + <location filename="../qt-ui/preferences.ui" line="390"/> <source>Fahrenheit</source> <translation type="unfinished">Fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="377"/> + <location filename="../qt-ui/preferences.ui" line="400"/> <source>Weight</source> <translation type="unfinished">Poids</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="384"/> + <location filename="../qt-ui/preferences.ui" line="407"/> <source>Kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="394"/> + <location filename="../qt-ui/preferences.ui" line="417"/> <source>lbs</source> <translation type="unfinished">livre US</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="409"/> + <location filename="../qt-ui/preferences.ui" line="432"/> <source>Time units</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="415"/> + <location filename="../qt-ui/preferences.ui" line="438"/> <source>Ascent/Descent speed denominator</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="422"/> + <location filename="../qt-ui/preferences.ui" line="445"/> <source>Minutes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="432"/> + <location filename="../qt-ui/preferences.ui" line="455"/> <source>Seconds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="464"/> + <location filename="../qt-ui/preferences.ui" line="487"/> <source>Show</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="472"/> + <location filename="../qt-ui/preferences.ui" line="495"/> <source>pO2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="495"/> - <location filename="../qt-ui/preferences.ui" line="536"/> - <location filename="../qt-ui/preferences.ui" line="577"/> + <location filename="../qt-ui/preferences.ui" line="518"/> + <location filename="../qt-ui/preferences.ui" line="559"/> + <location filename="../qt-ui/preferences.ui" line="600"/> <source>threshold</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="513"/> + <location filename="../qt-ui/preferences.ui" line="536"/> <source>pN2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="554"/> + <location filename="../qt-ui/preferences.ui" line="577"/> <source>pHe</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="595"/> + <location filename="../qt-ui/preferences.ui" line="618"/> <source>MOD</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="618"/> + <location filename="../qt-ui/preferences.ui" line="641"/> <source>max PP02</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="634"/> + <location filename="../qt-ui/preferences.ui" line="657"/> <source>EAD END EADD</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="643"/> + <location filename="../qt-ui/preferences.ui" line="666"/> <source>Dive computer reported ceiling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="666"/> + <location filename="../qt-ui/preferences.ui" line="689"/> <source>draw ceiling red</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="677"/> + <location filename="../qt-ui/preferences.ui" line="700"/> <source>Calculated ceiling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="700"/> + <location filename="../qt-ui/preferences.ui" line="723"/> <source>show all tissues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="710"/> + <location filename="../qt-ui/preferences.ui" line="733"/> <source>3m increments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="721"/> - <source>Show time</source> + <location filename="../qt-ui/preferences.ui" line="743"/> + <source>Calculate NDL/TTS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="733"/> + <location filename="../qt-ui/preferences.ui" line="754"/> + <source>Show SAC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="792"/> + <source>GFLow at max depth</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="766"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="739"/> + <location filename="../qt-ui/preferences.ui" line="772"/> <source>GFLow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="749"/> + <location filename="../qt-ui/preferences.ui" line="782"/> <source>GFHigh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="201"/> + <location filename="../qt-ui/preferences.cpp" line="186"/> <source>Open Default Log File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="201"/> - <source>XML Files (*.xml)</source> + <location filename="../qt-ui/preferences.cpp" line="186"/> + <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"></translation> </message> </context> @@ -3693,51 +3985,86 @@ Please, remove them first.</source> <context> <name>ProfileGraphicsView</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="257"/> - <location filename="../qt-ui/profilegraphics.cpp" line="259"/> + <location filename="../qt-ui/profilegraphics.cpp" line="200"/> + <source>Hide events</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profilegraphics.cpp" line="201"/> + <source>Hide all %1 events?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profilegraphics.cpp" line="222"/> + <source>Remove the selected event?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profilegraphics.cpp" line="223"/> + <source>%1 @ %2:%3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profilegraphics.cpp" line="387"/> + <location filename="../qt-ui/profilegraphics.cpp" line="389"/> <source>unknown divecomputer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="337"/> + <location filename="../qt-ui/profilegraphics.cpp" line="467"/> <source>Set Duration: 10 minutes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="383"/> + <location filename="../qt-ui/profilegraphics.cpp" line="513"/> <source>Scale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="384"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Ruler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="582"/> - <location filename="../qt-ui/profilegraphics.cpp" line="850"/> + <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <source>Measure properties of dive segments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <source>Scale your dive to screen size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <source>Edit</source> + <translation type="unfinished">Modifier</translation> + </message> + <message> + <location filename="../qt-ui/profilegraphics.cpp" line="723"/> + <location filename="../qt-ui/profilegraphics.cpp" line="975"/> <source>air</source> <translation type="unfinished">air</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="584"/> - <location filename="../qt-ui/profilegraphics.cpp" line="851"/> + <location filename="../qt-ui/profilegraphics.cpp" line="725"/> + <location filename="../qt-ui/profilegraphics.cpp" line="977"/> <source>EAN%1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="859"/> + <location filename="../qt-ui/profilegraphics.cpp" line="985"/> <source>Bailing out to OC</source> <translation type="unfinished">Passer en CO</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="861"/> + <location filename="../qt-ui/profilegraphics.cpp" line="987"/> <source> begin</source> <comment>Starts with space!</comment> <translation type="unfinished"> début</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="862"/> + <location filename="../qt-ui/profilegraphics.cpp" line="988"/> <source> end</source> <comment>Starts with space!</comment> <translation type="unfinished"> fin</translation> @@ -3746,62 +4073,62 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1497"/> + <location filename="../qt-ui/models.cpp" line="1615"/> <source>unknown</source> <translation type="unfinished">inconnu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1502"/> + <location filename="../qt-ui/models.cpp" line="1620"/> <source>Dive #%1 - %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1505"/> + <location filename="../qt-ui/models.cpp" line="1623"/> <source>Max depth: %1 %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1512"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Duration: %1 min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1517"/> + <location filename="../qt-ui/models.cpp" line="1635"/> <source>Cylinder</source> <translation type="unfinished">Bloc</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1519"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Gasmix</source> <translation type="unfinished">Mélange gazeux</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1521"/> + <location filename="../qt-ui/models.cpp" line="1639"/> <source>Gas Used</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1547"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source>SAC</source> <translation type="unfinished">Consommation d'air</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1549"/> + <location filename="../qt-ui/models.cpp" line="1667"/> <source>Max. CNS</source> <translation type="unfinished">SNC Max.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1551"/> + <location filename="../qt-ui/models.cpp" line="1669"/> <source>OTU</source> <translation type="unfinished">OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1564"/> + <location filename="../qt-ui/models.cpp" line="1682"/> <source>Weights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1570"/> + <location filename="../qt-ui/models.cpp" line="1688"/> <source>Total weight</source> <translation type="unfinished"></translation> </message> @@ -3810,30 +4137,30 @@ Please, remove them first.</source> <name>QObject</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="37"/> - <location filename="../qt-ui/diveplanner.cpp" line="44"/> <source>AIR</source> <translation type="unfinished">AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="38"/> - <location filename="../qt-ui/diveplanner.cpp" line="45"/> + <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <source>Remove this Point</source> + <translation type="unfinished"></translation> + </message> + <message> <source>EAN32</source> - <translation type="unfinished">Nitrox32</translation> + <translation type="obsolete">Nitrox32</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="39"/> - <location filename="../qt-ui/diveplanner.cpp" line="46"/> <source>EAN36</source> - <translation type="unfinished">Nitrox36</translation> + <translation type="obsolete">Nitrox36</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="47"/> - <source>Choose Gas</source> + <location filename="../qt-ui/globe.cpp" line="235"/> + <source>No location data - move the map and double-click to set the dive location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/globe.cpp" line="188"/> - <source>No location data - move the map and double-click to set the dive location</source> + <location filename="../qt-ui/globe.cpp" line="247"/> + <source>Editing dive - move the map and double-click to set the dive location</source> <translation type="unfinished"></translation> </message> <message> @@ -3842,17 +4169,17 @@ Please, remove them first.</source> <translation type="unfinished">Fermer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="26"/> + <location filename="../qt-ui/simplewidgets.cpp" line="27"/> <source>Average</source> <translation type="unfinished">Moyenne</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="29"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Minimum</source> <translation type="unfinished">Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="32"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Maximum</source> <translation type="unfinished">Maximum</translation> </message> @@ -3871,92 +4198,95 @@ Please, remove them first.</source> </message> </context> <context> - <name>SubsurfaceAbout</name> + <name>ShiftTimesDialog</name> <message> - <location filename="../qt-ui/about.ui" line="23"/> - <source>About Subsurface</source> - <translation type="unfinished">À propos de Subsurface</translation> + <location filename="../qt-ui/shifttimes.ui" line="14"/> + <source>Shift selected times</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/about.ui" line="64"/> - <source>TextLabel</source> + <location filename="../qt-ui/shifttimes.ui" line="35"/> + <source>Shift times of selected dives by</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/about.cpp" line="18"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface </source> + <location filename="../qt-ui/shifttimes.ui" line="80"/> + <source>h:mm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/about.cpp" line="22"/> - <source>&License</source> + <location filename="../qt-ui/shifttimes.ui" line="90"/> + <source>earlier</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/about.cpp" line="23"/> - <source>&Website</source> + <location filename="../qt-ui/shifttimes.ui" line="97"/> + <source>later</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>SubsurfaceWebServices</name> + <name>SubsurfaceAbout</name> <message> - <location filename="../qt-ui/subsurfacewebservices.ui" line="14"/> - <source>Download Location Data</source> - <translation type="unfinished"></translation> + <location filename="../qt-ui/about.ui" line="23"/> + <source>About Subsurface</source> + <translation type="unfinished">À propos de Subsurface</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.ui" line="37"/> - <source>Download</source> + <location filename="../qt-ui/about.ui" line="64"/> + <source>TextLabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.ui" line="44"/> - <source>Enter your ID here</source> + <location filename="../qt-ui/about.cpp" line="18"/> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.ui" line="51"/> - <source>User ID</source> + <location filename="../qt-ui/about.cpp" line="22"/> + <source>&License</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.ui" line="58"/> - <source>Status:</source> + <location filename="../qt-ui/about.cpp" line="23"/> + <source>&Website</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="49"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="74"/> <source>Webservice</source> <translation type="unfinished">Serveur</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="90"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/> <source>Wait a bit untill we have something...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="106"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/> <source>Download Finished</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="130"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/> <source>Connection Error: </source> <translation type="unfinished">Erreur de connexion : </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/> <source>Invalid user identifier!</source> <translation type="unfinished">Identifiant utilisateur incorrect.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/> <source>Cannot parse response!</source> <translation type="unfinished">Impossible de lire la réponse</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="133"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/> <source>Download Success!</source> <translation type="unfinished">Téléchargement réussi</translation> </message> @@ -3977,17 +4307,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="718"/> + <location filename="../qt-ui/models.cpp" line="761"/> <source>Bar</source> <translation type="unfinished">bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="718"/> + <location filename="../qt-ui/models.cpp" line="761"/> <source>Ml</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="718"/> + <location filename="../qt-ui/models.cpp" line="761"/> <source>Description</source> <translation type="unfinished"></translation> </message> @@ -3995,7 +4325,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1393"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1519"/> <source>Information</source> <translation type="unfinished"></translation> </message> @@ -4003,96 +4333,139 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="590"/> + <location filename="../qt-ui/models.cpp" line="633"/> <source>kg</source> <translation type="unfinished">kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="590"/> + <location filename="../qt-ui/models.cpp" line="633"/> <source>Description</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>WebServices</name> + <message> + <location filename="../qt-ui/webservices.ui" line="14"/> + <source>Download Location Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/webservices.ui" line="20"/> + <source>Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/webservices.ui" line="27"/> + <source>Enter your ID here</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/webservices.ui" line="34"/> + <source>Download</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/webservices.ui" line="58"/> + <source>User ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/webservices.ui" line="72"/> + <source>Password</source> + <translation type="unfinished">Mot de passe</translation> + </message> + <message> + <location filename="../qt-ui/webservices.ui" line="86"/> + <source>Upload</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="357"/> + <location filename="../qt-ui/models.cpp" line="400"/> <source>Type</source> <translation type="unfinished">Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="357"/> + <location filename="../qt-ui/models.cpp" line="400"/> <source>Weight</source> <translation type="unfinished">Poids</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="460"/> + <source>Clicking here will remove this weigthsystem.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1305"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Year - > Month</source> + > Month / Trip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1306"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source>#</source> <translation type="unfinished">N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1307"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source>Duration Total</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1308"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1309"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source> Shortest</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1310"/> + <location filename="../qt-ui/models.cpp" line="1416"/> <source> Longest</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1311"/> + <location filename="../qt-ui/models.cpp" line="1417"/> <source>Depth (%1) Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1312"/> - <location filename="../qt-ui/models.cpp" line="1315"/> - <location filename="../qt-ui/models.cpp" line="1318"/> + <location filename="../qt-ui/models.cpp" line="1418"/> + <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1424"/> <source> Minimum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1313"/> - <location filename="../qt-ui/models.cpp" line="1316"/> - <location filename="../qt-ui/models.cpp" line="1319"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source> Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1314"/> + <location filename="../qt-ui/models.cpp" line="1420"/> <source>SAC (%1) Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1317"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source>Temp. (%1) Average</source> <translation type="unfinished"></translation> @@ -4101,91 +4474,74 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="44"/> + <location filename="../dive.c" line="57"/> <source>pascal</source> <translation type="unfinished">pascal</translation> </message> <message> - <location filename="../dive.c" line="48"/> - <location filename="../qt-gui.cpp" line="323"/> + <location filename="../dive.c" line="61"/> + <location filename="../qt-gui.cpp" line="322"/> <source>bar</source> <translation type="unfinished">bar</translation> </message> <message> - <location filename="../dive.c" line="52"/> - <location filename="../qt-gui.cpp" line="326"/> + <location filename="../dive.c" line="65"/> + <location filename="../qt-gui.cpp" line="325"/> <source>psi</source> <translation type="unfinished">psi</translation> </message> <message> - <location filename="../dive.c" line="88"/> - <location filename="../qt-gui.cpp" line="304"/> + <location filename="../dive.c" line="101"/> + <location filename="../qt-gui.cpp" line="303"/> <source>l</source> <translation type="unfinished">l</translation> </message> <message> - <location filename="../dive.c" line="93"/> - <location filename="../qt-gui.cpp" line="307"/> + <location filename="../dive.c" line="106"/> + <location filename="../qt-gui.cpp" line="306"/> <source>cuft</source> <translation type="unfinished">pied³</translation> </message> <message> - <location filename="../dive.c" line="121"/> - <location filename="../qt-gui.cpp" line="207"/> + <location filename="../dive.c" line="134"/> + <location filename="../qt-gui.cpp" line="206"/> <source>m</source> <translation type="unfinished">m</translation> </message> <message> - <location filename="../dive.c" line="126"/> - <location filename="../qt-gui.cpp" line="210"/> + <location filename="../dive.c" line="139"/> + <location filename="../qt-gui.cpp" line="209"/> <source>ft</source> <translation type="unfinished">pied</translation> </message> <message> - <location filename="../dive.c" line="170"/> - <location filename="../qt-gui.cpp" line="233"/> + <location filename="../dive.c" line="183"/> + <location filename="../qt-gui.cpp" line="232"/> <source>lbs</source> <translation type="unfinished">livre US</translation> </message> <message> - <location filename="../dive.c" line="174"/> - <location filename="../qt-gui.cpp" line="231"/> + <location filename="../dive.c" line="187"/> + <location filename="../qt-gui.cpp" line="230"/> <source>kg</source> <translation type="unfinished">kg</translation> </message> <message> - <location filename="../dive.c" line="966"/> + <location filename="../dive.c" line="1041"/> <source>(%s) or (%s)</source> <translation type="unfinished">(%s) ou (%s)</translation> </message> <message> - <location filename="../divelist.c" line="473"/> <source>%1$s, %2$s %3$d, %4$d %5$02d:%6$02d</source> - <translation type="unfinished">%1$s %3$d %2$s %4$d, %5$02d:%6$02d</translation> - </message> - <message> - <location filename="../divelist.c" line="490"/> - <source>%1$s %2$d, %3$d -%4$02d:%5$02d</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../divelist.c" line="512"/> - <source>%1$s %2$d (%3$d dives)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../divelist.c" line="519"/> - <source>%1$s %2$d (1 dive)</source> - <translation type="unfinished"></translation> + <translation type="obsolete">%1$s %3$d %2$s %4$d, %5$02d:%6$02d</translation> </message> <message> - <location filename="../divelist.c" line="550"/> - <location filename="../planner.c" line="94"/> - <location filename="../planner.c" line="748"/> - <location filename="../planner.c" line="749"/> - <location filename="../statistics.c" line="360"/> - <location filename="../statistics.c" line="371"/> + <location filename="../divelist.c" line="488"/> + <location filename="../planner.c" line="96"/> + <location filename="../planner.c" line="774"/> + <location filename="../planner.c" line="775"/> + <location filename="../statistics.c" line="381"/> + <location filename="../statistics.c" line="392"/> <source>air</source> <translation type="unfinished">air</translation> </message> @@ -4215,312 +4571,324 @@ Maximum</source> <translation type="unfinished">clip-on</translation> </message> <message> - <location filename="../file.c" line="106"/> - <location filename="../file.c" line="108"/> - <location filename="../file.c" line="303"/> - <location filename="../file.c" line="305"/> + <location filename="../file.c" line="107"/> + <location filename="../file.c" line="109"/> + <location filename="../file.c" line="308"/> + <location filename="../file.c" line="310"/> + <location filename="../file.c" line="390"/> + <location filename="../file.c" line="392"/> <source>Failed to read '%s'</source> <translation type="unfinished">Impossible de la lecture « %s »</translation> </message> <message> - <location filename="../libdivecomputer.c" line="135"/> + <location filename="../file.c" line="265"/> + <location filename="../file.c" line="267"/> + <source>Failed to read '%s'. Use import for CSV files.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../file.c" line="347"/> + <location filename="../file.c" line="349"/> + <source>Maximum number of supported columns on CSV import is %d</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../libdivecomputer.c" line="138"/> <source>none</source> <translation type="unfinished">aucun</translation> </message> <message> - <location filename="../libdivecomputer.c" line="135"/> + <location filename="../libdivecomputer.c" line="138"/> <source>deco stop</source> <translation type="unfinished">Arrêt de décompression</translation> </message> <message> - <location filename="../libdivecomputer.c" line="135"/> + <location filename="../libdivecomputer.c" line="138"/> <source>rbt</source> <translation type="unfinished">rbt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="135"/> + <location filename="../libdivecomputer.c" line="138"/> <source>ascent</source> <translation type="unfinished">ascension</translation> </message> <message> - <location filename="../libdivecomputer.c" line="135"/> + <location filename="../libdivecomputer.c" line="138"/> <source>ceiling</source> <translation type="unfinished">plafond</translation> </message> <message> - <location filename="../libdivecomputer.c" line="135"/> + <location filename="../libdivecomputer.c" line="138"/> <source>workload</source> <translation type="unfinished">charge</translation> </message> <message> - <location filename="../libdivecomputer.c" line="136"/> + <location filename="../libdivecomputer.c" line="139"/> <source>transmitter</source> <translation type="unfinished">transmetteur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="136"/> + <location filename="../libdivecomputer.c" line="139"/> <source>violation</source> <translation type="unfinished">violation</translation> </message> <message> - <location filename="../libdivecomputer.c" line="136"/> + <location filename="../libdivecomputer.c" line="139"/> <source>bookmark</source> <translation type="unfinished">marque-page</translation> </message> <message> - <location filename="../libdivecomputer.c" line="136"/> + <location filename="../libdivecomputer.c" line="139"/> <source>surface</source> <translation type="unfinished">surface</translation> </message> <message> - <location filename="../libdivecomputer.c" line="136"/> + <location filename="../libdivecomputer.c" line="139"/> <source>safety stop</source> <translation type="unfinished">palier de sécurité</translation> </message> <message> - <location filename="../libdivecomputer.c" line="137"/> <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="143"/> <source>gaschange</source> <translation type="unfinished">Changement de gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="137"/> + <location filename="../libdivecomputer.c" line="140"/> <source>safety stop (voluntary)</source> <translation type="unfinished">palier de sécurité (volontaire)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="137"/> + <location filename="../libdivecomputer.c" line="140"/> <source>safety stop (mandatory)</source> <translation type="unfinished">palier de sécurité (obligatoire)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="138"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deepstop</source> <translation type="unfinished">Arrêt profond</translation> </message> <message> - <location filename="../libdivecomputer.c" line="138"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling (safety stop)</source> <translation type="unfinished">plafond (palier de sécurité)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="138"/> + <location filename="../libdivecomputer.c" line="141"/> <source>below floor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="138"/> + <location filename="../libdivecomputer.c" line="141"/> <source>divetime</source> <translation type="unfinished">Temps de plongée</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="142"/> <source>maxdepth</source> <translation type="unfinished">profondeur max</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="142"/> <source>OLF</source> <translation type="unfinished">OLF</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="142"/> <source>PO2</source> <translation type="unfinished">PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="142"/> <source>airtime</source> <translation type="unfinished">temps d'air</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="142"/> <source>rgbm</source> <translation type="unfinished">rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="139"/> + <location filename="../libdivecomputer.c" line="142"/> <source>heading</source> <translation type="unfinished">entête</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="143"/> <source>tissue level warning</source> <translation type="unfinished">Avertissement de niveau « tissue »</translation> </message> <message> - <location filename="../libdivecomputer.c" line="140"/> + <location filename="../libdivecomputer.c" line="143"/> <source>non stop time</source> <translation type="unfinished">temps sans arrêt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="157"/> + <location filename="../libdivecomputer.c" line="160"/> <source>invalid event number</source> <translation type="unfinished">numéro d'événement non valide</translation> </message> <message> - <location filename="../libdivecomputer.c" line="390"/> + <location filename="../libdivecomputer.c" line="393"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished">Impossible de créer une analyse pour %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="396"/> + <location filename="../libdivecomputer.c" line="399"/> <source>Error registering the data</source> <translation type="unfinished">Impossible d'enregistrer les données</translation> </message> <message> - <location filename="../libdivecomputer.c" line="405"/> + <location filename="../libdivecomputer.c" line="408"/> <source>Error parsing the datetime</source> <translation type="unfinished">Impossible d'analyser l'heure</translation> </message> <message> - <location filename="../libdivecomputer.c" line="422"/> + <location filename="../libdivecomputer.c" line="425"/> <source>Dive %d: %s %d %04d</source> <translation type="unfinished">Plongée n°%d - %s %d %04d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="427"/> + <location filename="../libdivecomputer.c" line="430"/> <source>Error parsing the divetime</source> <translation type="unfinished">Impossible d'analyser le temps de plongée</translation> </message> <message> - <location filename="../libdivecomputer.c" line="437"/> + <location filename="../libdivecomputer.c" line="440"/> <source>Error parsing the maxdepth</source> <translation type="unfinished">Impossible d'analyser la profondeux maximale</translation> </message> <message> - <location filename="../libdivecomputer.c" line="447"/> + <location filename="../libdivecomputer.c" line="450"/> <source>Error parsing the gas mix count</source> <translation type="unfinished">Impossible d'analyser le nombre de mélange gazeux</translation> </message> <message> - <location filename="../libdivecomputer.c" line="460"/> + <location filename="../libdivecomputer.c" line="463"/> <source>Error obtaining water salinity</source> <translation type="unfinished">Impossible d'obtenir la salinité de l'eau</translation> </message> <message> - <location filename="../libdivecomputer.c" line="469"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="478"/> + <location filename="../libdivecomputer.c" line="481"/> <source>Error parsing the gas mix</source> <translation type="unfinished">Impossible d'analyser le mélange gazeux</translation> </message> <message> - <location filename="../libdivecomputer.c" line="486"/> + <location filename="../libdivecomputer.c" line="489"/> <source>Error parsing the samples</source> <translation type="unfinished">Impossible d'analyser des échantillons</translation> </message> <message> - <location filename="../libdivecomputer.c" line="613"/> + <location filename="../libdivecomputer.c" line="616"/> <source>Event: waiting for user action</source> <translation type="unfinished">Événement : attente d'une action de l'utilisateur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="621"/> + <location filename="../libdivecomputer.c" line="624"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished">modèle = %u (0x%08x), firmware = %u (0x%08x), port série = %u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="663"/> + <location filename="../libdivecomputer.c" line="666"/> <source>Error registering the event handler.</source> <translation type="unfinished">Impossible d'enregistrer le gestionnaire d'événement.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="668"/> + <location filename="../libdivecomputer.c" line="671"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished">Impossible d'enregistrer le gestionnaire d'annulation.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="672"/> + <location filename="../libdivecomputer.c" line="675"/> <source>Dive data import error</source> <translation type="unfinished">Erreur à l'import des données de plongées</translation> </message> <message> - <location filename="../libdivecomputer.c" line="690"/> + <location filename="../libdivecomputer.c" line="693"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished">Impossible de créer un contexte libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="692"/> + <location filename="../libdivecomputer.c" line="695"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished">Impossible d'ouvrir %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="549"/> + <location filename="../parse-xml.c" line="580"/> <source>Strange percentage reading %s </source> <translation type="unfinished">Valeur de pourcentage étrange %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1695"/> + <location filename="../parse-xml.c" line="1717"/> <source>Failed to parse '%s'. </source> <translation type="unfinished">Impossible d'analyser « %s ». </translation> </message> <message> - <location filename="../parse-xml.c" line="1696"/> + <location filename="../parse-xml.c" line="1718"/> <source>Failed to parse '%s'</source> <translation type="unfinished">Impossible d'analyser « %s »</translation> </message> <message> - <location filename="../parse-xml.c" line="1894"/> + <location filename="../parse-xml.c" line="1916"/> <source>Database query get_events failed. </source> <translation type="unfinished">Échec de la requête. </translation> </message> <message> - <location filename="../parse-xml.c" line="1929"/> + <location filename="../parse-xml.c" line="1951"/> <source>Database connection failed '%s'. </source> <translation type="unfinished">Connexion à la base de données impossible '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1936"/> + <location filename="../parse-xml.c" line="1958"/> <source>Database query failed '%s'. </source> <translation type="unfinished">Échec de la requête '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2048"/> + <location filename="../parse-xml.c" line="2069"/> <source>Can't open stylesheet (%s)/%s</source> <translation type="unfinished">Impossible d'ouvrir la feuille de style (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="96"/> - <location filename="../statistics.c" line="363"/> + <location filename="../planner.c" line="98"/> + <location filename="../statistics.c" line="385"/> <source>EAN%d</source> <translation type="unfinished">Nitrox%d</translation> </message> <message> - <location filename="../planner.c" line="131"/> + <location filename="../planner.c" line="133"/> <source>Can't find gas %d/%d</source> <translation type="unfinished">Impossible de trouver le gaz %d/%d</translation> </message> <message> - <location filename="../planner.c" line="192"/> <source>Cylinder for planning</source> - <translation type="unfinished">Bloc pour la simulation</translation> + <translation type="obsolete">Bloc pour la simulation</translation> </message> <message> - <location filename="../planner.c" line="217"/> <source>Simulated Dive</source> - <translation type="unfinished">Plongée simulée</translation> + <translation type="obsolete">Plongée simulée</translation> </message> <message> - <location filename="../planner.c" line="294"/> + <location filename="../planner.c" line="315"/> <source>Too many gas mixes</source> <translation type="unfinished">Trop de gaz différents</translation> </message> <message> - <location filename="../planner.c" line="472"/> + <location filename="../planner.c" line="493"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -4533,180 +4901,173 @@ basé sur un GFlow = %.0f et un GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="513"/> + <location filename="../planner.c" line="534"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation type="unfinished">Transition vers %.*f %s en %d:%02d min - temps %d:%02u sur %s </translation> </message> <message> - <location filename="../planner.c" line="522"/> + <location filename="../planner.c" line="543"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation type="unfinished">Rester à %.*f %s pour %d:%02d min - temps %d:%02u sur %s </translation> </message> <message> - <location filename="../planner.c" line="533"/> + <location filename="../planner.c" line="554"/> <source>Switch gas to %s </source> <translation type="unfinished">Changer pour du gaz %s </translation> </message> <message> - <location filename="../planner.c" line="541"/> + <location filename="../planner.c" line="562"/> <source>Gas consumption: </source> <translation type="unfinished">Consommation de gaz : </translation> </message> <message> - <location filename="../planner.c" line="552"/> + <location filename="../planner.c" line="573"/> <source>%.0f%s of %s </source> <translation type="unfinished">%.0f%s de %s </translation> </message> <message> - <location filename="../planner.c" line="750"/> + <location filename="../planner.c" line="776"/> <source>ean</source> <translation type="unfinished">ean</translation> </message> <message> - <location filename="../profile.c" line="1154"/> <source>D:%.1f %s</source> - <translation type="unfinished">P : %.1f %s</translation> - </message> - <message> - <location filename="../profile.c" line="1158"/> - <source>%s -T:%d:%02d</source> - <translation type="unfinished"></translation> + <translation type="obsolete">P : %.1f %s</translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1203"/> <source>%s P:%d %s</source> <translation type="unfinished">%s P : %d %s</translation> </message> <message> - <location filename="../profile.c" line="1169"/> + <location filename="../profile.c" line="1208"/> <source>%s T:%.1f %s</source> <translation type="unfinished">%s T : %.1f %s</translation> </message> <message> - <location filename="../profile.c" line="1177"/> + <location filename="../profile.c" line="1215"/> <source>%s V:%.2f %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1182"/> + <location filename="../profile.c" line="1301"/> <source>%s Calculated ceiling %.0f %s</source> <translation type="unfinished">%s Plafond calculé %.0f %s</translation> </message> <message> - <location filename="../profile.c" line="1189"/> + <location filename="../profile.c" line="1308"/> <source>%s Tissue %.0fmin: %.0f %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1200"/> + <location filename="../profile.c" line="1255"/> <source>%s Safetystop:%umin @ %.0f %s</source> <translation type="unfinished">%s Arrêt de sécurité : %umin @ %.0f %s</translation> </message> <message> - <location filename="../profile.c" line="1203"/> + <location filename="../profile.c" line="1199"/> + <source>@:%d:%02d +D:%.1f %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../profile.c" line="1219"/> + <source>%s +SAC:%2.1fl/min</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../profile.c" line="1258"/> <source>%s Safetystop:unkn time @ %.0f %s</source> <translation type="unfinished">%s Arrêt de sécurité : durée inconnue @ %.0f %s</translation> </message> <message> - <location filename="../profile.c" line="1208"/> + <location filename="../profile.c" line="1263"/> <source>%s Deco:%umin @ %.0f %s</source> <translation type="unfinished">%s Décompression : %umin @ %.0f %s</translation> </message> <message> - <location filename="../profile.c" line="1211"/> + <location filename="../profile.c" line="1266"/> <source>%s Deco:unkn time @ %.0f %s</source> <translation type="unfinished">%s Décompression : durée inconnue @ %.0f %s</translation> </message> <message> - <location filename="../profile.c" line="1217"/> + <location filename="../profile.c" line="1272"/> <source>%s In deco</source> <translation type="unfinished">%s En décompression</translation> </message> <message> - <location filename="../profile.c" line="1221"/> - <source>%s -NDL:-</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../profile.c" line="1223"/> + <location filename="../profile.c" line="1275"/> <source>%s NDL:%umin</source> <translation type="unfinished">%s NDL : %umin</translation> </message> <message> - <location filename="../profile.c" line="1227"/> - <source>%s -TTS:%umin</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../profile.c" line="1231"/> + <location filename="../profile.c" line="1223"/> <source>%s CNS:%u%%</source> <translation type="unfinished">%s SNC : %u%%</translation> </message> <message> - <location filename="../profile.c" line="1235"/> + <location filename="../profile.c" line="1227"/> <source>%s pO%s:%.2fbar</source> <translation type="unfinished">%s pO%s : %.2fbar</translation> </message> <message> - <location filename="../profile.c" line="1239"/> + <location filename="../profile.c" line="1231"/> <source>%s pN%s:%.2fbar</source> <translation type="unfinished">%s pN%s : %.2fbar</translation> </message> <message> - <location filename="../profile.c" line="1243"/> + <location filename="../profile.c" line="1235"/> <source>%s pHe:%.2fbar</source> <translation type="unfinished">%s pHe : %.2fbar</translation> </message> <message> - <location filename="../profile.c" line="1248"/> + <location filename="../profile.c" line="1240"/> <source>%s MOD:%d%s</source> <translation type="unfinished">%s MOD : %d%s</translation> </message> <message> - <location filename="../profile.c" line="1255"/> + <location filename="../profile.c" line="1247"/> <source>%s EAD:%d%s END:%d%s @@ -4717,295 +5078,346 @@ END : %d%s EADD : %d%s</translation> </message> <message> - <location filename="../profile.c" line="1349"/> + <location filename="../profile.c" line="1280"/> + <source>%s +Deco:%umin @ %.0f %s (calc)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../profile.c" line="1289"/> + <source>%s +In deco (calc)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../profile.c" line="1292"/> + <source>%s +NDL:%umin (calc)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../profile.c" line="1296"/> + <source>%s +TTS:%umin (calc)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../profile.c" line="1405"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1353"/> - <location filename="../profile.c" line="1357"/> + <location filename="../profile.c" line="1409"/> + <location filename="../profile.c" line="1413"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1361"/> + <location filename="../profile.c" line="1417"/> <source>%s %sD:%.1f %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1365"/> + <location filename="../profile.c" line="1421"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1369"/> - <source>%s%sV:%.2f%s/s</source> + <location filename="../profile.c" line="1425"/> + <source>%s%sV:%.2f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1373"/> - <location filename="../profile.c" line="1377"/> - <source>%s %sV:%.2f%s/s</source> + <location filename="../profile.c" line="1429"/> + <location filename="../profile.c" line="1433"/> + <source>%s %sV:%.2f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1384"/> + <location filename="../profile.c" line="1440"/> <source>%s %sP:%d %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-gui.cpp" line="284"/> + <location filename="../qt-gui.cpp" line="283"/> <source>C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-gui.cpp" line="288"/> + <location filename="../qt-gui.cpp" line="287"/> <source>F</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../statistics.c" line="21"/> + <location filename="../qt-gui.cpp" line="460"/> + <source>%1, %2 %3, %4 %5:%6</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-gui.cpp" line="473"/> + <source>%1 %2, %3 +%4:%5</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-gui.cpp" line="486"/> + <source>%1 %2 (%3 dives)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-gui.cpp" line="491"/> + <source>%1 %2 (1 dive)</source> + <translation type="unfinished"></translation> + </message> + <message> <source>invalid</source> - <translation type="unfinished">Invalide</translation> + <translation type="obsolete">Invalide</translation> </message> <message> - <location filename="../statistics.c" line="21"/> + <location filename="../dive.c" line="13"/> <source>boat</source> <translation type="unfinished">bateau</translation> </message> <message> - <location filename="../statistics.c" line="21"/> + <location filename="../dive.c" line="13"/> <source>shore</source> <translation type="unfinished">rivage</translation> </message> <message> - <location filename="../statistics.c" line="21"/> + <location filename="../dive.c" line="13"/> <source>drift</source> <translation type="unfinished">dérivante</translation> </message> <message> - <location filename="../statistics.c" line="21"/> + <location filename="../dive.c" line="14"/> <source>deep</source> <translation type="unfinished">profondeur</translation> </message> <message> - <location filename="../statistics.c" line="21"/> + <location filename="../dive.c" line="14"/> <source>cavern</source> <translation type="unfinished">grotte</translation> </message> <message> - <location filename="../statistics.c" line="22"/> + <location filename="../dive.c" line="14"/> <source>ice</source> <translation type="unfinished">glace</translation> </message> <message> - <location filename="../statistics.c" line="22"/> + <location filename="../dive.c" line="15"/> <source>wreck</source> <translation type="unfinished">épave</translation> </message> <message> - <location filename="../statistics.c" line="22"/> + <location filename="../dive.c" line="15"/> <source>cave</source> <translation type="unfinished">grotte</translation> </message> <message> - <location filename="../statistics.c" line="22"/> + <location filename="../dive.c" line="15"/> <source>altitude</source> <translation type="unfinished">altitude</translation> </message> <message> - <location filename="../statistics.c" line="22"/> + <location filename="../dive.c" line="16"/> <source>pool</source> <translation type="unfinished">piscine</translation> </message> <message> - <location filename="../statistics.c" line="22"/> + <location filename="../dive.c" line="16"/> <source>lake</source> <translation type="unfinished">Lac</translation> </message> <message> - <location filename="../statistics.c" line="23"/> + <location filename="../dive.c" line="16"/> <source>river</source> <translation type="unfinished">rivière</translation> </message> <message> - <location filename="../statistics.c" line="23"/> + <location filename="../dive.c" line="17"/> <source>night</source> <translation type="unfinished">nuit</translation> </message> <message> - <location filename="../statistics.c" line="23"/> + <location filename="../dive.c" line="17"/> + <source>fresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../dive.c" line="17"/> + <source>student</source> + <translation type="unfinished"></translation> + </message> + <message> <source>freshwater</source> - <translation type="unfinished">eau douce</translation> + <translation type="obsolete">eau douce</translation> </message> <message> - <location filename="../statistics.c" line="23"/> <source>training</source> - <translation type="unfinished">entraînement</translation> + <translation type="obsolete">entraînement</translation> </message> <message> - <location filename="../statistics.c" line="23"/> <source>teaching</source> - <translation type="unfinished">technique</translation> + <translation type="obsolete">technique</translation> </message> <message> - <location filename="../statistics.c" line="24"/> + <location filename="../dive.c" line="18"/> <source>photo</source> <translation type="unfinished">photo</translation> </message> <message> - <location filename="../statistics.c" line="24"/> + <location filename="../dive.c" line="18"/> <source>video</source> <translation type="unfinished">vidéo</translation> </message> <message> - <location filename="../statistics.c" line="24"/> + <location filename="../dive.c" line="18"/> + <source>instructor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../dive.c" line="19"/> <source>deco</source> <translation type="unfinished">décompression</translation> </message> <message> - <location filename="../statistics.c" line="199"/> + <location filename="../statistics.c" line="215"/> <source>more than %d days</source> <translation type="unfinished">plus de %d jours</translation> </message> <message> - <location filename="../statistics.c" line="205"/> + <location filename="../statistics.c" line="221"/> <source>%dd %dh %dmin</source> <translation type="unfinished">%d j %d h %d min</translation> </message> <message> - <location filename="../statistics.c" line="207"/> + <location filename="../statistics.c" line="223"/> <source>%dh %dmin</source> <translation type="unfinished">%d h %d min</translation> </message> <message> - <location filename="../statistics.c" line="218"/> + <location filename="../statistics.c" line="234"/> <source>for dives #</source> <translation type="unfinished">pour les plongées n°</translation> </message> <message> - <location filename="../statistics.c" line="225"/> + <location filename="../statistics.c" line="241"/> <source>for selected dives</source> <translation type="unfinished">uniquement les plongées sélectionnées</translation> </message> <message> - <location filename="../statistics.c" line="260"/> + <location filename="../statistics.c" line="276"/> <source>for dive #%d</source> <translation type="unfinished">pour la plongée n°%d</translation> </message> <message> - <location filename="../statistics.c" line="262"/> + <location filename="../statistics.c" line="278"/> <source>for selected dive</source> <translation type="unfinished">uniquement la plongée sélectionnée</translation> </message> <message> - <location filename="../statistics.c" line="264"/> + <location filename="../statistics.c" line="280"/> <source>for all dives</source> <translation type="unfinished">pour toutes les plongées</translation> </message> <message> - <location filename="../statistics.c" line="266"/> + <location filename="../statistics.c" line="282"/> <source>(no dives)</source> <translation type="unfinished">(pas de plongées)</translation> </message> <message> - <location filename="../statistics.c" line="363"/> - <source>, EAN%d</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../subsurfacestartup.c" line="59"/> + <location filename="../subsurfacestartup.c" line="61"/> <source>Sun</source> <translation type="unfinished">Dim.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="59"/> + <location filename="../subsurfacestartup.c" line="61"/> <source>Mon</source> <translation type="unfinished">Lun.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="59"/> + <location filename="../subsurfacestartup.c" line="61"/> <source>Tue</source> <translation type="unfinished">Mar.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="59"/> + <location filename="../subsurfacestartup.c" line="61"/> <source>Wed</source> <translation type="unfinished">Mer.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="59"/> + <location filename="../subsurfacestartup.c" line="61"/> <source>Thu</source> <translation type="unfinished">Jeu.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="59"/> + <location filename="../subsurfacestartup.c" line="61"/> <source>Fri</source> <translation type="unfinished">Ven.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="59"/> + <location filename="../subsurfacestartup.c" line="61"/> <source>Sat</source> <translation type="unfinished">Sam.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="68"/> + <location filename="../subsurfacestartup.c" line="70"/> <source>Jan</source> <translation type="unfinished">Janv.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="68"/> + <location filename="../subsurfacestartup.c" line="70"/> <source>Feb</source> <translation type="unfinished">Fév.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="68"/> + <location filename="../subsurfacestartup.c" line="70"/> <source>Mar</source> <translation type="unfinished">Mar.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="68"/> + <location filename="../subsurfacestartup.c" line="70"/> <source>Apr</source> <translation type="unfinished">Avril</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="68"/> + <location filename="../subsurfacestartup.c" line="70"/> <source>May</source> <translation type="unfinished">Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="68"/> + <location filename="../subsurfacestartup.c" line="70"/> <source>Jun</source> <translation type="unfinished">Juin</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="69"/> + <location filename="../subsurfacestartup.c" line="71"/> <source>Jul</source> <translation type="unfinished">Juil.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="69"/> + <location filename="../subsurfacestartup.c" line="71"/> <source>Aug</source> <translation type="unfinished">Août</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="69"/> + <location filename="../subsurfacestartup.c" line="71"/> <source>Sep</source> <translation type="unfinished">Sept.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="69"/> + <location filename="../subsurfacestartup.c" line="71"/> <source>Oct</source> <translation type="unfinished">Oct.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="69"/> + <location filename="../subsurfacestartup.c" line="71"/> <source>Nov</source> <translation type="unfinished">Nov.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="69"/> + <location filename="../subsurfacestartup.c" line="71"/> <source>Dec</source> <translation type="unfinished">Déc.</translation> </message> |