Documentation: update french translation of user-manual

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 211 insertions, 207 deletions

diff --git a/Documentation/fr/po/subsurface-manual.fr.po b/Documentation/fr/po/subsurface-manual.fr.po
index 18f4a6d06..77012e9b2 100644
--- a/Documentation/fr/po/subsurface-manual.fr.po
+++ b/Documentation/fr/po/subsurface-manual.fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n"
-"POT-Creation-Date: 2015-02-06 09:16+0100\n"
-"PO-Revision-Date: 2015-02-06 14:30+0100\n"
+"POT-Creation-Date: 2015-02-15 14:23+0100\n"
+"PO-Revision-Date: 2015-02-15 14:25+0100\n"
 "Last-Translator: Guillaume GARDET <guillaume.gardet@opensuse.org>\n"
 "Language-Team: French <opensuse-fr@opensuse.org>\n"
 "Language: fr\n"
@@ -275,14 +275,14 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:108
 msgid ""
-"The *Dive Info* to the top left, giving more detailed information on the "
-"dive selected in the *Dive List*, including some statistics for the selected "
-"dive or for all highlighted dive(s)."
+"The *Info* to the top left, giving more detailed information on the dive "
+"selected in the *Dive List*, including some statistics for the selected dive "
+"or for all highlighted dive(s)."
 msgstr ""
-"Les *informations de plongée* en haut à gauche, fournissent des informations "
-"détaillées sur la plongée sélectionnée dans la *liste des plongées*, dont "
-"des statistiques pour la plongée sélectionnée ou pour toutes les plongées "
-"mises en surbrillance."
+"Les *informations* en haut à gauche, fournissent des informations détaillées "
+"sur la plongée sélectionnée dans la *liste des plongées*, dont des "
+"statistiques pour la plongée sélectionnée ou pour toutes les plongées mises "
+"en surbrillance."
 
 #. type: Plain text
 #: user-manual.txt:111
@@ -313,7 +313,7 @@ msgid ""
 "information and profile of the _selected dive_ are shown in the respective "
 "panels. On the other hand, if one highlights more than one dive the last "
 "highlighted dive is the _selected dive_, but summary data of all "
-"_highlighted dives_ are shown in the *Stats* tab of the *Dive Info* panel "
+"_highlighted dives_ are shown in the *Stats* tab of the *Info* panel "
 "(maximum, minimum and average depths, durations, water temperatures and SAC; "
 "total time and number of dives selected)."
 msgstr ""
@@ -323,9 +323,9 @@ msgstr ""
 "plus d'une plongée est mise en surbrillance seule la dernière mise en "
 "surbrillance est la _plongée sélectionnée_, mais les données de _toutes les "
 "plongées mises en surbrillances_ sont affichées dans l'onglet *Stats* du "
-"panneau *informations de plongée* (profondeur maximale, minimale et moyenne, "
-"les durées, les températures de l'eau et le SAC (air consommé); temps total "
-"et nombre de plongées sélectionnées)."
+"panneau *informations* (profondeur maximale, minimale et moyenne, les "
+"durées, les températures de l'eau et le SAC (air consommé); temps total et "
+"nombre de plongées sélectionnées)."
 
 #. type: Target for macro image
 #: user-manual.txt:127
@@ -366,7 +366,7 @@ msgstr "*Profil* : affiche uniquement le profile de plongée de la plongée sél
 #: user-manual.txt:141
 #, no-wrap
 msgid ""
-"*Info*: Show only the Dive Notes about the last selected dive and statistics for\n"
+"*Info*: Show only the Notes about the last selected dive and statistics for\n"
 "all highlighted dives.\n"
 msgstr ""
 "*Info* : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour\n"
@@ -541,11 +541,11 @@ msgid ""
 "guide, and some remarks about the dive. _Subsurface_ can store much more "
 "information than this for each dive. In order to add a dive to a dive log, "
 "select _Log -> Add Dive_ from the Main Menu. The program then shows three "
-"panels to enter information for a dive: two tabs in the *Dive Info* panel "
-"(*Dive Notes* and *Equipment*), as well as the *Dive Profile* panel that "
-"displays a graphical profile of each dive. These panels are respectively "
-"marked [red]#A#, [red]#B# and [red]#C# in the figure below. Each of these "
-"tabs will now be explained for data entry."
+"panels to enter information for a dive: two tabs in the *Info* panel "
+"(*Notes* and *Equipment*), as well as the *Dive Profile* panel that displays "
+"a graphical profile of each dive. These panels are respectively marked "
+"[red]#A#, [red]#B# and [red]#C# in the figure below. Each of these tabs will "
+"now be explained for data entry."
 msgstr ""
 
 #. type: Target for macro image
@@ -557,10 +557,10 @@ msgstr "images/AddDive1_f20.jpg"
 #. type: Plain text
 #: user-manual.txt:215
 msgid ""
-"When one edits a field in Dive notes or Equipment panels, _Subsurface_ "
-"enters *Editing Mode*, indicated by the message in the blue box at the top "
-"of the _Dive Notes_ panel (see the image below). This message is displayed "
-"in all the panels under Dive notes and Equipment when in *Editing Mode*."
+"When one edits a field in Notes or Equipment panels, _Subsurface_ enters "
+"*Editing Mode*, indicated by the message in the blue box at the top of the "
+"_Notes_ panel (see the image below). This message is displayed in all the "
+"panels under Notes and Equipment when in *Editing Mode*."
 msgstr ""
 
 #. type: Target for macro image
@@ -584,16 +584,16 @@ msgstr ""
 #. type: Title ====
 #: user-manual.txt:224 user-manual.txt:700
 #, no-wrap
-msgid "Dive Notes"
-msgstr "Notes de plongée"
+msgid "Notes"
+msgstr "Notes"
 
 #. type: Plain text
 #: user-manual.txt:230
 msgid ""
 "This panel contains the date, time and place information for a particular "
 "dive, environmental conditions, co-divers and buddies, as well as some "
-"descriptive information. If one clicks on the *Dive Notes* tab, the "
-"following fields are visible:"
+"descriptive information. If one clicks on the *Notes* tab, the following "
+"fields are visible:"
 msgstr ""
 
 #. type: Target for macro image
@@ -781,7 +781,7 @@ msgid ""
 "The *Save* and *Cancel* buttons are used to save all the information for "
 "tabs in the info panel and in the dive profile panel, so there's no need to "
 "use them until ALL other information has been added. Here is an example of a "
-"completed Dive Notes panel:"
+"completed Notes panel:"
 msgstr ""
 
 #. type: Target for macro image
@@ -1031,13 +1031,13 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:473
 msgid ""
-"The information entered in the *Dive Notes* tab, the *Equipment* tab as well "
-"as the *Dive Profile* can now be saved in the user's logbook by using the "
-"two buttons on the top right hand of the Dive Notes tab. If the _Save_ "
-"button is clicked, the dive data are saved in the current logbook. If the "
-"_Cancel_ button is clicked, the newly entered dive data are discarded. When "
-"exiting _Subsurface_, the user will be prompted once more to save the "
-"logbook with the new dive(s)."
+"The information entered in the *Notes* tab, the *Equipment* tab as well as "
+"the *Dive Profile* can now be saved in the user's logbook by using the two "
+"buttons on the top right hand of the Notes tab. If the _Save_ button is "
+"clicked, the dive data are saved in the current logbook. If the _Cancel_ "
+"button is clicked, the newly entered dive data are discarded. When exiting "
+"_Subsurface_, the user will be prompted once more to save the logbook with "
+"the new dive(s)."
 msgstr ""
 
 #. type: Title ===
@@ -1150,7 +1150,7 @@ msgid ""
 "on most dive computers and also saves battery power of the dive computer (at "
 "least for those not charging while connected via USB).  If, for some reason, "
 "the user wishes to import ALL dives from the dive computer, even though some "
-"may already be in the logbook, then check the check box labelled _Force "
+"may already be in the logbook, then check the check box labeled _Force "
 "download of all dives_."
 msgstr ""
 
@@ -1416,8 +1416,8 @@ msgstr ""
 msgid ""
 "With the uploaded dives in the *Dive List*, the information from the dive "
 "computer is not complete and more details must be added in order to have a "
-"fuller record of the dives. To do this, the *Dive Notes* and the *Equipment* "
-"tabs on the top left hand of the _Subsurface_ window should be used."
+"fuller record of the dives. To do this, the *Notes* and the *Equipment* tabs "
+"on the top left hand of the _Subsurface_ window should be used."
 msgstr ""
 
 #. type: Plain text
@@ -1429,8 +1429,8 @@ msgid ""
 "In a few cases, (e.g. APD rebreathers) one also has to provide the date and "
 "time of the dive.  If the contents of this tab is changed or edited in any "
 "way, the message in a blue box at the top of the panel indicates that the "
-"dive is being edited. If one clicks on the *Dive Notes* tab, the following "
-"fields are visible:"
+"dive is being edited. If one clicks on the *Notes* tab, the following fields "
+"are visible:"
 msgstr ""
 
 #. type: Target for macro image
@@ -1686,17 +1686,17 @@ msgstr ""
 msgid ""
 "_METHOD 1_: After uploading dives from a dive computer, the dive profiles of "
 "the uploaded dives are shown in the *Dive profile* tab, as well as a few "
-"items of information in the *Dive Notes* tab (e.g. water temperature) and in "
-"the *Equipment* tab (e.g. gas pressures and gas composition). However the "
-"other fields remain empty.  It may be useful to simultaneously edit some of "
-"the fields in the *Dive Notes* and *Equipment* tabs.  For instance, it is "
-"possible that a diver performed several dives during a single day, using "
-"identical equipment while diving at the same dive site or with the same dive "
-"master and/or buddy or tags. Instead of completing the information for each "
-"of these dives separately, one can select all the dives for that day in the "
-"*Dive List* and insert the same information in the *Dive Notes* and "
-"*Equipment* fields that need identical information. This is achieved by "
-"editing the dive notes or the equipment for any one of the selected dives."
+"items of information in the *Notes* tab (e.g. water temperature) and in the "
+"*Equipment* tab (e.g. gas pressures and gas composition). However the other "
+"fields remain empty.  It may be useful to simultaneously edit some of the "
+"fields in the *Notes* and *Equipment* tabs.  For instance, it is possible "
+"that a diver performed several dives during a single day, using identical "
+"equipment while diving at the same dive site or with the same dive master "
+"and/or buddy or tags. Instead of completing the information for each of "
+"these dives separately, one can select all the dives for that day in the "
+"*Dive List* and insert the same information in the *Notes* and *Equipment* "
+"fields that need identical information. This is achieved by editing the dive "
+"notes or the equipment for any one of the selected dives."
 msgstr ""
 
 #. type: Plain text
@@ -1718,15 +1718,15 @@ msgstr ""
 #: user-manual.txt:933
 msgid ""
 "_METHOD 2_:There is a different way of achieving the same goal. Select a "
-"dive with all the appropriate information typed into the *Dive Notes* and "
+"dive with all the appropriate information typed into the *Notes* and "
 "*Equipment* tabs. Then, from the main menu, select _Log -> Copy dive "
 "components_.  A box is presented with a selection of check boxes for most of "
-"the fields in the *Dive Notes* and *Equipment* tabs.  Select the fields to "
-"be copied from the currently selected dive, then select _OK_. Now, in the "
-"*Dive List*, select the dives into which this information is to be pasted. "
-"Then, from the main menu, select _Log -> Paste dive components_.  All the "
-"selected dives now contain the data initially selected in the original "
-"source dive log."
+"the fields in the *Notes* and *Equipment* tabs.  Select the fields to be "
+"copied from the currently selected dive, then select _OK_. Now, in the *Dive "
+"List*, select the dives into which this information is to be pasted. Then, "
+"from the main menu, select _Log -> Paste dive components_.  All the selected "
+"dives now contain the data initially selected in the original source dive "
+"log."
 msgstr ""
 
 #. type: Title ====
@@ -1787,13 +1787,13 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:967
 msgid ""
-"The information entered in the *Dive Notes* tab and the *Equipment* tab can "
-"be saved by using the two buttons on the top right hand of the *Dive Notes* "
-"tab. If the _Save_ button is clicked, the dive data are saved. If the "
-"_Cancel_ button is clicked, then the newly entered dive data are deleted, "
-"although the dive profile obtained from the dive computer will be retained. "
-"When the user exits _Subsurface_ there is a final prompt to confirm that the "
-"new data should be saved."
+"The information entered in the *Notes* tab and the *Equipment* tab can be "
+"saved by using the two buttons on the top right hand of the *Notes* tab. If "
+"the _Save_ button is clicked, the dive data are saved. If the _Cancel_ "
+"button is clicked, then the newly entered dive data are deleted, although "
+"the dive profile obtained from the dive computer will be retained. When the "
+"user exits _Subsurface_ there is a final prompt to confirm that the new data "
+"should be saved."
 msgstr ""
 
 #. type: Title ===
@@ -2121,12 +2121,12 @@ msgid ""
 "row of cells immediately above these contains the names understood by "
 "_Subsurface_. The white area below the dropdown lists contains all the field "
 "names that _Subsurface_ recognises. These names are in blue balloons and can "
-"be moved using a drag-and-frop action. For instance, _Subsurface_ expects "
+"be moved using a drag-and-drop action. For instance, _Subsurface_ expects "
 "the column heading for Dive number (\" # \") to be \"Dive # \". If the "
 "column heading that _Subsurface_ expects is not in the blue cells, then drag "
 "the appropriate column heading from the upper area and drop it in the "
 "appropriate blue cell at the top of the table. To indicate the correct "
-"column for \"Dive #\", drag the ballooned item labelled \"Dive # \" and drop "
+"column for \"Dive #\", drag the ballooned item labeled \"Dive # \" and drop "
 "it in the blue cell immediately above the white cell containing \" # \". "
 "This is depicted in the image below."
 msgstr ""
@@ -2156,18 +2156,18 @@ msgstr ""
 #. type: delimited block *
 #: user-manual.txt:1179
 msgid ""
-"_CSV_ is an abbreviation for a data file format: _Comma-Separated "
-"Variables_. It is a file format allowing someone to view or edit the "
-"information using a text editor such as Notebook (Windows), gedit (Linux) or "
-"TextWrangler (OS/X). The two main advantages of the _CSV_ format is that the "
-"data are easily editable as text without any proprietary software and "
-"ensuring all information is human-readable, not being obscured by any custom "
-"or proprietary attributes that proprietary software insert into files.  "
-"Because of its simplicity the _CSV_ format is used as an interchange format "
-"between many software packages, e.g. between spreadsheet, statistical, "
-"graphics, database and diving software. Within _Subsurface_, _CSV_ files can "
-"also be used to import information from other sources such as spreadsheet-"
-"based dive logs and even from some dive computers."
+"_CSV_ is an abbreviation for a data file format: _Comma-Separated Values_. "
+"It is a file format allowing someone to view or edit the information using a "
+"text editor such as Notepad (Windows), gedit (Linux) or TextWrangler (OS/X). "
+"The two main advantages of the _CSV_ format is that the data are easily "
+"editable as text without any proprietary software and ensuring all "
+"information is human-readable, not being obscured by any custom or "
+"proprietary attributes that proprietary software insert into files.  Because "
+"of its simplicity the _CSV_ format is used as an interchange format between "
+"many software packages, e.g. between spreadsheet, statistical, graphics, "
+"database and diving software. Within _Subsurface_, _CSV_ files can also be "
+"used to import information from other sources such as spreadsheet-based dive "
+"logs and even from some dive computers."
 msgstr ""
 
 #. type: delimited block *
@@ -2965,7 +2965,7 @@ msgstr ""
 
 #. type: Plain text
 #: user-manual.txt:1592
-msgid "the _Photos_ tab of the *Dive Notes* panel."
+msgid "the _Photos_ tab of the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
@@ -3022,9 +3022,9 @@ msgstr ""
 #: user-manual.txt:1623
 msgid ""
 "Photographs associated with a dive are shown as thumbnails in the _Photos_ "
-"tab of the _Dive Notes_ panel. Photos taken in rapid succession during a "
-"dive (therefore sometimes with large overlap on the dive profile) can easily "
-"be accessed in the _Photos_ tab. This tab serves as a tool for individually "
+"tab of the _Notes_ panel. Photos taken in rapid succession during a dive "
+"(therefore sometimes with large overlap on the dive profile) can easily be "
+"accessed in the _Photos_ tab. This tab serves as a tool for individually "
 "accessing the photos of a dive, while the stubs on the dive profile give an "
 "indication of when during a dive a photo was taken. By single-clicking on a "
 "thumbnail in the _Photos_ panel, a photo is selected. By double-clicking a "
@@ -3087,7 +3087,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "*Describe the cylinders used during the dive* This is performed in the *Equipment tab* of\n"
-"the *Dive Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one,\n"
+"the *Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one,\n"
 "specifying the characteristics of the cylinder and the gas composition within each cylinder.\n"
 msgstr ""
 
@@ -3110,7 +3110,7 @@ msgid ""
 "in time on the *Dive Profile* panel and indicating the cylinder to which the change was made. After\n"
 "right-clicking, follow the context menu to \"Add gas change\" and select the appropriate cylinder from\n"
 "those defined during the first step, above (see image below). If the\n"
-"*tank bar* button in the ttolbar has been activated, the cylinder switches are also indicated in the\n"
+"*tank bar* button in the toolbar has been activated, the cylinder switches are also indicated in the\n"
 "tank bar.\n"
 msgstr ""
 
@@ -3165,7 +3165,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n"
-"specifications of the different cylinders, using the *Equipment* tab of the *Dive Info Panel* (see\n"
+"specifications of the different cylinders, using the *Equipment* tab of the *Info Panel* (see\n"
 "image below where two 12 litre cylinder were used).\n"
 msgstr ""
 
@@ -3182,7 +3182,7 @@ msgid ""
 "profile with a cylinder symbol. If the *Tank Bar* is activated using the toolbar to the left of the\n"
 "profile, then the cylinder change is also indicated on the Tank Bar (see image below). After all\n"
 "the cylinder change events have been recorded on the dive profile, the correct cylinder pressures\n"
-"for both cylinders are shown on the dive profile, as inthe image below.\n"
+"for both cylinders are shown on the dive profile, as in the image below.\n"
 msgstr ""
 
 #. type: Target for macro image
@@ -3194,7 +3194,7 @@ msgstr "images/sidemount1.jpg"
 #. type: Plain text
 #: user-manual.txt:1703
 msgid ""
-"This section gives an example of the versatility of _Subsurface_ as a give "
+"This section gives an example of the versatility of _Subsurface_ as a dive "
 "logging tool."
 msgstr ""
 
@@ -3235,7 +3235,7 @@ msgstr ""
 
 #. type: Plain text
 #: user-manual.txt:1722
-msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Dive Info* panel."
+msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel."
 msgstr ""
 
 #. type: Plain text
@@ -3251,7 +3251,7 @@ msgstr ""
 #: user-manual.txt:1731
 msgid ""
 "If a pSCR _Dive Mode_ has been selected, the dive ceiling for pSCR dives is "
-"adjusted for the oxygen drop accross the mouthpiece which often requires "
+"adjusted for the oxygen drop across the mouthpiece which often requires "
 "longer decompression periods. Below is a dive profile of a pSCR dive using "
 "EAN36 on the back cylinder and oxygen for decompression. Note that this dive "
 "lasted over two hours."
@@ -3468,7 +3468,7 @@ msgid ""
 "two cylinders are shown as green lines overlapping the depth profile. In "
 "addition, start and end pressures for both oxygen and diluent cylinders are "
 "shown in the _Equipment Tab_.  Below is a dive profile for a CCR dive, "
-"including an overaly of setpoint and oxygen sensor data, as well as the "
+"including an overlay of setpoint and oxygen sensor data, as well as the "
 "cylinder pressure data. In this case there is good agreement from the "
 "readings of the two oxygen sensors."
 msgstr ""
@@ -3504,17 +3504,17 @@ msgstr ""
 #. type: Title ===
 #: user-manual.txt:1848
 #, no-wrap
-msgid "The *Dive Info* tab (for individual dives)"
+msgid "The *Info* tab (for individual dives)"
 msgstr ""
 
 #. type: Plain text
 #: user-manual.txt:1855
 msgid ""
-"The Dive Info tab gives some summary information about a particular dive "
-"that has been selected in the *Dive List*. Useful information here includes "
-"the surface interval before the dive, the maximum and mean depths of the "
-"dive, the gas volume consumed, the surface air consumption (SAC) and the "
-"number of oxygen toxicity units (OTU) incurred."
+"The Info tab gives some summary information about a particular dive that has "
+"been selected in the *Dive List*. Useful information here includes the "
+"surface interval before the dive, the maximum and mean depths of the dive, "
+"the gas volume consumed, the surface air consumption (SAC) and the number of "
+"oxygen toxicity units (OTU) incurred."
 msgstr ""
 
 #. type: Plain text
@@ -4097,10 +4097,10 @@ msgid ""
 "The EAD is the depth of a hypothetical air dive that has the same partial "
 "pressure of nitrogen as the current depth of the nitrox dive at hand. A "
 "nitrox dive leads to the same decompression obligation as an air dive to the "
-"depth equalling the EAD. The END is the depth of a hypothetical air dive "
-"that has the same sum of partial pressures of the narcotic gases nitrogen "
-"and oxygen as the current trimix dive. A trimix diver can expect the same "
-"narcotic effect as a diver breathing air diving at a depth equalling the END."
+"depth equaling the EAD. The END is the depth of a hypothetical air dive that "
+"has the same sum of partial pressures of the narcotic gases nitrogen and "
+"oxygen as the current trimix dive. A trimix diver can expect the same "
+"narcotic effect as a diver breathing air diving at a depth equaling the END."
 msgstr ""
 
 #. type: Plain text
@@ -4373,14 +4373,14 @@ msgstr ""
 msgid ""
 "Normally, in the dive list, minimal information is included in the trip "
 "title.  More information about a trip can be added by selecting its trip "
-"title from the *Dive List*. This shows a *Trip Notes* tab in the *Dive "
-"Notes* panel. Here users can add or edit information about the date/time, "
-"the trip location and any other general comments about the trip as a whole "
-"(e.g. the dive company that was dived with, the general weather and surface "
-"conditions during the trip, etc.).  After entering this information, users "
-"should select *Save* from the buttons at the top right of the *Trip Notes* "
-"tab. The trip title in the *Dive List* panel should now reflect some of the "
-"edited information."
+"title from the *Dive List*. This shows a *Trip Notes* tab in the *Notes* "
+"panel. Here users can add or edit information about the date/time, the trip "
+"location and any other general comments about the trip as a whole (e.g. the "
+"dive company that was dived with, the general weather and surface conditions "
+"during the trip, etc.).  After entering this information, users should "
+"select *Save* from the buttons at the top right of the *Trip Notes* tab. The "
+"trip title in the *Dive List* panel should now reflect some of the edited "
+"information."
 msgstr ""
 
 #. type: Title ====
@@ -4537,9 +4537,9 @@ msgid ""
 "Users can merge these dives onto a single dive by selecting the appropriate "
 "dives, right-clicking them to bring up the context menu and then selecting "
 "*Merge selected dives*. It may be necessary to edit the dive information in "
-"the *Dive Notes* panel to reflect events or conditions that apply to the "
-"merged dive. The figure below shows the depth profile of two such dives that "
-"were merged:"
+"the *Notes* panel to reflect events or conditions that apply to the merged "
+"dive. The figure below shows the depth profile of two such dives that were "
+"merged:"
 msgstr ""
 
 #. type: Target for macro image
@@ -4673,10 +4673,10 @@ msgstr "images/facebook1_f20.jpg"
 #: user-manual.txt:2465
 msgid ""
 "Having established a login to _Facebook_, transfer of a dive profile to "
-"one's _Facebook_ timeline is easy.  A _Facebook_ icon appears in the *Dive "
-"Notes* panel of _Subsurface_ (See image *A* below). Ensure that the dive "
-"that you want to transfer to the timeline is depicted in the _Subsurface_ "
-"*Dive Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, "
+"one's _Facebook_ timeline is easy.  A _Facebook_ icon appears in the *Notes* "
+"panel of _Subsurface_ (See image *A* below). Ensure that the dive that you "
+"want to transfer to the timeline is depicted in the _Subsurface_ *Dive "
+"Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, "
 "determining the amount of additional information transferred with the dive "
 "profile (see image *B*, below). In order to transfer a dive profile to "
 "_Facebook_, the name of a _Facebook_ album needs to be provided. The "
@@ -4767,7 +4767,7 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:2501
 msgid ""
-"_DiveShare_ is also a dive log repostory on the Internet focusing on the "
+"_DiveShare_ is also a dive log repository on the Internet focusing on the "
 "recreational dives. In order to upload dives one has to provide a used ID, "
 "so registration with _http://scubadiveshare.com_ is required."
 msgstr ""
@@ -5251,7 +5251,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "  ** *Default cylinder*: Here users can specify the default cylinder listed in\n"
-"     the *Equipment* tab of the *Dive Notes* panel.\n"
+"     the *Equipment* tab of the *Notes* panel.\n"
 msgstr ""
 
 #. type: Plain text
@@ -5637,7 +5637,7 @@ msgid ""
 "sections (see image below). The *setup* parameters for a dive are entered "
 "into the several sections on the left hand side of the screen.  The setup is "
 "divided into several sections: Available Gases, Rates, Planning, Gas Options "
-"and Dive Notes."
+"and Notes."
 msgstr ""
 
 #. type: Plain text
@@ -5699,15 +5699,15 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:2924
 msgid ""
-"In the table labelled _Available Gases_, add the information of the "
-"cylinders to be used as well as the gas composition within that cylinder. "
-"This is done in a similar way as for <<S_CylinderData,providing cylinder "
-"data for dive logs>>. Choose the cylinder type by double clicking the "
-"cylinder type and using the dropdown list, then specify the work pressure of "
-"this cylinder. By leaving the oxygen concentration (O2%) filed empty, the "
-"cylinder is assumed to contain air. Otherwise enter the oxygen and/or helium "
-"concentration in the boxes provided in this dialogue. Add additional "
-"cylinders by using the \"+\" icon to the top righthand of the dialogue."
+"In the table labeled _Available Gases_, add the information of the cylinders "
+"to be used as well as the gas composition within that cylinder. This is done "
+"in a similar way as for <<S_CylinderData,providing cylinder data for dive "
+"logs>>. Choose the cylinder type by double clicking the cylinder type and "
+"using the dropdown list, then specify the work pressure of this cylinder. By "
+"leaving the oxygen concentration (O2%) filed empty, the cylinder is assumed "
+"to contain air. Otherwise enter the oxygen and/or helium concentration in "
+"the boxes provided in this dialogue. Add additional cylinders by using the "
+"\"+\" icon to the top righthand of the dialogue."
 msgstr ""
 
 #. type: Plain text
@@ -5846,7 +5846,7 @@ msgid ""
 "features of the dive have been completed, e.g. the bottom time segment and "
 "deep stops (if these are implemented). Leave the remaining waypoints on the "
 "ascent to _Subsurface_. In most cases _Subsurface_ computes additional way "
-"points in order to fulfil decompression requirements for that dive. A "
+"points in order to fulfill decompression requirements for that dive. A "
 "waypoint can be moved by selecting that waypoint and by using the arrow "
 "keys.  The waypoints listed in the _Dive Planner Points_ dialogue can be "
 "edited by hand in order to obtain a precise presentation of the dive plan. "
@@ -5911,7 +5911,7 @@ msgstr ""
 msgid ""
 "On the bottom right of the dive planner, under _Dive Plan Details_, the "
 "exact details of the dive plan are provided. These details may be modified "
-"by checking any of the options under the _Dive Notes_ section of the dive "
+"by checking any of the options under the _Notes_ section of the dive "
 "planner, immediately to the left of the _Dive Plan Details_. If a _Verbatim "
 "diveplan_ is requested, a detailed sentence-level explanation of the dive "
 "plan is given. If any of the management specifications have been exceeded "
@@ -5999,13 +5999,13 @@ msgid ""
 "from the main menu, where the gas consumption calculation takes into account the pSCR dump\n"
 "ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop\n"
 "accross the mouthpiece of the rebreather into account. If the\n"
-"pO~2~ drops below what is considered a save value, a warning apears in the _Dive plan\n"
+"pO~2~ drops below what is considered a save value, a warning appears in the _Dive plan\n"
 "details_. A typical pSCR configuration is with a single cylinder and one or more bail-out\n"
 "cylinders. Therefore the setup of the _Available gases_ and the _Dive planner points_ tables\n"
 "are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints\n"
 "are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable\n"
 "to that of the CCR dive above, but note the longer ascent duration due to the lower oxygen\n"
-"in the loop due to the oxygen drop accross the mouthpiece of the pSCR equipment.\n"
+"in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.\n"
 msgstr ""
 
 #. type: Target for macro image
@@ -6095,15 +6095,15 @@ msgstr ""
 msgid ""
 "Dive plans have many characteristics in common with dive logs (dive profile, "
 "dive notes, etc).  After a dive plan has been saved, the dive details and "
-"gas calculations are saved in the *Dive Notes* tab. While a dive plan is "
-"being designed, it can be printed using the _Print_ button in the dive "
-"planner. This prints the dive details and gas calculations in the _Dive Plan "
-"Details_ panel of the dive planner. However, after the plan has been saved, "
-"it is represented in a way very similar to a dive log and the gas "
-"calculations cannot be accessed in the same way as during the planning "
-"process. The only way to print the dive plan is to use the _File -> Print_ "
-"facility on the main menu in the same way as for dive logs or by copy and "
-"paste to a word processor."
+"gas calculations are saved in the *Notes* tab. While a dive plan is being "
+"designed, it can be printed using the _Print_ button in the dive planner. "
+"This prints the dive details and gas calculations in the _Dive Plan Details_ "
+"panel of the dive planner. However, after the plan has been saved, it is "
+"represented in a way very similar to a dive log and the gas calculations "
+"cannot be accessed in the same way as during the planning process. The only "
+"way to print the dive plan is to use the _File -> Print_ facility on the "
+"main menu in the same way as for dive logs or by copy and paste to a word "
+"processor."
 msgstr ""
 
 #. type: Title ==
@@ -6364,10 +6364,8 @@ msgstr ""
 
 #. type: Plain text
 #: user-manual.txt:3187
-msgid "<<S_ViewPanels,_Info_>> - View only the *Dive Notes* panel."
-msgstr ""
-"<<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes de "
-"plongée*."
+msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel."
+msgstr "<<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes*."
 
 #. type: Plain text
 #: user-manual.txt:3188
@@ -7199,8 +7197,8 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:3549
 msgid ""
-"In the dropdown list on the middle right labeled '_Pre-configured imports_"
-"\", select _APD Log Viewer_."
+"In the dropdown list on the top left labeled '_Pre-configured imports_\", "
+"select _APD Log Viewer_."
 msgstr ""
 
 #. type: Plain text
@@ -7455,30 +7453,36 @@ msgstr ""
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
+#. type: Named 'icon' AttributeList argument for style 'icon'
+#: user-manual.txt:3632
+#, no-wrap
+msgid "images/icons/atomiclogo.jpg"
+msgstr "images/icons/atomiclogo.jpg"
+
 #. type: Plain text
-#: user-manual.txt:3638
+#: user-manual.txt:3639
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
-"The divelog is kept in a SQlite database at C:\\ProgramData\\AtomicsAquatics"
+"The divelog is kept in a SQLite database at C:\\ProgramData\\AtomicsAquatics"
 "\\Cobalt-Logbook\\Cobalt.db. This file can be directly imported to "
 "Subsurface."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3640
+#: user-manual.txt:3641
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3643
+#: user-manual.txt:3644
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr "images/icons/mareslogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3651
+#: user-manual.txt:3652
 msgid ""
 "Mares Dive Organiser is a Windows application. The dive log is kept as a "
 "Microsoft SQL Compact Edition database with a '.sdf' filename extension. The "
@@ -7489,7 +7493,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3656
+#: user-manual.txt:3657
 msgid ""
 "Within Dive Organiser, select _Database -> Backup_ from the main menu and "
 "back up the database to the desk top.  This creates a zipped file "
@@ -7497,36 +7501,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3659
+#: user-manual.txt:3660
 msgid ""
 "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a "
 "file _DiveOrganiser.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3660
+#: user-manual.txt:3661
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3661
+#: user-manual.txt:3662
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3663
+#: user-manual.txt:3664
 #, no-wrap
 msgid "Exporting from *DivingLog 5.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3665
+#: user-manual.txt:3666
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr "images/icons/divingloglogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3674
+#: user-manual.txt:3675
 msgid ""
 "Unfortunately DivingLog XML files give us no indication on the preferences "
 "set on one's system. So in order for _Subsurface_ to be able to successfully "
@@ -7537,28 +7541,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3676
+#: user-manual.txt:3677
 msgid "In DivingLog open the 'File -> Export -> XML' menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3677
+#: user-manual.txt:3678
 msgid "Select the dives to export"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3678
+#: user-manual.txt:3679
 msgid "Click on the export button and select the filename"
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3680
+#: user-manual.txt:3681
 #, no-wrap
 msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3689
+#: user-manual.txt:3690
 msgid ""
 "Many divers keep a diving log in some form of a digital file, commonly a "
 "spreadsheet with various fields of information. These logs can be easily "
@@ -7571,7 +7575,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3695
+#: user-manual.txt:3696
 msgid ""
 "The first step is to organize the diving data in the spreadsheet, so that "
 "the first row contains the names (or titles) of each column and the "
@@ -7582,41 +7586,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3697
+#: user-manual.txt:3698
 msgid ""
 "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3698
+#: user-manual.txt:3699
 msgid "Duration: the format should be minutes:seconds."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3699
+#: user-manual.txt:3700
 msgid ""
-"Unit system: only one unit system shold be used (i.e., no mixture between "
+"Unit system: only one unit system should be used (i.e., no mixture between "
 "imperial and metric units)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3700
+#: user-manual.txt:3701
 msgid "Tags and buddies: values should be separated using a comma."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3701
+#: user-manual.txt:3702
 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3702
+#: user-manual.txt:3703
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3706
+#: user-manual.txt:3707
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -7627,13 +7631,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3707
+#: user-manual.txt:3708
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr "images/LOffice_spreadsheetdata.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3710
+#: user-manual.txt:3711
 msgid ""
 "To export the data as a .CSV file from within LibreOffice click _File -> "
 "Save As_. On the dialogue that comes up, select the _Text CSV (.csv)_ as the "
@@ -7641,13 +7645,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3711
+#: user-manual.txt:3712
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr "images/LOffice_save_as_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3714
+#: user-manual.txt:3715
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -7655,13 +7659,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3715
+#: user-manual.txt:3716
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr "images/LOffice_field_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3718
+#: user-manual.txt:3719
 msgid ""
 "One can double check the .CSV file by opening it with a text editor, and "
 "then import the dive data as explained on the section xref:"
@@ -7669,13 +7673,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3719
+#: user-manual.txt:3720
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3725
+#: user-manual.txt:3726
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
@@ -7686,19 +7690,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3727
+#: user-manual.txt:3728
 msgid ""
 "In Microsoft Windows, click the *Start* button, and then select _Control "
 "Panel_ from the list on the right-hand side."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3728
+#: user-manual.txt:3729
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3731
+#: user-manual.txt:3732
 msgid ""
 "Do one of the following: ** In Windows 7, click the _Formats_ tab, and then "
 "click _Customize this format_.  ** In Windows XP, click the _Regional "
@@ -7706,48 +7710,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3732
+#: user-manual.txt:3733
 msgid ""
 "Type a new separator in the _List separator_ box. To use a TAB-delimited "
 "file, type the word TAB in the box."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3733
+#: user-manual.txt:3734
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3735
+#: user-manual.txt:3736
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3736
+#: user-manual.txt:3737
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr "images/Win_SaveCSV2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3739
+#: user-manual.txt:3740
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3741
+#: user-manual.txt:3742
 msgid ""
 "With the dive log opened in _Excel_, select the round Windows button at the "
 "top left, then _Save As_."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3742
+#: user-manual.txt:3743
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr "images/Win_SaveCSV1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3745
+#: user-manual.txt:3746
 msgid ""
 "Click on the left-hand part of the _Save as_ option, NOT on the arrow on the "
 "right-hand. This brings up a dialogue for saving the spreadsheet in an "
@@ -7757,13 +7761,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3746
+#: user-manual.txt:3747
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr "images/Win_SaveCSV3.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3749
+#: user-manual.txt:3750
 msgid ""
 "Select the _Save_ button. The CSV-formatted file is saved into the folder "
 "that was selected. One can double check the .CSV file by opening it with a "
@@ -7772,19 +7776,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3750
+#: user-manual.txt:3751
 #, no-wrap
 msgid "APPENDIX E: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3752
+#: user-manual.txt:3753
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3756
+#: user-manual.txt:3757
 msgid ""
 "'Question': I dived with a 12.2 l tank, starting with 220 bar and ending "
 "with 100 bar, and I calculate a different SAC compared what _Subsurface_ "
@@ -7792,7 +7796,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3762
+#: user-manual.txt:3763
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
@@ -7802,7 +7806,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3768
+#: user-manual.txt:3769
 msgid ""
 "and that's true for an ideal gas, and it's what you get taught in dive "
 "theory.  But an \"ideal gas\" doesn't actually exist, and real gases "
@@ -7812,12 +7816,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3770
+#: user-manual.txt:3771
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3776
+#: user-manual.txt:3777
 msgid ""
 "where the amount of air is *not* just \"tank size times pressure in bar\".  "
 "It's a combination of: \"take compressibility into account\" (which is a "
@@ -7828,12 +7832,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3778
+#: user-manual.txt:3779
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3783
+#: user-manual.txt:3784
 msgid ""
 "which is about 1445, not 1464. So there was 19 l too much in your simple "
 "calculation that ignored the difference between 1 bar and one ATM.  The "
@@ -7843,7 +7847,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3789
+#: user-manual.txt:3790
 msgid ""
 "So be happy: your SAC really is better than your calculations indicated.  Or "
 "be sad: your cylinder contains less air than you thought it did.  And as "
@@ -7854,13 +7858,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3790
+#: user-manual.txt:3791
 #, no-wrap
 msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3794
+#: user-manual.txt:3795
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -7868,7 +7872,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3802
+#: user-manual.txt:3803
 msgid ""
 "'Answer': For example, if you end up doing a weight check (deep enough to "
 "trigger the \"dive started\")  but then come back up and wait five minutes "