Documentation: Merge/update french user-manual translation

Merge/update french user-manual translation.

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

4 files changed, 1817 insertions, 845 deletions

diff --git a/Documentation/50-pot/subsurface-manual.pot b/Documentation/50-pot/subsurface-manual.pot
index caf5225c6..94a0f816f 100644
--- a/Documentation/50-pot/subsurface-manual.pot
+++ b/Documentation/50-pot/subsurface-manual.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: subsurface-manual VERSION\n"
 "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n"
-"POT-Creation-Date: 2015-05-18 11:34+0200\n"
+"POT-Creation-Date: 2015-05-28 16:09+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6532,211 +6532,232 @@ msgstr ""
 
 #. type: Plain text
 #: ./user-manual.txt:3298
-msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences."
+msgid ""
+"<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives "
+"have been moved to"
 msgstr ""
 
 #. type: Plain text
 #: ./user-manual.txt:3299
 msgid ""
+"a different disk or directory, locate them and link them to the appropriate "
+"dives."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3300
+msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3301
+msgid ""
 "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive "
 "computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3300
+#: ./user-manual.txt:3302
 msgid "_Quit_ - Quit _Subsurface_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3301
+#: ./user-manual.txt:3303
 #, no-wrap
 msgid "Import"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3304
+#: ./user-manual.txt:3306
 msgid ""
 "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive "
 "information from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3306
+#: ./user-manual.txt:3308
 msgid ""
 "<<Unified_import,_Import Log Files_>> - Import dive information from a file "
 "in in a _Subsurface_-compatible format."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3308
+#: ./user-manual.txt:3310
 msgid ""
 "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS "
 "coordinates from the _Subsurface_ mobile phone app."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3310
+#: ./user-manual.txt:3312
 msgid ""
 "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive "
 "information from _www.Divelogs.de_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3311
+#: ./user-manual.txt:3313
 #, no-wrap
 msgid "Log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3313
+#: ./user-manual.txt:3315
 msgid ""
 "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* "
 "panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3314
+#: ./user-manual.txt:3316
+msgid ""
+"_Edit dive_ - Edit a dive of which the profile was entered by hande and not "
+"from a dive computer."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3317
 msgid "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3315
+#: ./user-manual.txt:3318
 msgid ""
-"<<S_Replan,_Re-plan dive_>> - Edit a dive plan that has been saved into the "
-"*Dive List*."
+"<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved "
+"into the *Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3317
+#: ./user-manual.txt:3320
 msgid ""
 "<<S_CopyComponents,_Copy dive components_>> - By selecting this option, one "
 "can copy information from several fields of a dive log onto the clipboard."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3319
+#: ./user-manual.txt:3322
 msgid ""
 "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, "
 "the information copied using the _Copy dive components_ option."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3321
+#: ./user-manual.txt:3324
 msgid ""
 "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* "
 "panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3323
+#: ./user-manual.txt:3326
 msgid ""
 "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into "
 "dive trips."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3324
+#: ./user-manual.txt:3327
 msgid ""
 "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to "
 "facilitate your logs."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3325
+#: ./user-manual.txt:3328
 msgid ""
 "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific "
 "tags or dive criteria."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3326
+#: ./user-manual.txt:3329
 #, no-wrap
 msgid "View"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3329
+#: ./user-manual.txt:3332
 msgid ""
 "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels "
 "simmultaneously."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3330
+#: ./user-manual.txt:3333
 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3331
+#: ./user-manual.txt:3334
 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3332
+#: ./user-manual.txt:3335
 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3333
+#: ./user-manual.txt:3336
 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3335
+#: ./user-manual.txt:3338
 msgid ""
 "_Yearly Statistics_ - Display summary statistics about dives during this and "
 "past years."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3336
+#: ./user-manual.txt:3339
 msgid "_Prev DC_ - Switch to previous dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3337
+#: ./user-manual.txt:3340
 msgid "_Next DC_ - Switch to next dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3338
+#: ./user-manual.txt:3341
 msgid "_Full Screen_ - Toggles Full Screen mode."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3339
+#: ./user-manual.txt:3342
 #, no-wrap
 msgid "Help"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3342
+#: ./user-manual.txt:3345
 msgid ""
 "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as "
 "well as licensing information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3344
+#: ./user-manual.txt:3347
 msgid ""
 "_Check for updates_ - Find out whether a newer version of Subsurface is "
 "available on the http://subsurface-divelog.org/[_Subsurface_ web site]."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3345
+#: ./user-manual.txt:3348
 msgid ""
 "<<S_UserSurvey,_User survey_>> - Help to make _Subsurface_ even better by "
 "taking part in our user survey."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3346
+#: ./user-manual.txt:3349
 msgid "_User manual_ - Open a window showing this user manual."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3349
+#: ./user-manual.txt:3352
 #, no-wrap
 msgid ""
 "APPENDIX A: Operating system specific information for importing dive "
@@ -6744,19 +6765,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3351
+#: ./user-manual.txt:3354
 #, no-wrap
 msgid "Make sure that the OS has the required drivers installed"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3352
+#: ./user-manual.txt:3355
 #, no-wrap
 msgid "images/icons/drivers.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3357
+#: ./user-manual.txt:3360
 msgid ""
 "The operating system of the desktop computer needs the appropriate drivers "
 "in order to communicate with the dive computer in whichever way the dive "
@@ -6764,7 +6785,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3363
+#: ./user-manual.txt:3366
 msgid ""
 "On Linux users need to have the correct kernel module loaded. Most "
 "distributions will do this automatically, so the user does not need to load "
@@ -6773,7 +6794,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3367
+#: ./user-manual.txt:3370
 msgid ""
 "On Windows, the OS should offer to download the correct driver once the user "
 "connects the dive computer to the USB port and operating system sees the "
@@ -6781,7 +6802,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3374
+#: ./user-manual.txt:3377
 msgid ""
 "On a Mac users sometimes have to manually hunt for the correct driver. For "
 "example the correct driver for the Mares Puck devices or any other dive "
@@ -6792,19 +6813,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3376
+#: ./user-manual.txt:3379
 #, no-wrap
 msgid "How to Find the Device Name for USB devices and set its write permission"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3377
+#: ./user-manual.txt:3380
 #, no-wrap
 msgid "images/icons/usb.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3385
+#: ./user-manual.txt:3388
 msgid ""
 "When a user connects the dive computer by using a USB connector, usually "
 "_Subsurface_ will either propose a drop down list that contains the correct "
@@ -6814,68 +6835,68 @@ msgid ""
 "what the device name is:"
 msgstr ""
 
-#. type: Block title
-#: ./user-manual.txt:3386 ./user-manual.txt:3469
+#. type: Title ====
+#: ./user-manual.txt:3389 ./user-manual.txt:3472
 #, no-wrap
 msgid "On Windows:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3390
+#: ./user-manual.txt:3393
 msgid ""
 "Simply try COM1, COM2, etc. The drop down list should contain all connected "
 "COM devices."
 msgstr ""
 
-#. type: Block title
-#: ./user-manual.txt:3391 ./user-manual.txt:3484
+#. type: Title ====
+#: ./user-manual.txt:3394 ./user-manual.txt:3487
 #, no-wrap
 msgid "On MacOS:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3394
+#: ./user-manual.txt:3397
 msgid "The drop down box should find all connected dive computers."
 msgstr ""
 
 #. type: Block title
-#: ./user-manual.txt:3395
+#: ./user-manual.txt:3398
 #, no-wrap
 msgid "On Linux:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3398
+#: ./user-manual.txt:3401
 msgid "There is a definitive way to find the port:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3400
+#: ./user-manual.txt:3403
 msgid "Disconnect the USB cable from the dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3401
+#: ./user-manual.txt:3404
 msgid "Open a terminal"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3402 ./user-manual.txt:3404
+#: ./user-manual.txt:3405 ./user-manual.txt:3407
 msgid "Type the command: 'dmesg' and press enter"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3403
+#: ./user-manual.txt:3406
 msgid "Plug in the USB cable of the dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3406
+#: ./user-manual.txt:3409
 msgid "A message similar to this one should appear:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3422
+#: ./user-manual.txt:3425
 #, no-wrap
 msgid ""
 "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n"
@@ -6896,7 +6917,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3427
+#: ./user-manual.txt:3430
 msgid ""
 "The third line from the bottom shows that the FTDI USB adapter is detected "
 "and connected to +ttyUSB3+. This information can now be used in the import "
@@ -6904,12 +6925,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3429
+#: ./user-manual.txt:3432
 msgid "Ensuring that the user has write permission to the USB serial port:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3435
+#: ./user-manual.txt:3438
 msgid ""
 "On Unix-like operating systems the USB ports can only be accessed by users "
 "who are members of the +dialout+ group. If one is not root, one may not be a "
@@ -6918,14 +6939,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3439
+#: ./user-manual.txt:3442
 msgid ""
 "As root, type: +usermod -a -G dialout johnB+ (Ubuntu users: +sudo usermod -a "
 "-G dialout johnB+)  This makes johnB a member of the +dialout+ group."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3444
+#: ./user-manual.txt:3447
 #, no-wrap
 msgid ""
 "Type: +id johnB+     This lists all the groups that johnB belongs to and\n"
@@ -6937,7 +6958,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3446
+#: ./user-manual.txt:3449
 #, no-wrap
 msgid ""
 "Under some circumstances this change takes only effect (eg. on Ubuntu) "
@@ -6946,7 +6967,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3451
+#: ./user-manual.txt:3454
 msgid ""
 "With the appropriate device name (e.g. +dev/ttyUSB3+) and with write "
 "permission to the USB port, the dive computer interface can connect and one "
@@ -6954,19 +6975,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3453
+#: ./user-manual.txt:3456
 #, no-wrap
 msgid "Setting up bluetooth enabled devices"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3454
+#: ./user-manual.txt:3457
 #, no-wrap
 msgid "images/icons/bluetooth.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3460
+#: ./user-manual.txt:3463
 msgid ""
 "For dive computers communicating through bluetooth like the Heinrichs "
 "Weikamp Frog or the Shearwater Predator and Petrel there is a different "
@@ -6975,7 +6996,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3462
+#: ./user-manual.txt:3465
 #, no-wrap
 msgid ""
 "*For the dive computer, after enabling Bluetooth, ensure it is in Upload "
@@ -6983,7 +7004,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3466
+#: ./user-manual.txt:3469
 msgid ""
 "For Bluetooth pairing of the dive computer, refer to the manufacturer's user "
 "guide. When using a Shearwater Predator/Petrel, select _Dive Log -> Upload "
@@ -6991,38 +7012,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3468
+#: ./user-manual.txt:3471
 #, no-wrap
 msgid "*Pair the _Subsurface_ computer with the dive computer.*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3477
+#: ./user-manual.txt:3480
 msgid ""
 "Bluetooth is most likely already enabled. For pairing with the dive computer "
 "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_.  This "
-"should bring up a dialog showing your dive computer (in Bluetooth mode) and "
-"allowing pairing. Right click on it and choose _Propertie s-> COM Ports_ to "
-"identify the port used for your dive computer. If there are several ports "
-"listed, use the one saying \"Outgoing\" instead of \"Incoming\"."
+"should bring up a dialog showing your dive computer (which should be in "
+"Bluetooth mode) and allowing pairing. Right click on it and choose "
+"_Properties-> COM Ports_ to identify the port used for your dive "
+"computer. If there are several ports listed, use the one saying \"Outgoing\" "
+"instead of \"Incoming\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3480
+#: ./user-manual.txt:3483
 msgid ""
 "For downloading to _Subsurface_, the _Subsurface_ drop-down list should "
 "contain this COM port already. If not, enter it manually."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3483
+#: ./user-manual.txt:3486
 msgid ""
 "Note: If there are issues afterwards when downloading from the dive computer "
 "using other software, remove the existing pairing with the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3490
+#: ./user-manual.txt:3493
 msgid ""
 "Click on the Bluetooth symbol in the menu bar and select _Set up Bluetooth "
 "Device..._. The dive computer should then show up in the list of "
@@ -7031,112 +7053,402 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3493
+#: ./user-manual.txt:3496
 msgid ""
 "Once the pairing is completed the correct device is shown in the 'Device or "
 "Mount Point' drop-down in the _Subsurface_ *Import* dialog."
 msgstr ""
 
-#. type: Block title
-#: ./user-manual.txt:3494
+#. type: Title ====
+#: ./user-manual.txt:3497
 #, no-wrap
 msgid "On Linux"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3502
+#: ./user-manual.txt:3505
 msgid ""
 "Ensure Bluetooth is enabled on the _Subsurface_ computer.  On most common "
 "distributions this should be true out of the box and pairing should be "
-"straight forward. For instance, Gnome3 shows a Bluetooth icon in the upper "
-"right corner of the desktop where one selects 'Set up New Device'. This "
-"should show a dialog where one can select the dive computer (which already "
-"should be in Bluetooth mode) and pair it.  If a PIN is required, try "
-"manually setting '0000'."
+"straight forward. For instance, Gnome3 shows a Bluetooth icon on the right "
+"of the toolbar at the top of the screen.  Users have reported difficulties "
+"with some Bluetooth controllers.  If you have an onboard controller, try "
+"that first.  It is simplest if you remove any USB Bluetooth dongles.  If you "
+"have a USB dongle that came with your dive computer, try that before any "
+"others."
 msgstr ""
 
 #. type: Plain text
 #: ./user-manual.txt:3509
 msgid ""
-"In the rare cases where the above is not true, then depending on your "
-"system, try +initd+ or +systemd+. This might be different and also involve "
-"loading modules specific to your hardware. In case your system is running "
-"+systemd+, manually run +systemctl start bluetooth.service+ to enable it, in "
-"case of +initd+, run something like +rc.config start bluetoothd+ or "
-"+/etc/init.d/bluetooth start+."
+"Setting up a connection to download dives from your Bluetooth-enabled "
+"device, such as the _Shearwater Petrel_, is not yet an automated process and "
+"will generally require the command prompt.  It is essentially a three step "
+"process."
 msgstr ""
 
 #. type: Plain text
 #: ./user-manual.txt:3511
-msgid "One may also use a manual approach by using such commands:"
+msgid "Enable the Bluetooth controller and pair your dive computer</li>"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3516
-msgid ""
-"+hciconfig+ shows the Bluetooth devices available on your computer (not dive "
-"computer), most likely one will see a hci0, if not try +hcitool -a+ to see "
-"inactive devices and run +sudo hciconfig hci0 up+ to bring them up."
+#: ./user-manual.txt:3512
+msgid "Establish an RFCOMM connection"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3520
+#: ./user-manual.txt:3513
+msgid "Download the dives with Subsurface"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3519
 msgid ""
-"+hcitool scanning+ gets a list of bluetooth enabled client devices, look for "
-"the dive computer and remember the MAC address are shown there"
+"Ensure the dive computer is in upload mode. On the _Shearwater Petrel_ and "
+"_Petrel 2_, cycle through the menu, select 'Dive Log', then 'Upload Log'.  "
+"The display will read 'Initializing', then 'Wait PC 3:00' and will "
+"countdown.  Once the connection is established, the display reads 'Wait CMD "
+"...' and the countdown continues. When downloading the dive from Subsurface, "
+"the display reads 'Sending' then 'Sent Dive'."
 msgstr ""
 
 #. type: Plain text
 #: ./user-manual.txt:3524
 msgid ""
-"+bluez-simple-agent hci0 10:00:E8:C4:BE:C4+ pairs the dive computer with the "
-"bluetooth stack of the _Subsurface_ computer, copy/paste the MAC address "
-"from the output of 'hcitool scanning'"
+"To establish the connection, establish root access through +sudo+ or +su+.  "
+"The correct permission is required to download the dives in the computer. On "
+"most Linux systems this means becoming a member of the dialout group (This "
+"is identical as for many dive computers using a Linux USB port, descibed in "
+"the previous section). On the command terminal, enter:"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3526
+msgid "+sudo usermod -a -G dialout username+"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3528
+msgid "Then log out and log in for the change to take effect."
+msgstr ""
+
+#. type: Title =====
+#: ./user-manual.txt:3529
+#, no-wrap
+msgid "Enabling the Bluetooth controller and pairing your dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3527
+#: ./user-manual.txt:3535
 msgid ""
-"Unfortunately on Linux binding to a communication device has to be done "
-"manually by running:"
+"Attempt to set up the Bluetooth controller and pair your dive computer using "
+"the graphical environment of the operating system. After setting the dive "
+"computer to upload mode, click the Bluetooth icon in the system tray and "
+"select 'Add new device'. The dive computer should appear. If asked for a "
+"password, enter 0000.  Write down or copy the MAC address of your dive "
+"computer - this needed later and should be in the form \t00:11:22:33:44:55."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3533
+#: ./user-manual.txt:3538
 msgid ""
-"+rfcomm bind /dev/rfcomm0 10:00:E8:C4:BE:C4+ binds the dive computer to a "
-"communication device in the desktop computer, in case rfcomm is already "
-"taken use rfcomm1 or up. IMPORTANT: Copy/paste the MAC address from the "
-"output of +hcitool scanning+, the MAC address shown above will not work."
+"If the graphical method didn't work, pair the device from the command "
+"line. Open a terminal and use +hciconfig+ to check the Bluetooth controller "
+"status"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3536
+#: ./user-manual.txt:3545
+#, no-wrap
 msgid ""
-"For downloading dives in _Subsurface_ specify the device name connected to "
-"the MAC address in the last step above, e.g. _/dev/rfcomm0_."
+"\t$ hciconfig\n"
+"\thci0:\tType: BR/EDR  Bus: USB\n"
+"\t\tBD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8\n"
+"\t\t*DOWN*\n"
+"\t\tRX bytes:504 acl:0 sco:0 events:22 errors:0\n"
+"\t\tTX bytes:92 acl:0 sco:0 commands:21 errors:0\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3550
+msgid ""
+"This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB, "
+"connected as hci0.  Its status is 'DOWN', i.e. not powered.  Additional "
+"controllers will appear as hci1, etc.  If there is not a Bluetooth dongle "
+"plugged in upon booting the computer, hci0 is probably the onboard.  Now "
+"power on the controller and enable authentication:"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3558
+#, no-wrap
+msgid ""
+"\tsudo hciconfig hci0 up auth+  (enter password when prompted)\n"
+"\thciconfig\n"
+"\thci0:  Type: BR/EDR  Bus: USB\n"
+"\t\tBD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8\n"
+"\t\t*UP RUNNING PSCAN AUTH*\n"
+"\t\tRX bytes:1026 acl:0 sco:0 events:47 errors:0\n"
+"\t\tTX bytes:449 acl:0 sco:0 commands:46 errors:0\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3560
+msgid "+Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3562
+msgid ""
+"If there are multiple controllers running, it's easiest to off the unused "
+"controller(s). For example, for +hci1+:"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3564
+#, no-wrap
+msgid "\tsudo hciconfig hci1 down\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3567
+msgid ""
+"Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez "
+"5, such as Fedora 22, one can use a tool called +blutootctl+, which will "
+"bring up its own command prompt."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3588
+#, no-wrap
+msgid ""
+"\tbluetoothctl\n"
+"\t[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]\n"
+"\t[bluetooth]# agent on\n"
+"\tAgent registered\n"
+"\t[bluetooth]# default-agent\n"
+"\tDefault agent request successful\n"
+"\t[bluetooth]# scan on                        <----now set your dive "
+"computer to upload mode\n"
+"\tDiscovery started\n"
+"\t[CHG] Controller 01:23:45:67:89:AB Discovering: yes\n"
+"\t[NEW] Device 00:11:22:33:44:55 Petrel\n"
+"\t[bluetooth]# trust 00:11:22:33:44:55        <----you can use the tab key "
+"to autocomplete the MAC address\n"
+"\t[CHG] Device 00:11:22:33:44:55 Trusted: yes\n"
+"\tChanging 00:11:22:33:44:55 trust succeeded\n"
+"\t[bluetooth]# pair 00:11:22:33:44:55\n"
+"\tAttempting to pair with 00:11:22:33:44:55\n"
+"\t[CHG] Device 00:11:22:33:44:55 Connected: yes\n"
+"\t[CHG] Device 00:11:22:33:44:55 UUIDs: "
+"00001101-0000-1000-8000-0089abc12345\n"
+"\t[CHG] Device 00:11:22:33:44:55 Paired: yes\n"
+"\tPairing successful\n"
+"\t[CHG] Device 00:11:22:33:44:55 Connected: no\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3591
+msgid ""
+"If asked for a password, enter 0000. It's ok if the last line says "
+"'Connected: no'. The important part is the line above, +Pairing successful+."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3594
+msgid ""
+"If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04), "
+"there is probably not a +bluetoothctl+, but a script called "
+"+bluez-simple-agent+ or just +simple-agent+."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3599
+#, no-wrap
+msgid ""
+"\thcitool -i hci0 scanning\n"
+"\tScanning ...\n"
+"\t\t00:11:22:33:44:55       Petrel\n"
+"\t\tbluez-simple-agent hci0 00:11:22:33:44:55\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3601
+msgid "Once ther dive computer is pired, set up the RFCOMM connection"
+msgstr ""
+
+#. type: Title =====
+#: ./user-manual.txt:3602
+#, no-wrap
+msgid "Establishing the RFCOMM connection"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3605
+msgid "The command to establish an RFCOMM connection is:"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3607
+msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3609
+msgid "<controller>+ is the Bluetooth controller, +hci0+."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3610
+msgid "<dev> is the RFCOMM device file, +rfcomm0+"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3611
+msgid "<bdaddr> is the dive computer's MAC address, +00:11:22:33:44:55+"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3612
+msgid "[channel] is the dive computer's Bluetooth channel we need to connect to."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3615
+msgid ""
+"If one omits it, channel 1 is assumed.  Based on a limited number of user "
+"reports, the appropriate channel for the dive computer is probably:"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3617
+msgid "_Shearwater Petrel 2_: channel 5"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3618
+msgid "_Shearwater Petrel 1_: channel 1"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3619
+msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3621
+msgid ""
+"E.g. to connect a _Shearwater Petrel 2_, set the dive computer to upload "
+"mode and enter:"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3623
+#, no-wrap
+msgid ""
+"\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, "
+"probably 0000, when prompted)\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3625
+msgid "This gives the response:"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3628
+#, no-wrap
+msgid ""
+"\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n"
+"\tPress CTRL-C for hangup\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3630
+msgid ""
+"To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive "
+"computer to upload mode and enter:"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3634
+#, no-wrap
+msgid ""
+"\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, "
+"probably 0000, when prompted)\n"
+"\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1\n"
+"\tPress CTRL-C for hangup\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3638
+msgid ""
+"If the specific channel the dive computer needs is not known, or the channel "
+"in the list above doesn't work, the command +sdptool records+ should help "
+"determine the appropriate channel. The output below is for a _Shearwater "
+"Petrel 2_."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3648
+#, no-wrap
+msgid ""
+"\tsdptool -i hci0 records 00:11:22:33:44:55\n"
+"\tService Name: Serial Port\n"
+"\tService RecHandle: 0x10000\n"
+"\tService Class ID List:\n"
+"\t\t\"Serial Port\" (0x1101)\n"
+"\t\tProtocol Descriptor List:\n"
+"\t\t\"L2CAP\" (0x0100)\n"
+"\t\t\"RFCOMM\" (0x0003)\n"
+"\t\tChannel: 5\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3651
+msgid ""
+"For a Bluetooth dive computer not in the list above, or if the channel "
+"listed is not correct, please let the Subsurface developers know on the user "
+"forum or the developer mailing list _subsurface@subsurface-divelog.org_."
+msgstr ""
+
+#. type: Title =====
+#: ./user-manual.txt:3652
+#, no-wrap
+msgid "Download the dives with Subsurface</em>"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3654
+msgid ""
+"After establishing the RFCOMM connection and while the dive computer's "
+"upload mode countdown is still running, go to_Subsurface_, select "
+"_Import->Import from dive computer_ and enter appropriate Vendor "
+"(e.g. _Shearwater_), Dive Computer (_Petrel_), Device or Mount Point "
+"(_/dev/rfcomm0_) and click _Download_."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3539
+#: ./user-manual.txt:3657
 #, no-wrap
 msgid "APPENDIX B: Dive Computer specific information for importing dive data."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3542
+#: ./user-manual.txt:3660
 #, no-wrap
 msgid "Importing from Uemis Zurich"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3544
+#: ./user-manual.txt:3662
 #, no-wrap
 msgid "images/icons/iumis.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3560
+#: ./user-manual.txt:3678
 msgid ""
 "_Subsurface_ downloads the information stored on the SDA (the built-in file "
 "system of the Uemis) including information about dive spots and "
@@ -7153,7 +7465,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3575
+#: ./user-manual.txt:3693
 msgid ""
 "After selecting the above device name, download the dives from the Uemis "
 "Zurich. One technical issue with the Uemis Zurich download implementation "
@@ -7170,19 +7482,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3577
+#: ./user-manual.txt:3695
 #, no-wrap
 msgid "Importing from Uwatec Galileo"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3579
+#: ./user-manual.txt:3697
 #, no-wrap
 msgid "images/icons/Galileo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3594
+#: ./user-manual.txt:3712
 msgid ""
 "The Uwatec Galileo dive computers use infra red (IrDA) communication between "
 "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle "
@@ -7198,41 +7510,44 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3597
+#: ./user-manual.txt:3715
 msgid ""
 "After executing this command, Subsurface will recognise the Galileo dive "
 "computer and download dive information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3601
+#: ./user-manual.txt:3721
 msgid ""
 "Under Windows, a similar situation exists. Drivers for the MCS7780 are "
 "available from some Internet web sites e.g.  "
-"http://www.drivers-download.com/Drv/MosChip/MCS7780/[www.drivers-download.com]."
+"http://www.drivers-download.com/Drv/MosChip/MCS7780/[www.drivers-download.com]. "
+"Windows-based IrDA drivers for the Uwatec can also be downloaded from the "
+"ScubaPro web site, drivers being located on the download page for the "
+"ScubaPro SmartTrak software."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3604
+#: ./user-manual.txt:3724
 msgid ""
 "For the Apple Mac, IrDA communication via the MCS7780 link is not available "
 "for OSX 10.6 or higher."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3606
+#: ./user-manual.txt:3726
 #, no-wrap
 msgid "Importing from Heinrichs Weikamp DR5"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3608
+#: ./user-manual.txt:3728
 #, no-wrap
 msgid "images/icons/HW_DR5.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3618
+#: ./user-manual.txt:3738
 msgid ""
 "When mounted as a USB drive the Heinrichs Weikamp DR5 saves a single UDDF "
 "file for every dive.  Mark all the dives you'd like to import or open.  "
@@ -7245,19 +7560,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3621
+#: ./user-manual.txt:3741
 #, no-wrap
 msgid "Importing from xDEEP BLACK"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3623
+#: ./user-manual.txt:3743
 #, no-wrap
 msgid "images/icons/HW_xdeepblack.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3632
+#: ./user-manual.txt:3752
 msgid ""
 "Each dive has to be individually saved as UDDF file using \"Export UDDF\" "
 "option in BLACK's logbook menu.  When mounted as a USB drive UDDF files are "
@@ -7271,19 +7586,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3634
+#: ./user-manual.txt:3754
 #, no-wrap
 msgid "Importing from Shearwater Predator using Bluetooth"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3636
+#: ./user-manual.txt:3756
 #, no-wrap
 msgid "images/icons/predator.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3644
+#: ./user-manual.txt:3764
 msgid ""
 "Using a Shearwater Predator one may be able to pair Bluetooth but then "
 "encounter issues when downloading, showing errors like _Slip RX: unexp. SLIP "
@@ -7294,36 +7609,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3647
+#: ./user-manual.txt:3767
 msgid ""
 "use the Bluetooth dongle which came with the Shearwater Predator instead of "
 "the built-in one of the _Subsurface_ computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3648
+#: ./user-manual.txt:3768
 msgid "switch to different Bluetooth drivers for the same hardware"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3649
+#: ./user-manual.txt:3769
 msgid "switch off WiFi while using Bluetooth"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3651
+#: ./user-manual.txt:3771
 #, no-wrap
 msgid "Importing from Poseidon MkVI Discovery"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3653
+#: ./user-manual.txt:3773
 #, no-wrap
 msgid "images/MkVI.jpeg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3661
+#: ./user-manual.txt:3781
 msgid ""
 "Download of dive logs from the MkVI is performed using a custom "
 "communications adapter and the _Poseidon PC Configuration Software_, "
@@ -7335,45 +7650,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3664
+#: ./user-manual.txt:3784
 msgid ""
 "Setup configuration for the dive and key dive parameters (file with a .txt "
 "extension)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3665
+#: ./user-manual.txt:3785
 msgid "Dive log details (file with a .csv extension)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3667
+#: ./user-manual.txt:3787
 msgid ""
 "Redbook format dive log (file with .cvsr extension). This is a compressed "
 "version of the dive log using a proprietary format."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3669
+#: ./user-manual.txt:3789
 msgid ""
 "_Subsurface_ accesses the .txt and the .csv files to obtain dive log "
 "information."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3671
+#: ./user-manual.txt:3791
 #, no-wrap
 msgid "Importing from APD Inspiration CCR"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3673
+#: ./user-manual.txt:3793
 #, no-wrap
 msgid "images/APDComputer.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3681
+#: ./user-manual.txt:3801
 msgid ""
 "The dive logs of an APD Inspiration or similar CCR dive computer are "
 "downloaded using a communications adapter and _AP Communicator_, obtained "
@@ -7385,82 +7700,82 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3683
+#: ./user-manual.txt:3803
 msgid "Open a dive within the _AP Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3684
+#: ./user-manual.txt:3804
 msgid "Select the tab at the top of the screen, entitled \"_Data_\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3685
+#: ./user-manual.txt:3805
 msgid ""
 "If the raw dive log data show on the screen, click on \"_Copy to "
 "Clipboard_\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3686
+#: ./user-manual.txt:3806
 msgid "Open a text editor, e.g. Notepad (Windows), TextWrangler (Mac)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3688
+#: ./user-manual.txt:3808
 msgid ""
 "Copy the contents of the clipboard into the text editor and save the text "
 "file with a filename extension of .CSV"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3689
+#: ./user-manual.txt:3809
 msgid ""
 "Within _Subsurface_, select _Import -> Import log files_ to open the "
 "xref:Unified_import[universal import dialogue]."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3690
+#: ./user-manual.txt:3810
 msgid ""
 "In the dropdown list towards the bottom right of the dialogue, select \"_CSV "
 "files_\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3692
+#: ./user-manual.txt:3812
 msgid ""
 "On the list of file names select the .CSV file that has been created "
 "above. An import dialogue opens."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3694
+#: ./user-manual.txt:3814
 msgid ""
 "In the dropdown list on the top left labeled '_Pre-configured imports_\", "
 "select _APD Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3695
+#: ./user-manual.txt:3815
 msgid ""
 "Ensure the other settings for the ADP dive log are appropriate, then select "
 "_OK_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3697
+#: ./user-manual.txt:3817
 msgid "The APD dive log will appear within _Subsurface_."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3699
+#: ./user-manual.txt:3819
 #, no-wrap
 msgid "APPENDIX C: Exporting Dive log information from external dive log software."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3708
+#: ./user-manual.txt:3828
 msgid ""
 "The import of dive log data from external dive log software is mostly "
 "performed using the dialogue found by selecting _Import_ from the Main Menu, "
@@ -7470,22 +7785,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3710
+#: ./user-manual.txt:3830
 msgid "Export the foreign dive log data to format that is accessible from"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3711
+#: ./user-manual.txt:3831
 msgid "_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3712
+#: ./user-manual.txt:3832
 msgid "Import the accessible dive log data into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3716
+#: ./user-manual.txt:3836
 msgid ""
 "This appendix provides some information about approaches to export dive log "
 "data from foreign dive log software. The procedures below mostly apply to "
@@ -7493,19 +7808,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3718
+#: ./user-manual.txt:3838
 #, no-wrap
 msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3719
+#: ./user-manual.txt:3839
 #, no-wrap
 msgid "images/icons/suuntologo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3726
+#: ./user-manual.txt:3846
 msgid ""
 "DiveManager is a MS Windows application for Suunto dive computers.  "
 "Divemanager 3 (DM3) is an older version of the Suunto software. More recent "
@@ -7515,64 +7830,64 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3728
+#: ./user-manual.txt:3848
 #, no-wrap
 msgid "*Divemanager 3 (DM3):*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3730
+#: ./user-manual.txt:3850
 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3731
+#: ./user-manual.txt:3851
 msgid "Do not start the import wizard to import dives from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3733
+#: ./user-manual.txt:3853
 msgid ""
 "In the navigation tree on the left side of the program-window, select the "
 "appropriate dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3734
+#: ./user-manual.txt:3854
 msgid "Within the list of dives, select the dives you would like to import later:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3735
+#: ./user-manual.txt:3855
 msgid "To select certain dives: hold 'ctrl' and click the dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3737
+#: ./user-manual.txt:3857
 msgid ""
 "To select all dives: Select the first dive, hold down shift and select the "
 "last dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3738
+#: ./user-manual.txt:3858
 msgid "With the dives marked, use the program menu _File -> Export_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3739
+#: ./user-manual.txt:3859
 msgid ""
 "The export pop-up will show. Within this pop-up, there is one field called "
 "'Export Path'."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3740
+#: ./user-manual.txt:3860
 msgid "Click the browse button next to the field Export Path"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3742
+#: ./user-manual.txt:3862
 #, no-wrap
 msgid ""
 "** A file-manager like window pops up\n"
@@ -7580,13 +7895,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3743
+#: ./user-manual.txt:3863
 #, no-wrap
 msgid "Divelog.SDE file\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3745
+#: ./user-manual.txt:3865
 #, no-wrap
 msgid ""
 "** Optionally change the name of the file for saving\n"
@@ -7594,25 +7909,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3746
+#: ./user-manual.txt:3866
 #, no-wrap
 msgid "Back in the Export pop-up, press the button 'Export'\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3747
+#: ./user-manual.txt:3867
 #, no-wrap
 msgid "The dives are now exported to the file Divelog.SDE.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3749
+#: ./user-manual.txt:3869
 #, no-wrap
 msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3754
+#: ./user-manual.txt:3874
 msgid ""
 "DM4 and DM5 use identical mechanisms for exporting dive logs.  To export a "
 "divelog from Divemanager one needs to locate the DM4/DM5 database where the "
@@ -7621,81 +7936,81 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3756
+#: ./user-manual.txt:3876
 msgid "Locating the Suunto DM4 (or DM5) database:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3758 ./user-manual.txt:3767
+#: ./user-manual.txt:3878 ./user-manual.txt:3887
 msgid "Start Suunto DM4/DM5"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3759
+#: ./user-manual.txt:3879
 msgid "Select 'Help -> About'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3760
+#: ./user-manual.txt:3880
 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3761
+#: ./user-manual.txt:3881
 msgid "Now open Windows Explorer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3762
+#: ./user-manual.txt:3882
 msgid "Paste the address to the path box at the top of the File Explorer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3763
+#: ./user-manual.txt:3883
 msgid "The database is called DM4.db or DM5.db"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3765
+#: ./user-manual.txt:3885
 msgid "Making a backup copy of the Suunto DM4/DM5 database:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3768
+#: ./user-manual.txt:3888
 msgid "Select 'File - Create backup'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3770
+#: ./user-manual.txt:3890
 msgid ""
 "From the file menu select the location and name for the backup, we'll use "
 "DM4 (or DM5) in here with the default extension .bak"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3771
+#: ./user-manual.txt:3891
 msgid "Click 'Save'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3772
+#: ./user-manual.txt:3892
 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3774
+#: ./user-manual.txt:3894
 #, no-wrap
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3777
+#: ./user-manual.txt:3897
 #, no-wrap
 msgid "images/icons/atomiclogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3784
+#: ./user-manual.txt:3904
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
@@ -7705,19 +8020,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3786
+#: ./user-manual.txt:3906
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3789
+#: ./user-manual.txt:3909
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3797
+#: ./user-manual.txt:3917
 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 "
@@ -7728,7 +8043,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3802
+#: ./user-manual.txt:3922
 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 "
@@ -7736,36 +8051,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3805
+#: ./user-manual.txt:3925
 msgid ""
 "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a "
 "file _DiveOrganiser.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3806
+#: ./user-manual.txt:3926
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3807
+#: ./user-manual.txt:3927
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3809
+#: ./user-manual.txt:3929
 #, no-wrap
 msgid "Exporting from *DivingLog 5.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3811
+#: ./user-manual.txt:3931
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3820
+#: ./user-manual.txt:3940
 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 "
@@ -7776,28 +8091,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3822
+#: ./user-manual.txt:3942
 msgid "In DivingLog open the 'File -> Export -> XML' menu"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3823
+#: ./user-manual.txt:3943
 msgid "Select the dives to export"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3824
+#: ./user-manual.txt:3944
 msgid "Click on the export button and select the filename"
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3826
+#: ./user-manual.txt:3946
 #, no-wrap
 msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3835
+#: ./user-manual.txt:3955
 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 "
@@ -7810,7 +8125,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3841
+#: ./user-manual.txt:3961
 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 "
@@ -7821,40 +8136,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3843
+#: ./user-manual.txt:3963
 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3844
+#: ./user-manual.txt:3964
 msgid "Duration: the format should be minutes:seconds."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3845
+#: ./user-manual.txt:3965
 msgid ""
 "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:3846
+#: ./user-manual.txt:3966
 msgid "Tags and buddies: values should be separated using a comma."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3847
+#: ./user-manual.txt:3967
 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3848
+#: ./user-manual.txt:3968
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3852
+#: ./user-manual.txt:3972
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -7865,13 +8180,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3853
+#: ./user-manual.txt:3973
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3856
+#: ./user-manual.txt:3976
 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 "
@@ -7879,13 +8194,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3857
+#: ./user-manual.txt:3977
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3860
+#: ./user-manual.txt:3980
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -7893,13 +8208,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3861
+#: ./user-manual.txt:3981
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3864
+#: ./user-manual.txt:3984
 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 "
@@ -7907,13 +8222,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3865
+#: ./user-manual.txt:3985
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3871
+#: ./user-manual.txt:3991
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
@@ -7924,19 +8239,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3873
+#: ./user-manual.txt:3993
 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:3874
+#: ./user-manual.txt:3994
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3877
+#: ./user-manual.txt:3997
 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 "
@@ -7944,48 +8259,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3878
+#: ./user-manual.txt:3998
 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:3879
+#: ./user-manual.txt:3999
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3881
+#: ./user-manual.txt:4001
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3882
+#: ./user-manual.txt:4002
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3885
+#: ./user-manual.txt:4005
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3887
+#: ./user-manual.txt:4007
 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:3888
+#: ./user-manual.txt:4008
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3891
+#: ./user-manual.txt:4011
 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 "
@@ -7995,13 +8310,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3892
+#: ./user-manual.txt:4012
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3895
+#: ./user-manual.txt:4015
 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 "
@@ -8010,19 +8325,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3896
+#: ./user-manual.txt:4016
 #, no-wrap
 msgid "APPENDIX E: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3898
+#: ./user-manual.txt:4018
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3902
+#: ./user-manual.txt:4022
 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_ "
@@ -8030,7 +8345,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3908
+#: ./user-manual.txt:4028
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
@@ -8040,7 +8355,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3914
+#: ./user-manual.txt:4034
 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 "
@@ -8050,12 +8365,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3916
+#: ./user-manual.txt:4036
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3922
+#: ./user-manual.txt:4042
 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 "
@@ -8066,12 +8381,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3924
+#: ./user-manual.txt:4044
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3929
+#: ./user-manual.txt:4049
 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 "
@@ -8081,7 +8396,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3935
+#: ./user-manual.txt:4055
 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 "
@@ -8092,7 +8407,7 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3936
+#: ./user-manual.txt:4056
 #, no-wrap
 msgid ""
 "Some dive profiles have time discrepancies with the recorded samples from my "
@@ -8100,7 +8415,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3940
+#: ./user-manual.txt:4060
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -8108,7 +8423,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3948
+#: ./user-manual.txt:4068
 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 "
diff --git a/Documentation/fr/po/subsurface-manual.fr.po b/Documentation/fr/po/subsurface-manual.fr.po
index 101d19b66..97e3211ed 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-05-18 11:34+0200\n"
-"PO-Revision-Date: 2015-05-18 11:38+0200\n"
+"POT-Creation-Date: 2015-05-28 16:09+0200\n"
+"PO-Revision-Date: 2015-05-28 16:14+0200\n"
 "Last-Translator: Guillaume GARDET <guillaume.gardet@opensuse.org>\n"
 "Language-Team: French <opensuse-fr@opensuse.org>\n"
 "Language: fr\n"
@@ -6474,12 +6474,26 @@ msgstr ""
 
 #. type: Plain text
 #: user-manual.txt:3298
+msgid ""
+"<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives "
+"have been moved to"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3299
+msgid ""
+"a different disk or directory, locate them and link them to the appropriate "
+"dives."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3300
 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences."
 msgstr ""
 "<<S_Preferences,_Préférences_>> - Définir les  préférences de _Subsurface_."
 
 #. type: Plain text
-#: user-manual.txt:3299
+#: user-manual.txt:3301
 msgid ""
 "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive "
 "computer."
@@ -6488,18 +6502,18 @@ msgstr ""
 "configuration d'un ordinateur de plongée."
 
 #. type: Plain text
-#: user-manual.txt:3300
+#: user-manual.txt:3302
 msgid "_Quit_ - Quit _Subsurface_."
 msgstr "_Quitter_ - Quitter _Subsurface_."
 
 #. type: Title ===
-#: user-manual.txt:3301
+#: user-manual.txt:3303
 #, no-wrap
 msgid "Import"
 msgstr "Importer"
 
 #. type: Plain text
-#: user-manual.txt:3304
+#: user-manual.txt:3306
 msgid ""
 "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive "
 "information from a dive computer."
@@ -6508,7 +6522,7 @@ msgstr ""
 "Importer des informations de plongées à partir de l'ordinateur de plongée."
 
 #. type: Plain text
-#: user-manual.txt:3306
+#: user-manual.txt:3308
 msgid ""
 "<<Unified_import,_Import Log Files_>> - Import dive information from a file "
 "in in a _Subsurface_-compatible format."
@@ -6518,7 +6532,7 @@ msgstr ""
 "_Subsurface_."
 
 #. type: Plain text
-#: user-manual.txt:3308
+#: user-manual.txt:3310
 msgid ""
 "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS "
 "coordinates from the _Subsurface_ mobile phone app."
@@ -6528,7 +6542,7 @@ msgstr ""
 "(téléphones et tablettes)."
 
 #. type: Plain text
-#: user-manual.txt:3310
+#: user-manual.txt:3312
 msgid ""
 "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive "
 "information from _www.Divelogs.de_."
@@ -6537,13 +6551,13 @@ msgstr ""
 "informations de plongées à partir de _www.Divelogs.de_."
 
 #. type: Title ===
-#: user-manual.txt:3311
+#: user-manual.txt:3313
 #, no-wrap
 msgid "Log"
 msgstr "Journal (log)"
 
 #. type: Plain text
-#: user-manual.txt:3313
+#: user-manual.txt:3315
 msgid ""
 "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* "
 "panel."
@@ -6552,7 +6566,14 @@ msgstr ""
 "plongée au panneau de la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3314
+#: user-manual.txt:3316
+msgid ""
+"_Edit dive_ - Edit a dive of which the profile was entered by hande and not "
+"from a dive computer."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3317
 msgid ""
 "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives."
 msgstr ""
@@ -6560,16 +6581,16 @@ msgstr ""
 "planifier des plongées."
 
 #. type: Plain text
-#: user-manual.txt:3315
+#: user-manual.txt:3318
 msgid ""
-"<<S_Replan,_Re-plan dive_>> - Edit a dive plan that has been saved into the "
-"*Dive List*."
+"<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved "
+"into the *Dive List*."
 msgstr ""
-"<<S_Replan,_Replanifier une plongée_>> - Modifier une plongée planifiée qui "
-"a été enregistrée dans la *liste des plongées*."
+"<<S_Replan,_Modifier la plongée dans le planificateur_>> - Modifier une "
+"plongée planifiée qui a été enregistrée dans la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3317
+#: user-manual.txt:3320
 msgid ""
 "<<S_CopyComponents,_Copy dive components_>> - By selecting this option, one "
 "can copy information from several fields of a dive log onto the clipboard."
@@ -6579,7 +6600,7 @@ msgstr ""
 "champs d'un journal de plongée vers le presse-papier."
 
 #. type: Plain text
-#: user-manual.txt:3319
+#: user-manual.txt:3322
 msgid ""
 "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, "
 "the information copied using the _Copy dive components_ option."
@@ -6589,7 +6610,7 @@ msgstr ""
 "préalable avec l'option _Copier les composants de la plongée_."
 
 #. type: Plain text
-#: user-manual.txt:3321
+#: user-manual.txt:3324
 msgid ""
 "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* "
 "panel."
@@ -6598,7 +6619,7 @@ msgstr ""
 "le panneau de la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3323
+#: user-manual.txt:3326
 msgid ""
 "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into "
 "dive trips."
@@ -6607,7 +6628,7 @@ msgstr ""
 "*liste des plongées* dans des voyages de plongées."
 
 #. type: Plain text
-#: user-manual.txt:3324
+#: user-manual.txt:3327
 msgid ""
 "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to "
 "facilitate your logs."
@@ -6616,7 +6637,7 @@ msgstr ""
 "les noms des ordinateurs de plongée pour faciliter vos journaux (logs)."
 
 #. type: Plain text
-#: user-manual.txt:3325
+#: user-manual.txt:3328
 msgid ""
 "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific "
 "tags or dive criteria."
@@ -6625,13 +6646,13 @@ msgstr ""
 "certaines plongées, à partir de tags ou de critères de plongées."
 
 #. type: Title ===
-#: user-manual.txt:3326
+#: user-manual.txt:3329
 #, no-wrap
 msgid "View"
 msgstr "Vue"
 
 #. type: Plain text
-#: user-manual.txt:3329
+#: user-manual.txt:3332
 msgid ""
 "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels "
 "simmultaneously."
@@ -6640,33 +6661,33 @@ msgstr ""
 "_Subsurface_ simultanément."
 
 #. type: Plain text
-#: user-manual.txt:3330
+#: user-manual.txt:3333
 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel."
 msgstr ""
 "<<S_ViewPanels,_Liste des plongées_>> - Affiche uniquement le panneau de la "
 "*liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3331
+#: user-manual.txt:3334
 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel."
 msgstr ""
 "<<S_ViewPanels,_Profil_>> - Affiche uniquement le panneau du *profil de la "
 "plongée*."
 
 #. type: Plain text
-#: user-manual.txt:3332
+#: user-manual.txt:3335
 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:3333
+#: user-manual.txt:3336
 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel."
 msgstr ""
 "<<S_ViewPanels,_Globe_>> - Affiche uniquement le panneau de la *carte "
 "mondiale*."
 
 #. type: Plain text
-#: user-manual.txt:3335
+#: user-manual.txt:3338
 msgid ""
 "_Yearly Statistics_ - Display summary statistics about dives during this and "
 "past years."
@@ -6675,28 +6696,28 @@ msgstr ""
 "plongées effectuées."
 
 #. type: Plain text
-#: user-manual.txt:3336
+#: user-manual.txt:3339
 msgid "_Prev DC_ - Switch to previous dive computer."
 msgstr "_Ordinateur précédent_  - Passer à l'ordinateur de plongée précédent."
 
 #. type: Plain text
-#: user-manual.txt:3337
+#: user-manual.txt:3340
 msgid "_Next DC_ - Switch to next dive computer."
 msgstr "_Ordinateur suivant_  - Passer à l'ordinateur de plongée suivant."
 
 #. type: Plain text
-#: user-manual.txt:3338
+#: user-manual.txt:3341
 msgid "_Full Screen_ - Toggles Full Screen mode."
 msgstr "_Plein écran_  - Passer en mode plein écran."
 
 #. type: Title ===
-#: user-manual.txt:3339
+#: user-manual.txt:3342
 #, no-wrap
 msgid "Help"
 msgstr "Aide"
 
 #. type: Plain text
-#: user-manual.txt:3342
+#: user-manual.txt:3345
 msgid ""
 "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as "
 "well as licensing information."
@@ -6705,7 +6726,7 @@ msgstr ""
 "_Subsurface_ ainsi que les informations de licence."
 
 #. type: Plain text
-#: user-manual.txt:3344
+#: user-manual.txt:3347
 msgid ""
 "_Check for updates_ - Find out whether a newer version of Subsurface is "
 "available on the http://subsurface-divelog.org/[_Subsurface_ web site]."
@@ -6715,7 +6736,7 @@ msgstr ""
 "_Subsurface_ ]."
 
 #. type: Plain text
-#: user-manual.txt:3345
+#: user-manual.txt:3348
 msgid ""
 "<<S_UserSurvey,_User survey_>> - Help to make _Subsurface_ even better by "
 "taking part in our user survey."
@@ -6724,31 +6745,31 @@ msgstr ""
 "meilleur en répondant à notre sondage utilisateur."
 
 #. type: Plain text
-#: user-manual.txt:3346
+#: user-manual.txt:3349
 msgid "_User manual_ - Open a window showing this user manual."
 msgstr ""
 "_Manuel utilisateur_  - Ouvre une fenêtre affichant ce manuel utilisateur."
 
 #. type: Title ==
-#: user-manual.txt:3349
+#: user-manual.txt:3352
 #, no-wrap
 msgid "APPENDIX A: Operating system specific information for importing dive information from a dive computer."
 msgstr "ANNEXE A : informations spécifiques au système d'exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée."
 
 #. type: Title ===
-#: user-manual.txt:3351
+#: user-manual.txt:3354
 #, no-wrap
 msgid "Make sure that the OS has the required drivers installed"
 msgstr "Assurez-vous que les pilotes (drivers) nécessaires sont installés"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3352
+#: user-manual.txt:3355
 #, no-wrap
 msgid "images/icons/drivers.jpg"
 msgstr "images/icons/drivers.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3357
+#: user-manual.txt:3360
 msgid ""
 "The operating system of the desktop computer needs the appropriate drivers "
 "in order to communicate with the dive computer in whichever way the dive "
@@ -6759,7 +6780,7 @@ msgstr ""
 "l'ordinateur de plongée (Bluetooth, USB, infra-rouge)."
 
 #. type: Plain text
-#: user-manual.txt:3363
+#: user-manual.txt:3366
 msgid ""
 "On Linux users need to have the correct kernel module loaded. Most "
 "distributions will do this automatically, so the user does not need to load "
@@ -6773,7 +6794,7 @@ msgstr ""
 "particulièrement pour certaines technologies telles que l'infra-rouge."
 
 #. type: Plain text
-#: user-manual.txt:3367
+#: user-manual.txt:3370
 msgid ""
 "On Windows, the OS should offer to download the correct driver once the user "
 "connects the dive computer to the USB port and operating system sees the "
@@ -6784,7 +6805,7 @@ msgstr ""
 "port USB de son ordinateur de bureau."
 
 #. type: Plain text
-#: user-manual.txt:3374
+#: user-manual.txt:3377
 msgid ""
 "On a Mac users sometimes have to manually hunt for the correct driver. For "
 "example the correct driver for the Mares Puck devices or any other dive "
@@ -6802,19 +6823,19 @@ msgstr ""
 "documents et logiciels Silicon Labs]."
 
 #. type: Title ===
-#: user-manual.txt:3376
+#: user-manual.txt:3379
 #, no-wrap
 msgid "How to Find the Device Name for USB devices and set its write permission"
 msgstr "Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3377
+#: user-manual.txt:3380
 #, no-wrap
 msgid "images/icons/usb.jpg"
 msgstr "images/icons/usb.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3385
+#: user-manual.txt:3388
 msgid ""
 "When a user connects the dive computer by using a USB connector, usually "
 "_Subsurface_ will either propose a drop down list that contains the correct "
@@ -6830,14 +6851,14 @@ msgstr ""
 "où cela ne fonctionnerait pas, voici quelques suggestions pour trouver le "
 "nom de votre périphérique ;"
 
-#. type: Block title
-#: user-manual.txt:3386 user-manual.txt:3469
+#. type: Title ====
+#: user-manual.txt:3389 user-manual.txt:3472
 #, no-wrap
 msgid "On Windows:"
 msgstr "Sur Windows :"
 
 #. type: Plain text
-#: user-manual.txt:3390
+#: user-manual.txt:3393
 msgid ""
 "Simply try COM1, COM2, etc. The drop down list should contain all connected "
 "COM devices."
@@ -6845,57 +6866,57 @@ msgstr ""
 "Essayez simplement COM1, COM2, etc. La liste déroulante devrait contenir "
 "tous les périphériques COM connectés."
 
-#. type: Block title
-#: user-manual.txt:3391 user-manual.txt:3484
+#. type: Title ====
+#: user-manual.txt:3394 user-manual.txt:3487
 #, no-wrap
 msgid "On MacOS:"
 msgstr "Sur MacOS :"
 
 #. type: Plain text
-#: user-manual.txt:3394
+#: user-manual.txt:3397
 msgid "The drop down box should find all connected dive computers."
 msgstr ""
 "La liste déroulante devrait contenir tous les ordinateurs de plongée "
 "connectés."
 
 #. type: Block title
-#: user-manual.txt:3395
+#: user-manual.txt:3398
 #, no-wrap
 msgid "On Linux:"
 msgstr "Sur Linux :"
 
 #. type: Plain text
-#: user-manual.txt:3398
+#: user-manual.txt:3401
 msgid "There is a definitive way to find the port:"
 msgstr "Il existe un moyen sûr de trouver le port :"
 
 #. type: Plain text
-#: user-manual.txt:3400
+#: user-manual.txt:3403
 msgid "Disconnect the USB cable from the dive computer"
 msgstr "Déconnecter le cable USB de l'ordinateur de plongée"
 
 #. type: Plain text
-#: user-manual.txt:3401
+#: user-manual.txt:3404
 msgid "Open a terminal"
 msgstr "Ouvrir un terminal"
 
 #. type: Plain text
-#: user-manual.txt:3402 user-manual.txt:3404
+#: user-manual.txt:3405 user-manual.txt:3407
 msgid "Type the command: 'dmesg' and press enter"
 msgstr "Taper la commande 'dmesg' et appuyer sur la touche Entrer"
 
 #. type: Plain text
-#: user-manual.txt:3403
+#: user-manual.txt:3406
 msgid "Plug in the USB cable of the dive computer"
 msgstr "Connecter le cable USB de l'ordinateur de plongée"
 
 #. type: Plain text
-#: user-manual.txt:3406
+#: user-manual.txt:3409
 msgid "A message similar to this one should appear:"
 msgstr "Un message similaire à celui-ci devrait apparaitre :"
 
 #. type: Plain text
-#: user-manual.txt:3422
+#: user-manual.txt:3425
 #, no-wrap
 msgid ""
 "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n"
@@ -6931,7 +6952,7 @@ msgstr ""
 "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n"
 
 #. type: Plain text
-#: user-manual.txt:3427
+#: user-manual.txt:3430
 msgid ""
 "The third line from the bottom shows that the FTDI USB adapter is detected "
 "and connected to +ttyUSB3+. This information can now be used in the import "
@@ -6943,14 +6964,14 @@ msgstr ""
 "que Subsurface utilise le bon port USB."
 
 #. type: Plain text
-#: user-manual.txt:3429
+#: user-manual.txt:3432
 msgid "Ensuring that the user has write permission to the USB serial port:"
 msgstr ""
 "S'assurer que l'utilisateur possède les droits d'écriture sur le port série "
 "USB :"
 
 #. type: Plain text
-#: user-manual.txt:3435
+#: user-manual.txt:3438
 msgid ""
 "On Unix-like operating systems the USB ports can only be accessed by users "
 "who are members of the +dialout+ group. If one is not root, one may not be a "
@@ -6963,7 +6984,7 @@ msgstr ""
 "utiliser le port USB. Si votre nom d'utilisateur est 'johnB' :"
 
 #. type: Plain text
-#: user-manual.txt:3439
+#: user-manual.txt:3442
 msgid ""
 "As root, type: +usermod -a -G dialout johnB+ (Ubuntu users: +sudo usermod -a "
 "-G dialout johnB+)  This makes johnB a member of the +dialout+ group."
@@ -6973,7 +6994,7 @@ msgstr ""
 "+dialout+."
 
 #. type: Plain text
-#: user-manual.txt:3444
+#: user-manual.txt:3447
 #, no-wrap
 msgid ""
 "Type: +id johnB+     This lists all the groups that johnB belongs to and\n"
@@ -6989,7 +7010,7 @@ msgstr ""
 "parmi les différents IDs.\n"
 
 #. type: Plain text
-#: user-manual.txt:3446
+#: user-manual.txt:3449
 #, no-wrap
 msgid ""
 "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n"
@@ -6997,7 +7018,7 @@ msgid ""
 msgstr "Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexionpuis reconnexion sur l'ordinateur (sous Ubuntu, par exemple)."
 
 #. type: Plain text
-#: user-manual.txt:3451
+#: user-manual.txt:3454
 msgid ""
 "With the appropriate device name (e.g. +dev/ttyUSB3+) and with write "
 "permission to the USB port, the dive computer interface can connect and one "
@@ -7008,19 +7029,19 @@ msgstr ""
 "vous devriez pouvoir importer vos plongées."
 
 #. type: Title ===
-#: user-manual.txt:3453
+#: user-manual.txt:3456
 #, no-wrap
 msgid "Setting up bluetooth enabled devices"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3454
+#: user-manual.txt:3457
 #, no-wrap
 msgid "images/icons/bluetooth.jpg"
 msgstr "images/icons/bluetooth.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3460
+#: user-manual.txt:3463
 msgid ""
 "For dive computers communicating through bluetooth like the Heinrichs "
 "Weikamp Frog or the Shearwater Predator and Petrel there is a different "
@@ -7029,13 +7050,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3462
+#: user-manual.txt:3465
 #, no-wrap
 msgid "*For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3466
+#: user-manual.txt:3469
 msgid ""
 "For Bluetooth pairing of the dive computer, refer to the manufacturer's user "
 "guide. When using a Shearwater Predator/Petrel, select _Dive Log -> Upload "
@@ -7043,38 +7064,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3468
+#: user-manual.txt:3471
 #, no-wrap
 msgid "*Pair the _Subsurface_ computer with the dive computer.*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3477
+#: user-manual.txt:3480
 msgid ""
 "Bluetooth is most likely already enabled. For pairing with the dive computer "
 "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_.  This "
-"should bring up a dialog showing your dive computer (in Bluetooth mode) and "
-"allowing pairing. Right click on it and choose _Propertie s-> COM Ports_ to "
-"identify the port used for your dive computer. If there are several ports "
-"listed, use the one saying \"Outgoing\" instead of \"Incoming\"."
+"should bring up a dialog showing your dive computer (which should be in "
+"Bluetooth mode) and allowing pairing. Right click on it and choose "
+"_Properties-> COM Ports_ to identify the port used for your dive computer. "
+"If there are several ports listed, use the one saying \"Outgoing\" instead "
+"of \"Incoming\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3480
+#: user-manual.txt:3483
 msgid ""
 "For downloading to _Subsurface_, the _Subsurface_ drop-down list should "
 "contain this COM port already. If not, enter it manually."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3483
+#: user-manual.txt:3486
 msgid ""
 "Note: If there are issues afterwards when downloading from the dive computer "
 "using other software, remove the existing pairing with the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3490
+#: user-manual.txt:3493
 msgid ""
 "Click on the Bluetooth symbol in the menu bar and select _Set up Bluetooth "
 "Device..._. The dive computer should then show up in the list of devices. "
@@ -7083,112 +7105,396 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3493
+#: user-manual.txt:3496
 msgid ""
 "Once the pairing is completed the correct device is shown in the 'Device or "
 "Mount Point' drop-down in the _Subsurface_ *Import* dialog."
 msgstr ""
 
-#. type: Block title
-#: user-manual.txt:3494
+#. type: Title ====
+#: user-manual.txt:3497
 #, no-wrap
 msgid "On Linux"
 msgstr "Sur Linux"
 
 #. type: Plain text
-#: user-manual.txt:3502
+#: user-manual.txt:3505
 msgid ""
 "Ensure Bluetooth is enabled on the _Subsurface_ computer.  On most common "
 "distributions this should be true out of the box and pairing should be "
-"straight forward. For instance, Gnome3 shows a Bluetooth icon in the upper "
-"right corner of the desktop where one selects 'Set up New Device'. This "
-"should show a dialog where one can select the dive computer (which already "
-"should be in Bluetooth mode) and pair it.  If a PIN is required, try "
-"manually setting '0000'."
+"straight forward. For instance, Gnome3 shows a Bluetooth icon on the right "
+"of the toolbar at the top of the screen.  Users have reported difficulties "
+"with some Bluetooth controllers.  If you have an onboard controller, try "
+"that first.  It is simplest if you remove any USB Bluetooth dongles.  If you "
+"have a USB dongle that came with your dive computer, try that before any "
+"others."
 msgstr ""
 
 #. type: Plain text
 #: user-manual.txt:3509
 msgid ""
-"In the rare cases where the above is not true, then depending on your "
-"system, try +initd+ or +systemd+. This might be different and also involve "
-"loading modules specific to your hardware. In case your system is running "
-"+systemd+, manually run +systemctl start bluetooth.service+ to enable it, in "
-"case of +initd+, run something like +rc.config start bluetoothd+ or +/etc/"
-"init.d/bluetooth start+."
+"Setting up a connection to download dives from your Bluetooth-enabled "
+"device, such as the _Shearwater Petrel_, is not yet an automated process and "
+"will generally require the command prompt.  It is essentially a three step "
+"process."
 msgstr ""
 
 #. type: Plain text
 #: user-manual.txt:3511
-msgid "One may also use a manual approach by using such commands:"
+msgid "Enable the Bluetooth controller and pair your dive computer</li>"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3516
-msgid ""
-"+hciconfig+ shows the Bluetooth devices available on your computer (not dive "
-"computer), most likely one will see a hci0, if not try +hcitool -a+ to see "
-"inactive devices and run +sudo hciconfig hci0 up+ to bring them up."
+#: user-manual.txt:3512
+msgid "Establish an RFCOMM connection"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3513
+msgid "Download the dives with Subsurface"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3520
+#: user-manual.txt:3519
 msgid ""
-"+hcitool scanning+ gets a list of bluetooth enabled client devices, look for "
-"the dive computer and remember the MAC address are shown there"
+"Ensure the dive computer is in upload mode. On the _Shearwater Petrel_ and "
+"_Petrel 2_, cycle through the menu, select 'Dive Log', then 'Upload Log'.  "
+"The display will read 'Initializing', then 'Wait PC 3:00' and will "
+"countdown.  Once the connection is established, the display reads 'Wait "
+"CMD ...' and the countdown continues. When downloading the dive from "
+"Subsurface, the display reads 'Sending' then 'Sent Dive'."
 msgstr ""
 
 #. type: Plain text
 #: user-manual.txt:3524
 msgid ""
-"+bluez-simple-agent hci0 10:00:E8:C4:BE:C4+ pairs the dive computer with the "
-"bluetooth stack of the _Subsurface_ computer, copy/paste the MAC address "
-"from the output of 'hcitool scanning'"
+"To establish the connection, establish root access through +sudo+ or +su+.  "
+"The correct permission is required to download the dives in the computer. On "
+"most Linux systems this means becoming a member of the dialout group (This "
+"is identical as for many dive computers using a Linux USB port, descibed in "
+"the previous section). On the command terminal, enter:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3526
+msgid "+sudo usermod -a -G dialout username+"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3528
+msgid "Then log out and log in for the change to take effect."
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:3529
+#, no-wrap
+msgid "Enabling the Bluetooth controller and pairing your dive computer"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3535
+msgid ""
+"Attempt to set up the Bluetooth controller and pair your dive computer using "
+"the graphical environment of the operating system. After setting the dive "
+"computer to upload mode, click the Bluetooth icon in the system tray and "
+"select 'Add new device'. The dive computer should appear. If asked for a "
+"password, enter 0000.  Write down or copy the MAC address of your dive "
+"computer - this needed later and should be in the form \t00:11:22:33:44:55."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3538
+msgid ""
+"If the graphical method didn't work, pair the device from the command line. "
+"Open a terminal and use +hciconfig+ to check the Bluetooth controller status"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3545
+#, no-wrap
+msgid ""
+"\t$ hciconfig\n"
+"\thci0:\tType: BR/EDR  Bus: USB\n"
+"\t\tBD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8\n"
+"\t\t*DOWN*\n"
+"\t\tRX bytes:504 acl:0 sco:0 events:22 errors:0\n"
+"\t\tTX bytes:92 acl:0 sco:0 commands:21 errors:0\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3550
+msgid ""
+"This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB, "
+"connected as hci0.  Its status is 'DOWN', i.e. not powered.  Additional "
+"controllers will appear as hci1, etc.  If there is not a Bluetooth dongle "
+"plugged in upon booting the computer, hci0 is probably the onboard.  Now "
+"power on the controller and enable authentication:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3558
+#, no-wrap
+msgid ""
+"\tsudo hciconfig hci0 up auth+  (enter password when prompted)\n"
+"\thciconfig\n"
+"\thci0:  Type: BR/EDR  Bus: USB\n"
+"\t\tBD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8\n"
+"\t\t*UP RUNNING PSCAN AUTH*\n"
+"\t\tRX bytes:1026 acl:0 sco:0 events:47 errors:0\n"
+"\t\tTX bytes:449 acl:0 sco:0 commands:46 errors:0\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3560
+msgid "+Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3562
+msgid ""
+"If there are multiple controllers running, it's easiest to off the unused "
+"controller(s). For example, for +hci1+:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3564
+#, no-wrap
+msgid "\tsudo hciconfig hci1 down\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3567
+msgid ""
+"Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez "
+"5, such as Fedora 22, one can use a tool called +blutootctl+, which will "
+"bring up its own command prompt."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3588
+#, no-wrap
+msgid ""
+"\tbluetoothctl\n"
+"\t[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]\n"
+"\t[bluetooth]# agent on\n"
+"\tAgent registered\n"
+"\t[bluetooth]# default-agent\n"
+"\tDefault agent request successful\n"
+"\t[bluetooth]# scan on                        <----now set your dive computer to upload mode\n"
+"\tDiscovery started\n"
+"\t[CHG] Controller 01:23:45:67:89:AB Discovering: yes\n"
+"\t[NEW] Device 00:11:22:33:44:55 Petrel\n"
+"\t[bluetooth]# trust 00:11:22:33:44:55        <----you can use the tab key to autocomplete the MAC address\n"
+"\t[CHG] Device 00:11:22:33:44:55 Trusted: yes\n"
+"\tChanging 00:11:22:33:44:55 trust succeeded\n"
+"\t[bluetooth]# pair 00:11:22:33:44:55\n"
+"\tAttempting to pair with 00:11:22:33:44:55\n"
+"\t[CHG] Device 00:11:22:33:44:55 Connected: yes\n"
+"\t[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345\n"
+"\t[CHG] Device 00:11:22:33:44:55 Paired: yes\n"
+"\tPairing successful\n"
+"\t[CHG] Device 00:11:22:33:44:55 Connected: no\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3591
+msgid ""
+"If asked for a password, enter 0000. It's ok if the last line says "
+"'Connected: no'. The important part is the line above, +Pairing successful+."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3594
+msgid ""
+"If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04), "
+"there is probably not a +bluetoothctl+, but a script called +bluez-simple-"
+"agent+ or just +simple-agent+."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3599
+#, no-wrap
+msgid ""
+"\thcitool -i hci0 scanning\n"
+"\tScanning ...\n"
+"\t\t00:11:22:33:44:55       Petrel\n"
+"\t\tbluez-simple-agent hci0 00:11:22:33:44:55\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3601
+msgid "Once ther dive computer is pired, set up the RFCOMM connection"
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:3602
+#, no-wrap
+msgid "Establishing the RFCOMM connection"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3605
+msgid "The command to establish an RFCOMM connection is:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3607
+msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3609
+msgid "<controller>+ is the Bluetooth controller, +hci0+."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3610
+msgid "<dev> is the RFCOMM device file, +rfcomm0+"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3611
+msgid "<bdaddr> is the dive computer's MAC address, +00:11:22:33:44:55+"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3612
+msgid ""
+"[channel] is the dive computer's Bluetooth channel we need to connect to."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3615
+msgid ""
+"If one omits it, channel 1 is assumed.  Based on a limited number of user "
+"reports, the appropriate channel for the dive computer is probably:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3617
+msgid "_Shearwater Petrel 2_: channel 5"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3618
+msgid "_Shearwater Petrel 1_: channel 1"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3619
+msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3621
+msgid ""
+"E.g. to connect a _Shearwater Petrel 2_, set the dive computer to upload "
+"mode and enter:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3623
+#, no-wrap
+msgid "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3625
+msgid "This gives the response:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3628
+#, no-wrap
+msgid ""
+"\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n"
+"\tPress CTRL-C for hangup\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3527
+#: user-manual.txt:3630
 msgid ""
-"Unfortunately on Linux binding to a communication device has to be done "
-"manually by running:"
+"To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive "
+"computer to upload mode and enter:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3533
+#: user-manual.txt:3634
+#, no-wrap
 msgid ""
-"+rfcomm bind /dev/rfcomm0 10:00:E8:C4:BE:C4+ binds the dive computer to a "
-"communication device in the desktop computer, in case rfcomm is already "
-"taken use rfcomm1 or up. IMPORTANT: Copy/paste the MAC address from the "
-"output of +hcitool scanning+, the MAC address shown above will not work."
+"\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)\n"
+"\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1\n"
+"\tPress CTRL-C for hangup\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3536
+#: user-manual.txt:3638
 msgid ""
-"For downloading dives in _Subsurface_ specify the device name connected to "
-"the MAC address in the last step above, e.g. _/dev/rfcomm0_."
+"If the specific channel the dive computer needs is not known, or the channel "
+"in the list above doesn't work, the command +sdptool records+ should help "
+"determine the appropriate channel. The output below is for a _Shearwater "
+"Petrel 2_."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3648
+#, no-wrap
+msgid ""
+"\tsdptool -i hci0 records 00:11:22:33:44:55\n"
+"\tService Name: Serial Port\n"
+"\tService RecHandle: 0x10000\n"
+"\tService Class ID List:\n"
+"\t\t\"Serial Port\" (0x1101)\n"
+"\t\tProtocol Descriptor List:\n"
+"\t\t\"L2CAP\" (0x0100)\n"
+"\t\t\"RFCOMM\" (0x0003)\n"
+"\t\tChannel: 5\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3651
+msgid ""
+"For a Bluetooth dive computer not in the list above, or if the channel "
+"listed is not correct, please let the Subsurface developers know on the user "
+"forum or the developer mailing list _subsurface@subsurface-divelog.org_."
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:3652
+#, no-wrap
+msgid "Download the dives with Subsurface</em>"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3654
+msgid ""
+"After establishing the RFCOMM connection and while the dive computer's "
+"upload mode countdown is still running, go to_Subsurface_, select _Import-"
+">Import from dive computer_ and enter appropriate Vendor (e.g. "
+"_Shearwater_), Dive Computer (_Petrel_), Device or Mount Point (_/dev/"
+"rfcomm0_) and click _Download_."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3539
+#: user-manual.txt:3657
 #, no-wrap
 msgid "APPENDIX B: Dive Computer specific information for importing dive data."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3542
+#: user-manual.txt:3660
 #, no-wrap
 msgid "Importing from Uemis Zurich"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3544
+#: user-manual.txt:3662
 #, no-wrap
 msgid "images/icons/iumis.jpg"
 msgstr "images/icons/iumis.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3560
+#: user-manual.txt:3678
 msgid ""
 "_Subsurface_ downloads the information stored on the SDA (the built-in file "
 "system of the Uemis) including information about dive spots and equipment. "
@@ -7204,7 +7510,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3575
+#: user-manual.txt:3693
 msgid ""
 "After selecting the above device name, download the dives from the Uemis "
 "Zurich. One technical issue with the Uemis Zurich download implementation "
@@ -7221,19 +7527,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3577
+#: user-manual.txt:3695
 #, no-wrap
 msgid "Importing from Uwatec Galileo"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3579
+#: user-manual.txt:3697
 #, no-wrap
 msgid "images/icons/Galileo.jpg"
 msgstr "images/icons/Galileo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3594
+#: user-manual.txt:3712
 msgid ""
 "The Uwatec Galileo dive computers use infra red (IrDA) communication between "
 "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle "
@@ -7249,41 +7555,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3597
+#: user-manual.txt:3715
 msgid ""
 "After executing this command, Subsurface will recognise the Galileo dive "
 "computer and download dive information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3601
+#: user-manual.txt:3721
 msgid ""
 "Under Windows, a similar situation exists. Drivers for the MCS7780 are "
 "available from some Internet web sites e.g.  http://www.drivers-download.com/"
-"Drv/MosChip/MCS7780/[www.drivers-download.com]."
+"Drv/MosChip/MCS7780/[www.drivers-download.com]. Windows-based IrDA drivers "
+"for the Uwatec can also be downloaded from the ScubaPro web site, drivers "
+"being located on the download page for the ScubaPro SmartTrak software."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3604
+#: user-manual.txt:3724
 msgid ""
 "For the Apple Mac, IrDA communication via the MCS7780 link is not available "
 "for OSX 10.6 or higher."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3606
+#: user-manual.txt:3726
 #, no-wrap
 msgid "Importing from Heinrichs Weikamp DR5"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3608
+#: user-manual.txt:3728
 #, no-wrap
 msgid "images/icons/HW_DR5.jpg"
 msgstr "images/icons/HW_DR5.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3618
+#: user-manual.txt:3738
 msgid ""
 "When mounted as a USB drive the Heinrichs Weikamp DR5 saves a single UDDF "
 "file for every dive.  Mark all the dives you'd like to import or open.  "
@@ -7296,19 +7604,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3621
+#: user-manual.txt:3741
 #, no-wrap
 msgid "Importing from xDEEP BLACK"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3623
+#: user-manual.txt:3743
 #, no-wrap
 msgid "images/icons/HW_xdeepblack.jpg"
 msgstr "images/icons/HW_xdeepblack.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3632
+#: user-manual.txt:3752
 msgid ""
 "Each dive has to be individually saved as UDDF file using \"Export UDDF\" "
 "option in BLACK's logbook menu.  When mounted as a USB drive UDDF files are "
@@ -7322,19 +7630,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3634
+#: user-manual.txt:3754
 #, no-wrap
 msgid "Importing from Shearwater Predator using Bluetooth"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3636
+#: user-manual.txt:3756
 #, no-wrap
 msgid "images/icons/predator.jpg"
 msgstr "images/icons/predator.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3644
+#: user-manual.txt:3764
 msgid ""
 "Using a Shearwater Predator one may be able to pair Bluetooth but then "
 "encounter issues when downloading, showing errors like _Slip RX: unexp. SLIP "
@@ -7345,36 +7653,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3647
+#: user-manual.txt:3767
 msgid ""
 "use the Bluetooth dongle which came with the Shearwater Predator instead of "
 "the built-in one of the _Subsurface_ computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3648
+#: user-manual.txt:3768
 msgid "switch to different Bluetooth drivers for the same hardware"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3649
+#: user-manual.txt:3769
 msgid "switch off WiFi while using Bluetooth"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3651
+#: user-manual.txt:3771
 #, no-wrap
 msgid "Importing from Poseidon MkVI Discovery"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3653
+#: user-manual.txt:3773
 #, no-wrap
 msgid "images/MkVI.jpeg"
 msgstr "images/MkVI.jpeg"
 
 #. type: Plain text
-#: user-manual.txt:3661
+#: user-manual.txt:3781
 msgid ""
 "Download of dive logs from the MkVI is performed using a custom "
 "communications adapter and the _Poseidon PC Configuration Software_, "
@@ -7386,45 +7694,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3664
+#: user-manual.txt:3784
 msgid ""
 "Setup configuration for the dive and key dive parameters (file with a .txt "
 "extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3665
+#: user-manual.txt:3785
 msgid "Dive log details (file with a .csv extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3667
+#: user-manual.txt:3787
 msgid ""
 "Redbook format dive log (file with .cvsr extension). This is a compressed "
 "version of the dive log using a proprietary format."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3669
+#: user-manual.txt:3789
 msgid ""
 "_Subsurface_ accesses the .txt and the .csv files to obtain dive log "
 "information."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3671
+#: user-manual.txt:3791
 #, no-wrap
 msgid "Importing from APD Inspiration CCR"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3673
+#: user-manual.txt:3793
 #, no-wrap
 msgid "images/APDComputer.jpg"
 msgstr "images/APDComputer.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3681
+#: user-manual.txt:3801
 msgid ""
 "The dive logs of an APD Inspiration or similar CCR dive computer are "
 "downloaded using a communications adapter and _AP Communicator_, obtained "
@@ -7436,82 +7744,82 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3683
+#: user-manual.txt:3803
 msgid "Open a dive within the _AP Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3684
+#: user-manual.txt:3804
 msgid "Select the tab at the top of the screen, entitled \"_Data_\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3685
+#: user-manual.txt:3805
 msgid ""
 "If the raw dive log data show on the screen, click on \"_Copy to Clipboard_"
 "\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3686
+#: user-manual.txt:3806
 msgid "Open a text editor, e.g. Notepad (Windows), TextWrangler (Mac)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3688
+#: user-manual.txt:3808
 msgid ""
 "Copy the contents of the clipboard into the text editor and save the text "
 "file with a filename extension of .CSV"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3689
+#: user-manual.txt:3809
 msgid ""
 "Within _Subsurface_, select _Import -> Import log files_ to open the xref:"
 "Unified_import[universal import dialogue]."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3690
+#: user-manual.txt:3810
 msgid ""
 "In the dropdown list towards the bottom right of the dialogue, select \"_CSV "
 "files_\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3692
+#: user-manual.txt:3812
 msgid ""
 "On the list of file names select the .CSV file that has been created above. "
 "An import dialogue opens."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3694
+#: user-manual.txt:3814
 msgid ""
 "In the dropdown list on the top left labeled '_Pre-configured imports_\", "
 "select _APD Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3695
+#: user-manual.txt:3815
 msgid ""
 "Ensure the other settings for the ADP dive log are appropriate, then select "
 "_OK_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3697
+#: user-manual.txt:3817
 msgid "The APD dive log will appear within _Subsurface_."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3699
+#: user-manual.txt:3819
 #, no-wrap
 msgid "APPENDIX C: Exporting Dive log information from external dive log software."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3708
+#: user-manual.txt:3828
 msgid ""
 "The import of dive log data from external dive log software is mostly "
 "performed using the dialogue found by selecting _Import_ from the Main Menu, "
@@ -7521,22 +7829,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3710
+#: user-manual.txt:3830
 msgid "Export the foreign dive log data to format that is accessible from"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3711
+#: user-manual.txt:3831
 msgid "_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3712
+#: user-manual.txt:3832
 msgid "Import the accessible dive log data into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3716
+#: user-manual.txt:3836
 msgid ""
 "This appendix provides some information about approaches to export dive log "
 "data from foreign dive log software. The procedures below mostly apply to "
@@ -7544,19 +7852,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3718
+#: user-manual.txt:3838
 #, no-wrap
 msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3719
+#: user-manual.txt:3839
 #, no-wrap
 msgid "images/icons/suuntologo.jpg"
 msgstr "images/icons/suuntologo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3726
+#: user-manual.txt:3846
 msgid ""
 "DiveManager is a MS Windows application for Suunto dive computers.  "
 "Divemanager 3 (DM3) is an older version of the Suunto software. More recent "
@@ -7566,66 +7874,66 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3728
+#: user-manual.txt:3848
 #, no-wrap
 msgid "*Divemanager 3 (DM3):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3730
+#: user-manual.txt:3850
 msgid ""
 "Start 'Suunto Divemanager 3' and log in with the name containing the logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3731
+#: user-manual.txt:3851
 msgid "Do not start the import wizard to import dives from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3733
+#: user-manual.txt:3853
 msgid ""
 "In the navigation tree on the left side of the program-window, select the "
 "appropriate dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3734
+#: user-manual.txt:3854
 msgid ""
 "Within the list of dives, select the dives you would like to import later:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3735
+#: user-manual.txt:3855
 msgid "To select certain dives: hold 'ctrl' and click the dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3737
+#: user-manual.txt:3857
 msgid ""
 "To select all dives: Select the first dive, hold down shift and select the "
 "last dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3738
+#: user-manual.txt:3858
 msgid "With the dives marked, use the program menu _File -> Export_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3739
+#: user-manual.txt:3859
 msgid ""
 "The export pop-up will show. Within this pop-up, there is one field called "
 "'Export Path'."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3740
+#: user-manual.txt:3860
 msgid "Click the browse button next to the field Export Path"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3742
+#: user-manual.txt:3862
 #, no-wrap
 msgid ""
 "** A file-manager like window pops up\n"
@@ -7633,13 +7941,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3743
+#: user-manual.txt:3863
 #, no-wrap
 msgid "Divelog.SDE file\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3745
+#: user-manual.txt:3865
 #, no-wrap
 msgid ""
 "** Optionally change the name of the file for saving\n"
@@ -7647,25 +7955,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3746
+#: user-manual.txt:3866
 #, no-wrap
 msgid "Back in the Export pop-up, press the button 'Export'\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3747
+#: user-manual.txt:3867
 #, no-wrap
 msgid "The dives are now exported to the file Divelog.SDE.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3749
+#: user-manual.txt:3869
 #, no-wrap
 msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3754
+#: user-manual.txt:3874
 msgid ""
 "DM4 and DM5 use identical mechanisms for exporting dive logs.  To export a "
 "divelog from Divemanager one needs to locate the DM4/DM5 database where the "
@@ -7674,81 +7982,81 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3756
+#: user-manual.txt:3876
 msgid "Locating the Suunto DM4 (or DM5) database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3758 user-manual.txt:3767
+#: user-manual.txt:3878 user-manual.txt:3887
 msgid "Start Suunto DM4/DM5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3759
+#: user-manual.txt:3879
 msgid "Select 'Help -> About'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3760
+#: user-manual.txt:3880
 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3761
+#: user-manual.txt:3881
 msgid "Now open Windows Explorer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3762
+#: user-manual.txt:3882
 msgid "Paste the address to the path box at the top of the File Explorer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3763
+#: user-manual.txt:3883
 msgid "The database is called DM4.db or DM5.db"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3765
+#: user-manual.txt:3885
 msgid "Making a backup copy of the Suunto DM4/DM5 database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3768
+#: user-manual.txt:3888
 msgid "Select 'File - Create backup'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3770
+#: user-manual.txt:3890
 msgid ""
 "From the file menu select the location and name for the backup, we'll use "
 "DM4 (or DM5) in here with the default extension .bak"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3771
+#: user-manual.txt:3891
 msgid "Click 'Save'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3772
+#: user-manual.txt:3892
 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3774
+#: user-manual.txt:3894
 #, no-wrap
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3777
+#: user-manual.txt:3897
 #, no-wrap
 msgid "images/icons/atomiclogo.jpg"
 msgstr "images/icons/atomiclogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3784
+#: user-manual.txt:3904
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
@@ -7758,19 +8066,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3786
+#: user-manual.txt:3906
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3789
+#: user-manual.txt:3909
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr "images/icons/mareslogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3797
+#: user-manual.txt:3917
 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 "
@@ -7781,7 +8089,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3802
+#: user-manual.txt:3922
 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 "
@@ -7789,36 +8097,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3805
+#: user-manual.txt:3925
 msgid ""
 "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a "
 "file _DiveOrganiser.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3806
+#: user-manual.txt:3926
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3807
+#: user-manual.txt:3927
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3809
+#: user-manual.txt:3929
 #, no-wrap
 msgid "Exporting from *DivingLog 5.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3811
+#: user-manual.txt:3931
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr "images/icons/divingloglogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3820
+#: user-manual.txt:3940
 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 "
@@ -7829,28 +8137,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3822
+#: user-manual.txt:3942
 msgid "In DivingLog open the 'File -> Export -> XML' menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3823
+#: user-manual.txt:3943
 msgid "Select the dives to export"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3824
+#: user-manual.txt:3944
 msgid "Click on the export button and select the filename"
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3826
+#: user-manual.txt:3946
 #, no-wrap
 msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3835
+#: user-manual.txt:3955
 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 "
@@ -7863,7 +8171,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3841
+#: user-manual.txt:3961
 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 "
@@ -7874,41 +8182,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3843
+#: user-manual.txt:3963
 msgid ""
 "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy"
 msgstr ""
+"Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa"
 
 #. type: Plain text
-#: user-manual.txt:3844
+#: user-manual.txt:3964
 msgid "Duration: the format should be minutes:seconds."
-msgstr ""
+msgstr "Durée : le format est minutes:secondes."
 
 #. type: Plain text
-#: user-manual.txt:3845
+#: user-manual.txt:3965
 msgid ""
 "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:3846
+#: user-manual.txt:3966
 msgid "Tags and buddies: values should be separated using a comma."
 msgstr ""
+"Étiquettes et équipiers : les valeurs doivent être séparées par des virgules."
 
 #. type: Plain text
-#: user-manual.txt:3847
+#: user-manual.txt:3967
 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
+"Position GPS : vous devez utiliser les degrés décimaux, par exemple : "
+"30.22496 30.821798"
 
 #. type: Title ===
-#: user-manual.txt:3848
+#: user-manual.txt:3968
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
-msgstr ""
+msgstr "_LibreOffice Calc_ et _OpenOffice Calc_"
 
 #. type: Plain text
-#: user-manual.txt:3852
+#: user-manual.txt:3972
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -7919,13 +8231,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3853
+#: user-manual.txt:3973
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr "images/LOffice_spreadsheetdata.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3856
+#: user-manual.txt:3976
 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 "
@@ -7933,13 +8245,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3857
+#: user-manual.txt:3977
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr "images/LOffice_save_as_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3860
+#: user-manual.txt:3980
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -7947,13 +8259,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3861
+#: user-manual.txt:3981
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr "images/LOffice_field_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3864
+#: user-manual.txt:3984
 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:"
@@ -7961,13 +8273,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3865
+#: user-manual.txt:3985
 #, no-wrap
 msgid "Microsoft _Excel_"
-msgstr ""
+msgstr "Microsoft _Excel_"
 
 #. type: Plain text
-#: user-manual.txt:3871
+#: user-manual.txt:3991
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
@@ -7978,19 +8290,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3873
+#: user-manual.txt:3993
 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:3874
+#: user-manual.txt:3994
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3877
+#: user-manual.txt:3997
 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 "
@@ -7998,48 +8310,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3878
+#: user-manual.txt:3998
 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:3879
+#: user-manual.txt:3999
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3881
+#: user-manual.txt:4001
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3882
+#: user-manual.txt:4002
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr "images/Win_SaveCSV2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3885
+#: user-manual.txt:4005
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3887
+#: user-manual.txt:4007
 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:3888
+#: user-manual.txt:4008
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr "images/Win_SaveCSV1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3891
+#: user-manual.txt:4011
 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 "
@@ -8049,13 +8361,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3892
+#: user-manual.txt:4012
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr "images/Win_SaveCSV3.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3895
+#: user-manual.txt:4015
 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 "
@@ -8064,19 +8376,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3896
+#: user-manual.txt:4016
 #, no-wrap
 msgid "APPENDIX E: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3898
+#: user-manual.txt:4018
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3902
+#: user-manual.txt:4022
 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_ "
@@ -8084,7 +8396,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3908
+#: user-manual.txt:4028
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
@@ -8094,7 +8406,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3914
+#: user-manual.txt:4034
 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 "
@@ -8104,12 +8416,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3916
+#: user-manual.txt:4036
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3922
+#: user-manual.txt:4042
 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 "
@@ -8120,12 +8432,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3924
+#: user-manual.txt:4044
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3929
+#: user-manual.txt:4049
 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 "
@@ -8135,7 +8447,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3935
+#: user-manual.txt:4055
 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 "
@@ -8146,13 +8458,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3936
+#: user-manual.txt:4056
 #, no-wrap
 msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3940
+#: user-manual.txt:4060
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -8160,7 +8472,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3948
+#: user-manual.txt:4068
 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 "
diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git
index b9f098763..cfb013a8e 100644
--- a/Documentation/user-manual_fr.html.git
+++ b/Documentation/user-manual_fr.html.git
@@ -505,22 +505,22 @@ sur l&#8217;option pour ne plus être sondé, cela devrait être la dernière
 communication de ce type que vous recevrez. Cependant, si vos habitudes de

 plongées ou d&#8217;utilisation de Subsurface changent, vous pouvez envoyer un

 nouveau sondage en démarrant <em>Subsurface</em> avec l&#8217;option  <em>--survey</em> sur la

-ligne de commande.</p></div>

-</div>

-</div>

+ligne de commande.</p></div>
+</div>
+</div>
 <div class="sect1">
 <h2 id="S_StartUsing">3. Commencer à utiliser le programme</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>The <em>Subsurface</em> window is usually divided into four panels with a <strong>Main
-Menu</strong> (File Import Log View Help) at the top of the window (for Windows and
-Linux) or the top of the screen (for Mac and Ubuntu Unity). The four panels
-are:</p></div>
+<div class="paragraph"><p>La fenêtre <em>Subsurface</em> est généralement divisée en 4 panneaux avec un <strong>Menu
+principal</strong> (Fichier Importer Journal Vue Aide) en haut de la fenêtre (pour
+Windows et Linux) ou en haut de l'écran (pour Mac et Ubuntu Unity). Les
+quatre panneaux sont :</p></div>
 <div class="paragraph"><p>La <strong>liste des plongées</strong> en bas à gauche, contenant une liste de toutes les
 plongées du journal (carnet) de plongées de l&#8217;utilisateur. Une plongée peut
 être sélectionnée et mise en surbrillance dans la liste en cliquant
-dessus. Dans la plupart des cas, les touches haut/bas peuvent être utilisée

-pour passer d&#8217;une plongée à l&#8217;autre. La <strong>liste des plongées</strong> est un outil

-important pour manipuler un journal (carnet) de plongée.</p></div>

+dessus. Dans la plupart des cas, les touches haut/bas peuvent être utilisée
+pour passer d&#8217;une plongée à l&#8217;autre. La <strong>liste des plongées</strong> est un outil
+important pour manipuler un journal (carnet) de plongée.</p></div>
 <div class="paragraph"><p>La <strong>carte de plongée</strong> en bas à droite, affiche les sites de plongées de

 l&#8217;utilisateur, sur une carte mondiale et centrée sur le site de la dernière

 plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div>

@@ -1566,9 +1566,9 @@ CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
 </p>

 </li>

 </ul></div>

-<div class="paragraph"><p>Selecting the appropriate file in the file list of the dialogue opens the

-imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats, not

-accessible through the Import dialogue are also supported, as explained

+<div class="paragraph"><p>Selecting the appropriate file in the file list of the dialogue opens the
+imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats, not
+accessible through the Import dialogue are also supported, as explained
 below.</p></div>
 </div>
 <div class="sect3">
@@ -1587,9 +1587,9 @@ OSTC dives are shown in the <strong>Dive List</strong> panel.</p></div>
 <div class="paragraph"><p>Since Mares utilise proprietary Windows software not compatible with
 multi-platform applications, these dive logs cannot be directly imported
 into <em>Subsurface</em>. Mares dive logs need to be imported using a three-step
-process, using <em>www.divelogs.de</em> as a mechanism to extract the dive log

-information.</p></div>

-<div class="olist arabic"><ol class="arabic">

+process, using <em>www.divelogs.de</em> as a mechanism to extract the dive log
+information.</p></div>
+<div class="olist arabic"><ol class="arabic">
 <li>

 <p>

 The dive log data from Mares Dive Organiser need to be exported to the

@@ -1609,9 +1609,9 @@ Data should then be imported into <em>www.divelogs.de</em>. One needs to create
 <li>

 <p>

 Finally, import the dives from <em>divelogs.de</em> to <em>Subsurface</em>, using the

-   instructions below.

-</p>

-</li>

+   instructions below.
+</p>
+</li>
 </ol></div>
 </div>
 <div class="sect3">
@@ -1619,16 +1619,16 @@ Finally, import the dives from <em>divelogs.de</em> to <em>Subsurface</em>, usin
 <div class="paragraph"><p>The import of dive information from <em>divelogs.de</em> is simple, using a single
 dialogue box. The <em>Import &#8594; Import from Divelogs.de</em> option should be
 selected from the Main Menu. This brings up a dialogue box (see figure on
-left [<strong>A</strong>] below). Enter a user-ID and password for <em>divelogs.de</em> into the

-appropriate fields and then select the <em>Download</em> button. Download from

-<em>divelogs.de</em> starts immediately, displaying a progress bar in the dialogue

+left [<strong>A</strong>] below). Enter a user-ID and password for <em>divelogs.de</em> into the
+appropriate fields and then select the <em>Download</em> button. Download from
+<em>divelogs.de</em> starts immediately, displaying a progress bar in the dialogue
 box. At the end of the download, the success status is indicated (see figure

 on the right [<strong>B</strong>], below). The <em>Apply</em> button should then be selected,

 after which the imported dives appear in the <em>Subsurface</em> <strong>Dive List</strong> panel.</p></div>

 <div class="imageblock" style="text-align:center;">

-<div class="content">

-<img src="images/Divelogs1.jpg" alt="FIGURE:Download from Divelogs.de" />

-</div>

+<div class="content">
+<img src="images/Divelogs1.jpg" alt="FIGURE:Download from Divelogs.de" />
+</div>
 </div>
 </div>
 <div class="sect3">
@@ -1636,9 +1636,9 @@ after which the imported dives appear in the <em>Subsurface</em> <strong>Dive Li
 <div class="paragraph"><p>A comma-separated file (.csv) can be used to import dive information either
 as dive profiles (as in the case of the APD Inspiration and Evolution closed
 circuit rebreathers) or as dive metadata (in case the user keeps dive data
-in a spreadsheet). The <em>CSV</em> format is a universal simplified format that

-allows for easy information exchange between different computers or software

-packages. For an introduction to CSV-formatted files see <a href="#S_CSV_Intro">A

+in a spreadsheet). The <em>CSV</em> format is a universal simplified format that
+allows for easy information exchange between different computers or software
+packages. For an introduction to CSV-formatted files see <a href="#S_CSV_Intro">A
 Diver&#8217;s Introduction To CSV Files</a>. <em>Subsurface</em> dive logs can also be

 exported in <em>CSV</em> format to other software that reads this format. See

 <a href="#S_Appendix_D">APPENDIX D: Exporting a spreadsheet to CSV format</a> for

@@ -2380,14 +2380,14 @@ profile with photos from an external drive, the normal procedure of
 selection and synchronisation (see text above) is used.  However, after the

 external drive has been disconnected, <em>Subsurface</em> cannot access these

 photos any more.  If the display of photos is activated (using the toolbox

-to the left of the <em>Dive Profile</em>), the program only shows a small white dot

-where each photo should be on the dive profile.  In addition the <em>Photos</em>

-tab only shows the file names of the photos. This is normal behaviour.  If,

+to the left of the <em>Dive Profile</em>), the program only shows a small white dot
+where each photo should be on the dive profile.  In addition the <em>Photos</em>
+tab only shows the file names of the photos. This is normal behaviour.  If,
 later, the external drive with the photos is connected again, the photos can
 be seen in the normal way.</p></div>
 </div>
 <div class="sect3">
-<h4 id="Moving_images">5.5.5. Moving photographs among directories, hard disks or computers</h4>
+<h4 id="S_FindMovedImages">5.5.5. Moving photographs among directories, hard disks or computers</h4>
 <div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive, the directory
  where the photo lies is stored, allowing <em>Subsurface</em> to find the photograph when the dive is
  opened again. If the photo or the whole photo collection is moved to another drive or to a different
@@ -2452,12 +2452,12 @@ specific dive.</td>
 </div>
 <div class="sect2">
 <h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3>
-<div class="sect3">

-<h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>

-<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one

-cylinder. Multicylinder diving usually happens (a) if a diver does not have

-enough gas for the complete dive in a single cylinder; (b) if the diver

-needs more than one gas mixture because of the depth or the decompression

+<div class="sect3">
+<h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>
+<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one
+cylinder. Multicylinder diving usually happens (a) if a diver does not have
+enough gas for the complete dive in a single cylinder; (b) if the diver
+needs more than one gas mixture because of the depth or the decompression
 needs of the dive. For this reason multicylinder dives are often used by
 technical divers who dive deep or long. As far as <em>Subsurface</em> is concerned,
 there are only two types of information that need to be provided:</p></div>
@@ -2517,9 +2517,9 @@ steps:</p></div>
   from these dive computers, the events of switching between cylinders with the same gas are not downloaded. This may mean
   that one may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
   has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning
-  from a dive with the information about cylinder changes is the only tricky part of logging sidemount dives.

-</p>

-</li>

+  from a dive with the information about cylinder changes is the only tricky part of logging sidemount dives.
+</p>
+</li>
 <li>

 <p>

 <strong>Within <em>Subsurface</em> describe the cylinders used during the dive</strong>. The diver needs to provide the

@@ -2542,9 +2542,9 @@ steps:</p></div>
 </p>

 </li>

 </ul></div>

-<div class="imageblock" style="text-align:center;">

-<div class="content">

-<img src="images/sidemount1.jpg" alt="FIGURE: Sidemount profile" />

+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/sidemount1.jpg" alt="FIGURE: Sidemount profile" />
 </div>
 </div>
 <div class="paragraph"><p>This section gives an example of the versatility of <em>Subsurface</em> as a dive
@@ -2606,9 +2606,9 @@ lasted over two hours.</p></div>
 <img src="images/APD.jpg" alt="Note" />
 </td>
 <td class="content">Closed system rebreathers use advanced technology to recirculate gas that
-has been breathed while doing two things to maintain a breathable oxygen

-concentration:

-a) remove carbon dioxide from the gas that has been exhaled

+has been breathed while doing two things to maintain a breathable oxygen
+concentration:
+a) remove carbon dioxide from the gas that has been exhaled
 regulate the oxygen concentration to remain within safe diving limits.

 Currently, within <em>Subsurface</em>, the Poseidon MkVI Discovery is the best

 supported CCR dive computer. The CCR interface of <em>Subsurface</em> is currently

@@ -3321,9 +3321,9 @@ Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters f
 </div>

 </div>

 </div>

-</div>

-<div class="sect1">

-<h2 id="_organising_the_logbook_manipulating_groups_of_dives">7. Organising the logbook (Manipulating groups of dives)</h2>

+</div>
+<div class="sect1">
+<h2 id="_organising_the_logbook_manipulating_groups_of_dives">7. Organising the logbook (Manipulating groups of dives)</h2>
 <div class="sectionbody">
 <div class="sect2">
 <h3 id="_the_dive_list_context_menu">7.1. The Dive List context menu</h3>
@@ -3333,9 +3333,9 @@ a group of dives and then right-clicking.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/ContextMenu.jpg" alt="Figure: Context Menu" />
-</div>

-</div>

-<div class="paragraph"><p>The context menu is used in many manipulations described below.</p></div>

+</div>
+</div>
+<div class="paragraph"><p>The context menu is used in many manipulations described below.</p></div>
 <div class="sect3">

 <h4 id="_customising_the_information_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customising the information showed in the <strong>Dive List</strong> panel</h4>

 <div class="imageblock" style="text-align:center;">

@@ -3369,9 +3369,9 @@ sequence numbers) to recent dives (having the highest sequence numbers). The
 numbering of the dives is not always consistent. For instance, when

 non-recent dives are added to the dive list the numbering does not

 automatically follow on because of the dives that are more recent in

-date/time than the newly-added dive with an older date/time. Therefore, one

-may sometimes need to renumber the dives.  This is performed by selecting

-(from the Main Menu) <em>Log &#8594; Renumber</em>. Users are given a choice with

+date/time than the newly-added dive with an older date/time. Therefore, one
+may sometimes need to renumber the dives.  This is performed by selecting
+(from the Main Menu) <em>Log &#8594; Renumber</em>. Users are given a choice with
 respect to the lowest sequence number to be used.  Completing this operation
 results in new sequence numbers (based on date/time)  for the dives in the
 <strong>Dive List</strong> panel.</p></div>
@@ -3392,7 +3392,7 @@ dive list comprising five dive trips (<strong>B</strong>, on the right):</p></di
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Group2.jpg" alt="Figure: Grouping dives" />
-</div>

+</div>
 </div>
 <div class="paragraph"><p>Grouping into trips allows a rapid way of accessing individual dives without
 having to scan a long lists of dives. In order to group the dives in a dive
@@ -3401,9 +3401,9 @@ now shows only the titles for the trips.</p></div>
 <div class="sect3">
 <h4 id="_editing_the_title_and_associated_information_for_a_particular_trip">7.3.1. Editing the title and associated information for a particular trip</h4>
 <div class="paragraph"><p>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 <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Notes</strong>

-panel. Here users can add or edit information about the date/time, the trip

+title.  More information about a trip can be added by selecting its trip
+title from the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Notes</strong>
+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

@@ -3414,9 +3414,9 @@ information.</p></div>
 <div class="sect3">

 <h4 id="_viewing_the_dives_during_a_particular_trip">7.3.2. Viewing the dives during a particular trip</h4>

 <div class="paragraph"><p>Once the dives have been grouped into trips, users can expand one or more

-trips by clicking the arrow-head on the left of each trip title. This

-expands the selected trip, revealing the individual dives performed during

-the trip.</p></div>

+trips by clicking the arrow-head on the left of each trip title. This
+expands the selected trip, revealing the individual dives performed during
+the trip.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_collapsing_or_expanding_dive_information_for_different_trips">7.3.3. Collapsing or expanding dive information for different trips</h4>
@@ -3433,9 +3433,9 @@ above.(Merge trip with trip below; Merge trip with trip above)</p></div>
 </div>
 <div class="sect3">
 <h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.5. Splitting a single trip into more than one trip</h4>
-<div class="paragraph"><p>If a trip includes five dives, the user can split this trip into two trips

-(trip 1: top 3 dives; trip 2: bottom 2 dives) by selecting and

-right-clicking the top three dives. The resulting context menu allows the

+<div class="paragraph"><p>If a trip includes five dives, the user can split this trip into two trips
+(trip 1: top 3 dives; trip 2: bottom 2 dives) by selecting and
+right-clicking the top three dives. The resulting context menu allows the
 user to create a new trip by choosing the option <strong>Create new trip

 above</strong>. The top three dives are then grouped into a separate trip. The

 figures below shows the selection and context menu on the left (A) and the

@@ -3456,9 +3456,9 @@ right-clicking them to bring up the context menu, and then selecting <strong>Del
 dive(s)</strong>. Typically this would apply to a case where a user wishes to delete

 workshop calibration dives of the dive computer or dives of extremely short

 duration.</p></div>

-</div>

-<div class="sect3">

-<h4 id="_unlink_a_dive_from_a_trip">7.4.2. Unlink a dive from a trip</h4>

+</div>
+<div class="sect3">
+<h4 id="_unlink_a_dive_from_a_trip">7.4.2. Unlink a dive from a trip</h4>
 <div class="paragraph"><p>Users can unlink dives from the trip to which they belong. In order to do
 this, select and right-click the relevant dives to bring up the context
 menu. Then select the option <strong>Remove dive(s)  from trip</strong>. The dive(s) now
@@ -3473,10 +3473,10 @@ bring up the context menu, and then select <strong>Create new trip above</strong
 </div>
 <div class="sect3">
 <h4 id="_shift_the_start_time_of_dive_s">7.4.4. Shift the start time of dive(s)</h4>
-<div class="paragraph"><p>Sometimes it is necessary to adjust the start time of a dive. This may apply

-to situations where dives are performed in different time zones or when the

-dive computer has an erroneous time. In order to do this, user must select

-and right-click the dive(s) to be adjusted. This action brings up the

+<div class="paragraph"><p>Sometimes it is necessary to adjust the start time of a dive. This may apply
+to situations where dives are performed in different time zones or when the
+dive computer has an erroneous time. In order to do this, user must select
+and right-click the dive(s) to be adjusted. This action brings up the
 context menu on which the <strong>Shift times</strong> option should be selected. User must
 then specify the time (in hours and minutes) by which the dives should be
 adjusted and click on the option indicating whether the time adjustment
@@ -3484,18 +3484,18 @@ should be ealier or later.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_merge_dives_into_a_single_dive">7.4.5. Merge dives into a single dive</h4>
-<div class="paragraph"><p>Sometimes a dive is briefly interrupted, e.g. if a diver returns to the

-surface for a few minutes, resulting in two or more dives being recorded by

-the dive computer and appearing as different dives in the <strong>Dive List</strong>

+<div class="paragraph"><p>Sometimes a dive is briefly interrupted, e.g. if a diver returns to the
+surface for a few minutes, resulting in two or more dives being recorded by
+the dive computer and appearing as different dives in the <strong>Dive List</strong>
 panel. 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 <strong>Merge selected dives</strong>. It may be necessary to edit the dive

 information in the <strong>Notes</strong> 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:</p></div>

-<div class="imageblock" style="text-align:center;">

-<div class="content">

-<img src="images/MergedDive.png" alt="Example: Merged dive" />

+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/MergedDive.png" alt="Example: Merged dive" />
 </div>
 </div>
 </div>
@@ -3510,11 +3510,11 @@ the <strong>Main Menu</strong> select <em>Edit</em>. This brings up the possibil
 </div>
 <div class="sect2">
 <h3 id="S_Filter">7.5. Filtering the dive list</h3>
-<div class="paragraph"><p>The dives in the <strong>Dive List</strong> panel can be filtered, that is, one can select

-only some of the dives based on their attributes, e.g. dive tags, dive site,

-dive master, buddy or protective clothing. For instance, filtering allows

-one to list the deep dives at a particular dive site, or otherwise the cave

-dives with a particular buddy.</p></div>

+<div class="paragraph"><p>The dives in the <strong>Dive List</strong> panel can be filtered, that is, one can select
+only some of the dives based on their attributes, e.g. dive tags, dive site,
+dive master, buddy or protective clothing. For instance, filtering allows
+one to list the deep dives at a particular dive site, or otherwise the cave
+dives with a particular buddy.</p></div>
 <div class="paragraph"><p>To open the filter, select <em>Log &#8594; Filter divelist</em> from the main menu. This
 opens the <em>Filter Panel</em> at the top of the <em>Subsurface</em> window. Three icons
 are located at the top right hand of the filter panel. The <em>Filter Panel</em>
@@ -3527,13 +3527,13 @@ white cross.  An example of the <em>Filter Panel</em> is shown in the figure bel
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Filterpanel.jpg" alt="Figure: Filter panel" />
-</div>

-</div>

-<div class="paragraph"><p>Four filter criteria may be used to filter the dive list: dive tags, person

+</div>
+</div>
+<div class="paragraph"><p>Four filter criteria may be used to filter the dive list: dive tags, person
 (buddy / dive master), dive site and dive suit, each of which is represented

-by a check list with check boxes. Above each check list is a second-level

-filter tool, allowing the listing of only some of the attributes within that

-check list. For instance, typing "<em>ca</em>" in the filter textbox above the tags

+by a check list with check boxes. Above each check list is a second-level
+filter tool, allowing the listing of only some of the attributes within that
+check list. For instance, typing "<em>ca</em>" in the filter textbox above the tags
 check list results in the tags check list being reduced to "<em>cave</em>" and
 "<em>cavern</em>". Filtering of the check list enables the rapid finding of search
 terms for filtering the dive list.</p></div>
@@ -3547,9 +3547,9 @@ those dives that have either one OR both of these tags.</p></div>
 </div>
 </div>
 </div>
-<div class="sect1">

-<h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2>

-<div class="sectionbody">

+<div class="sect1">
+<h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2>
+<div class="sectionbody">
 <div class="paragraph"><p>There are two routes for the export of dive information from Subsurface:</p></div>

 <div class="ulist"><ul>

 <li>

@@ -4057,9 +4057,9 @@ the dive profile:
 </p>

 </li>

 <li>

-<p>

-<em>Show average depth</em>: Activating this checkbox causes <em>Subsurface</em> to draw a grey line across

-   the dive profile, indicating the mean depth of the dive up to a particular point in time during

+<p>
+<em>Show average depth</em>: Activating this checkbox causes <em>Subsurface</em> to draw a grey line across
+   the dive profile, indicating the mean depth of the dive up to a particular point in time during
    that dive. Normally this is a u-shaped line indicating the deepest average depth just before the
    ascent.
 </p>
@@ -4067,9 +4067,9 @@ the dive profile:
 <li>
 <p>
 <strong>Misc</strong>:
-</p>

-</li>

-</ul></div>

+</p>
+</li>
+</ul></div>
 </li>

 <li>

 <p>

@@ -4273,9 +4273,9 @@ Details</em>. This is where the details of the dive plan are provided in a way
 that can easily be copied to other software. This is also where any warning

 messages about the dive plan are printed.</p></div>

 <div class="imageblock" style="text-align:center;">

-<div class="content">

-<img src="images/PlannerWindow1_f20.jpg" alt="FIGURE: Dive planner startup window" />

-</div>

+<div class="content">
+<img src="images/PlannerWindow1_f20.jpg" alt="FIGURE: Dive planner startup window" />
+</div>
 </div>
 </div>
 <div class="sect2">
@@ -4288,9 +4288,9 @@ Towards the centre bottom of the planner (circled in blue in the image
 </p>
 <div class="ulist"><ul>
 <li>
-<p>

-Open Circuit (the default)

-</p>

+<p>
+Open Circuit (the default)
+</p>
 </li>

 <li>

 <p>

@@ -4300,9 +4300,9 @@ CCR
 <li>

 <p>

 pSCR

-</p>

-</li>

-</ul></div>

+</p>
+</li>
+</ul></div>
 </li>
 <li>
 <p>
@@ -4319,16 +4319,16 @@ In the top left-hand area of the planning screen, ensure that the constant
 </p>
 </li>
 <li>
-<p>

-In the table labeled <em>Available Gases</em>, add the information of the cylinders

-  to be used as well as the gas composition within that cylinder. This is done

+<p>
+In the table labeled <em>Available Gases</em>, 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 <a href="#S_CylinderData">providing cylinder data for dive   logs</a>. 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.

-</p>

+  the boxes provided in this dialogue. Add additional cylinders by using the
+  "+" icon to the top righthand of the dialogue.
+</p>
 </li>
 <li>
 <p>
@@ -4456,9 +4456,9 @@ using multiple breathing gases.  Such dives are planned in three stages:</p></di
 <div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is performed by specifying the rates for descent and ascent,
 as well as the gradient factors (GFLow and GFHigh) under the headings <em>Rates</em> and <em>Planning</em>
 to the bottom left of the planning screen. Initially, the GFHigh and GFLow values in the <em>Preferences</em>
-panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within

-the planner), the new values are

-used without changing the original values in the <em>Preferences</em>. Gradient Factor settings strongly affect the calculated ceilings and their depths.

+panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within
+the planner), the new values are
+used without changing the original values in the <em>Preferences</em>. Gradient Factor settings strongly affect the calculated ceilings and their depths.
 A very low GFLow value brings about decompression stops early on during the dive.

  ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.

 For more information external to this manual see:</p></div>

@@ -4570,9 +4570,9 @@ diveplan</em> is requested, a detailed sentence-level explanation of the dive
 plan is given. If any of the management specifications have been exceeded

 during the planning, a warning message is printed underneath the dive plan

 information.</p></div>

-<div class="paragraph"><p>If the option <em>Display segment duration</em> is checked, then the duration of

-each depth level is indicated in the <em>Dive Plan Details</em>. This duration

-INCLUDES the transition time to get to that level. However, if the <em>Display

+<div class="paragraph"><p>If the option <em>Display segment duration</em> is checked, then the duration of
+each depth level is indicated in the <em>Dive Plan Details</em>. This duration
+INCLUDES the transition time to get to that level. However, if the <em>Display
 transition in deco</em> option is checked, the transitions are shown separately
 from the segment durations at a particular level.</p></div>
 </div>
@@ -4603,9 +4603,9 @@ in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.<
 <div class="paragraph"><p>To plan a dive using a closed circuit rebreather, select the <em>CCR</em> option in
 the dropdown list, circled in blue in the image below.</p></div>
 <div class="paragraph"><p><strong>Available gases</strong>: In the <em>Available gases</em> table, enter the cylinder information for the
-diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen

-cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div>

-<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File &#8594;  Preferences &#8594;  Graph</em> from the main menu. All user-entered segments in the <em>Dive planner points</em> table

+diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen
+cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div>
+<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File &#8594;  Preferences &#8594;  Graph</em> from the main menu. All user-entered segments in the <em>Dive planner points</em> table
 use the default setpoint value. Then, different setpoints can be specified for dive segments

 in the <em>Dive planner points</em> table. A zero setpoint

 means the diver bails out to open circuit mode for that segment. The decompression is always calculated

@@ -4616,18 +4616,18 @@ algorithm does not switch deco-gases automatically while in CCR mode (i.e. when
 <div class="imageblock" style="text-align:center;">

 <div class="content">

 <img src="images/Planner_CCR1_f20.jpg" alt="FIGURE: Planning a CCR dive: setup" />

-</div>

-</div>

-<div class="paragraph"><p>Note that, in the <em>Dive plan details</em>, the gas consumption for a CCR segment

+</div>
+</div>
+<div class="paragraph"><p>Note that, in the <em>Dive plan details</em>, the gas consumption for a CCR segment
 is not calculated, so gas consumptions of 0 litres are the norm.</p></div>
 </div>
 <div class="sect2">
 <h3 id="S_Replan">13.5. Modifying an existing dive plan</h3>
 <div class="paragraph"><p>Normally, when a dive plan has been saved, it is accessible from the <strong>Dive
 List</strong>, like any other dive log. Within the <strong>Dive List</strong> there is not a way to
-change a saved dive plan.  To perform changes to a dive plan, select it on

-the <strong>Dive List</strong>. Then, in the main menu, select <em>Log &#8594; Re-plan dive</em>. This

-will open the selected dive plan within the dive planner, allowing changes

+change a saved dive plan.  To perform changes to a dive plan, select it on
+the <strong>Dive List</strong>. Then, in the main menu, select <em>Log &#8594; Re-plan dive</em>. This
+will open the selected dive plan within the dive planner, allowing changes
 to be made and saved as usual.</p></div>

 <div class="paragraph"><p>In addition there is the option "Save new". This keeps the original planned

 dive and adds a (possibly modified) copy to the dive list. If that copy is

@@ -4720,12 +4720,20 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <a href="#S_PrintDivelog"><em>Imprimer</em></a> - Imprimer le carnet de plongée actuellement

   ouvert.

 </p>

-</li>

-<li>

-<p>

-<a href="#S_Preferences"><em>Préférences</em></a> - Définir les  préférences de <em>Subsurface</em>.

-</p>

-</li>

+</li>
+<li>
+<p>
+<a href="#S_FindMovedImages"><em>Find moved images</em></a> - If photos taken during dives
+  have been moved to
+      a different disk or directory, locate them and link them to the appropriate
+      dives.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Preferences"><em>Préférences</em></a> - Définir les  préférences de <em>Subsurface</em>.
+</p>
+</li>
 <li>

 <p>

 <a href="#S_Configure"><em>Configurer l&#8217;ordinateur de plongée</em></a> - Modifier la

@@ -4778,20 +4786,26 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <a href="#S_EnterData"><em>Ajouter une plongée</em></a> -  Ajouter manuellement une nouvelle

   plongée au panneau de la <strong>liste des plongées</strong>.

 </p>

-</li>

-<li>

-<p>

-<a href="#S_DivePlanner"><em>Planifier une plongée</em></a> - Cette fonctionnalité permet de

-  planifier des plongées.

-</p>

-</li>

-<li>

-<p>

-<a href="#S_Replan"><em>Replanifier une plongée</em></a> - Modifier une plongée planifiée qui

-  a été enregistrée dans la <strong>liste des plongées</strong>.

-</p>

-</li>

-<li>

+</li>
+<li>
+<p>
+<em>Edit dive</em> - Edit a dive of which the profile was entered by hande and not
+  from a dive computer.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_DivePlanner"><em>Planifier une plongée</em></a> - Cette fonctionnalité permet de
+  planifier des plongées.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Replan"><em>Modifier la plongée dans le planificateur</em></a> - Modifier une
+  plongée planifiée qui a été enregistrée dans la <strong>liste des plongées</strong>.
+</p>
+</li>
+<li>
 <p>

 <a href="#S_CopyComponents"><em>Copier les composants de la plongée</em></a> - En

   sélectionnant cette option, vous pouvez copier les informations de plusieurs

@@ -5074,78 +5088,255 @@ Log</em> and wait for the <em>Wait PC</em> message.</p></div>
 <li>

 <p>

 <strong>Pair the <em>Subsurface</em> computer with the dive computer.</strong>

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><div class="title">Sur Windows :</div><p>Bluetooth is most likely already enabled. For pairing with the dive computer

-choose <em>Control Panel &#8594; Bluetooth Devices &#8594; Add Wireless Device</em>.  This

-should bring up a dialog showing your dive computer (in Bluetooth mode) and

-allowing pairing. Right click on it and choose <em>Propertie s&#8594; COM Ports</em> to

-identify the port used for your dive computer. If there are several ports

-listed, use the one saying "Outgoing" instead of "Incoming".</p></div>

-<div class="paragraph"><p>For downloading to <em>Subsurface</em>, the <em>Subsurface</em> drop-down list should

-contain this COM port already. If not, enter it manually.</p></div>

-<div class="paragraph"><p>Note: If there are issues afterwards when downloading from the dive computer

-using other software, remove the existing pairing with the dive computer.</p></div>

-<div class="paragraph"><div class="title">Sur MacOS :</div><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up Bluetooth

-Device&#8230;</em>. The dive computer should then show up in the list of

-devices. Select it and go through the pairing process. This step should only

-be needed once for initial setup.</p></div>

-<div class="paragraph"><p>Once the pairing is completed the correct device is shown in the <em>Device or

-Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div>

-<div class="paragraph"><div class="title">Sur Linux</div><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.  On most common

-distributions this should be true out of the box and pairing should be

-straight forward. For instance, Gnome3 shows a Bluetooth icon in the upper

-right corner of the desktop where one selects <em>Set up New Device</em>. This

-should show a dialog where one can select the dive computer (which already

-should be in Bluetooth mode) and pair it.  If a PIN is required, try

-manually setting <em>0000</em>.</p></div>

-<div class="paragraph"><p>In the rare cases where the above is not true, then depending on your

-system, try <code>initd</code> or <code>systemd</code>. This might be different and also involve

-loading modules specific to your hardware. In case your system is running

-<code>systemd</code>, manually run <code>systemctl start bluetooth.service</code> to enable it, in

-case of <code>initd</code>, run something like <code>rc.config start bluetoothd</code> or

-<code>/etc/init.d/bluetooth start</code>.</p></div>

-<div class="paragraph"><p>One may also use a manual approach by using such commands:</p></div>

-<div class="ulist"><ul>

-<li>

-<p>

-<code>hciconfig</code> shows the Bluetooth devices available on your computer (not dive

-   computer), most likely one will see a hci0, if not try <code>hcitool -a</code> to see

-   inactive devices and run <code>sudo hciconfig hci0 up</code> to bring them up.

-</p>

-</li>

-<li>

-<p>

-<code>hcitool scanning</code> gets a list of bluetooth enabled client devices, look for

-   the dive computer and remember the MAC address are shown there

-</p>

-</li>

-<li>

-<p>

-<code>bluez-simple-agent hci0 10:00:E8:C4:BE:C4</code> pairs the dive computer with the

-   bluetooth stack of the <em>Subsurface</em> computer, copy/paste the MAC address

-   from the output of <em>hcitool scanning</em>

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>Unfortunately on Linux binding to a communication device has to be done

-manually by running:</p></div>

-<div class="ulist"><ul>

-<li>

-<p>

-<code>rfcomm bind /dev/rfcomm0 10:00:E8:C4:BE:C4</code> binds the dive computer to a

-   communication device in the desktop computer, in case rfcomm is already

-   taken use rfcomm1 or up. IMPORTANT: Copy/paste the MAC address from the

-   output of <code>hcitool scanning</code>, the MAC address shown above will not work.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>For downloading dives in <em>Subsurface</em> specify the device name connected to

-the MAC address in the last step above, e.g. <em>/dev/rfcomm0</em>.</p></div>

-</div>

-</div>

-</div>

+</p>
+</li>
+</ul></div>
+<div class="sect3">
+<h4 id="_sur_windows">15.3.1. Sur Windows :</h4>
+<div class="paragraph"><p>Bluetooth is most likely already enabled. For pairing with the dive computer
+choose <em>Control Panel &#8594; Bluetooth Devices &#8594; Add Wireless Device</em>.  This
+should bring up a dialog showing your dive computer (which should be in
+Bluetooth mode) and allowing pairing. Right click on it and choose
+<em>Properties&#8594; COM Ports</em> to identify the port used for your dive
+computer. If there are several ports listed, use the one saying "Outgoing"
+instead of "Incoming".</p></div>
+<div class="paragraph"><p>For downloading to <em>Subsurface</em>, the <em>Subsurface</em> drop-down list should
+contain this COM port already. If not, enter it manually.</p></div>
+<div class="paragraph"><p>Note: If there are issues afterwards when downloading from the dive computer
+using other software, remove the existing pairing with the dive computer.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_sur_macos">15.3.2. Sur MacOS :</h4>
+<div class="paragraph"><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up Bluetooth
+Device&#8230;</em>. The dive computer should then show up in the list of
+devices. Select it and go through the pairing process. This step should only
+be needed once for initial setup.</p></div>
+<div class="paragraph"><p>Once the pairing is completed the correct device is shown in the <em>Device or
+Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_sur_linux">15.3.3. Sur Linux</h4>
+<div class="paragraph"><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.  On most common
+distributions this should be true out of the box and pairing should be
+straight forward. For instance, Gnome3 shows a Bluetooth icon on the right
+of the toolbar at the top of the screen.  Users have reported difficulties
+with some Bluetooth controllers.  If you have an onboard controller, try
+that first.  It is simplest if you remove any USB Bluetooth dongles.  If you
+have a USB dongle that came with your dive computer, try that before any
+others.</p></div>
+<div class="paragraph"><p>Setting up a connection to download dives from your Bluetooth-enabled
+device, such as the <em>Shearwater Petrel</em>, is not yet an automated process and
+will generally require the command prompt.  It is essentially a three step
+process.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Enable the Bluetooth controller and pair your dive computer&lt;/li&gt;
+</p>
+</li>
+<li>
+<p>
+Establish an RFCOMM connection
+</p>
+</li>
+<li>
+<p>
+Download the dives with Subsurface
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em> and
+<em>Petrel 2</em>, cycle through the menu, select <em>Dive Log</em>, then <em>Upload Log</em>.
+The display will read <em>Initializing</em>, then <em>Wait PC 3:00</em> and will
+countdown.  Once the connection is established, the display reads <em>Wait CMD
+&#8230;</em> and the countdown continues. When downloading the dive from Subsurface,
+the display reads <em>Sending</em> then <em>Sent Dive</em>.</p></div>
+<div class="paragraph"><p>To establish the connection, establish root access through <code>sudo</code> or <code>su</code>.
+The correct permission is required to download the dives in the computer. On
+most Linux systems this means becoming a member of the dialout group (This
+is identical as for many dive computers using a Linux USB port, descibed in
+the previous section). On the command terminal, enter:</p></div>
+<div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div>
+<div class="paragraph"><p>Then log out and log in for the change to take effect.</p></div>
+<div class="sect4">
+<h5 id="_enabling_the_bluetooth_controller_and_pairing_your_dive_computer">Enabling the Bluetooth controller and pairing your dive computer</h5>
+<div class="paragraph"><p>Attempt to set up the Bluetooth controller and pair your dive computer using
+the graphical environment of the operating system. After setting the dive
+computer to upload mode, click the Bluetooth icon in the system tray and
+select <em>Add new device</em>. The dive computer should appear. If asked for a
+password, enter 0000.  Write down or copy the MAC address of your dive
+computer - this needed later and should be in the form  00:11:22:33:44:55.</p></div>
+<div class="paragraph"><p>If the graphical method didn&#8217;t work, pair the device from the command
+line. Open a terminal and use <code>hciconfig</code> to check the Bluetooth controller
+status</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>$ hciconfig
+hci0:   Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *DOWN*
+        RX bytes:504 acl:0 sco:0 events:22 errors:0
+        TX bytes:92 acl:0 sco:0 commands:21 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p>This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB,
+connected as hci0.  Its status is <em>DOWN</em>, i.e. not powered.  Additional
+controllers will appear as hci1, etc.  If there is not a Bluetooth dongle
+plugged in upon booting the computer, hci0 is probably the onboard.  Now
+power on the controller and enable authentication:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci0 up auth+  (enter password when prompted)
+hciconfig
+hci0:  Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *UP RUNNING PSCAN AUTH*
+        RX bytes:1026 acl:0 sco:0 events:47 errors:0
+        TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p><code>Check that the status now includes +<em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div>
+<div class="paragraph"><p>If there are multiple controllers running, it&#8217;s easiest to off the unused
+controller(s). For example, for <code>hci1</code>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci1 down</code></pre>
+</div></div>
+<div class="paragraph"><p>Next step is to <em>trust</em> and <em>pair</em> the dive computer. On distros with Bluez
+5, such as Fedora 22, one can use a tool called <code>blutootctl</code>, which will
+bring up its own command prompt.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>bluetoothctl
+[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]
+[bluetooth]# agent on
+Agent registered
+[bluetooth]# default-agent
+Default agent request successful
+[bluetooth]# scan on                        &lt;----now set your dive computer to upload mode
+Discovery started
+[CHG] Controller 01:23:45:67:89:AB Discovering: yes
+[NEW] Device 00:11:22:33:44:55 Petrel
+[bluetooth]# trust 00:11:22:33:44:55        &lt;----you can use the tab key to autocomplete the MAC address
+[CHG] Device 00:11:22:33:44:55 Trusted: yes
+Changing 00:11:22:33:44:55 trust succeeded
+[bluetooth]# pair 00:11:22:33:44:55
+Attempting to pair with 00:11:22:33:44:55
+[CHG] Device 00:11:22:33:44:55 Connected: yes
+[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345
+[CHG] Device 00:11:22:33:44:55 Paired: yes
+Pairing successful
+[CHG] Device 00:11:22:33:44:55 Connected: no</code></pre>
+</div></div>
+<div class="paragraph"><p>If asked for a password, enter 0000. It&#8217;s ok if the last line says
+<em>Connected: no</em>. The important part is the line above, <code>Pairing successful</code>.</p></div>
+<div class="paragraph"><p>If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04),
+there is probably not a <code>bluetoothctl</code>, but a script called
+<code>bluez-simple-agent</code> or just <code>simple-agent</code>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>hcitool -i hci0 scanning
+Scanning ...
+        00:11:22:33:44:55       Petrel
+        bluez-simple-agent hci0 00:11:22:33:44:55</code></pre>
+</div></div>
+<div class="paragraph"><p>Once ther dive computer is pired, set up the RFCOMM connection</p></div>
+</div>
+<div class="sect4">
+<h5 id="_establishing_the_rfcomm_connection">Establishing the RFCOMM connection</h5>
+<div class="paragraph"><p>The command to establish an RFCOMM connection is:</p></div>
+<div class="paragraph"><p><code>sudo rfcomm -i &lt;controller&gt; connect &lt;dev&gt; &lt;bdaddr&gt; [channel]</code></p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+&lt;controller&gt;+ is the Bluetooth controller, <code>hci0</code>.
+</p>
+</li>
+<li>
+<p>
+&lt;dev&gt; is the RFCOMM device file, <code>rfcomm0</code>
+</p>
+</li>
+<li>
+<p>
+&lt;bdaddr&gt; is the dive computer&#8217;s MAC address, <code>00:11:22:33:44:55</code>
+</p>
+</li>
+<li>
+<p>
+[channel] is the dive computer&#8217;s Bluetooth channel we need to connect to.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>If one omits it, channel 1 is assumed.  Based on a limited number of user
+reports, the appropriate channel for the dive computer is probably:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Shearwater Petrel 2</em>: channel 5
+</p>
+</li>
+<li>
+<p>
+<em>Shearwater Petrel 1</em>: channel 1
+</p>
+</li>
+<li>
+<p>
+<em>Heinrichs-Weikamp OSTC Sport</em>: channel 1
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>E.g. to connect a <em>Shearwater Petrel 2</em>, set the dive computer to upload
+mode and enter:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)</code></pre>
+</div></div>
+<div class="paragraph"><p>This gives the response:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive
+computer to upload mode and enter:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)
+Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>If the specific channel the dive computer needs is not known, or the channel
+in the list above doesn&#8217;t work, the command <code>sdptool records</code> should help
+determine the appropriate channel. The output below is for a <em>Shearwater
+Petrel 2</em>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sdptool -i hci0 records 00:11:22:33:44:55
+Service Name: Serial Port
+Service RecHandle: 0x10000
+Service Class ID List:
+        "Serial Port" (0x1101)
+        Protocol Descriptor List:
+        "L2CAP" (0x0100)
+        "RFCOMM" (0x0003)
+        Channel: 5</code></pre>
+</div></div>
+<div class="paragraph"><p>For a Bluetooth dive computer not in the list above, or if the channel
+listed is not correct, please let the Subsurface developers know on the user
+forum or the developer mailing list <em>subsurface@subsurface-divelog.org</em>.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_download_the_dives_with_subsurface_lt_em_gt">Download the dives with Subsurface&lt;/em&gt;</h5>
+<div class="paragraph"><p>After establishing the RFCOMM connection and while the dive computer&#8217;s
+upload mode countdown is still running, go to_Subsurface_, select
+<em>Import&#8594;Import from dive computer</em> and enter appropriate Vendor
+(e.g. <em>Shearwater</em>), Dive Computer (<em>Petrel</em>), Device or Mount Point
+(<em>/dev/rfcomm0</em>) and click <em>Download</em>.</p></div>
+</div>
+</div>
+</div>
+</div>
+</div>
 <div class="sect1">

 <h2 id="_appendix_b_dive_computer_specific_information_for_importing_dive_information">16. APPENDIX B: Dive Computer specific information for importing dive data.</h2>

 <div class="sectionbody">

@@ -5204,13 +5395,16 @@ name from the console as follows: <code>irattach irda0</code></td>
 </tr></table>

 </div>

 <div class="paragraph"><p>After executing this command, Subsurface will recognise the Galileo dive

-computer and download dive information.</p></div>

-<div class="paragraph"><p>Under Windows, a similar situation exists. Drivers for the MCS7780 are

-available from some Internet web sites e.g.

-<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.</p></div>

-<div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not available

-for OSX 10.6 or higher.</p></div>

-</div>

+computer and download dive information.</p></div>
+<div class="paragraph"><p>Under Windows, a similar situation exists. Drivers for the MCS7780 are
+available from some Internet web sites e.g.
+<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.
+Windows-based IrDA drivers for the Uwatec can also be downloaded from the
+ScubaPro web site, drivers being located on the download page for the
+ScubaPro SmartTrak software.</p></div>
+<div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not available
+for OSX 10.6 or higher.</p></div>
+</div>
 <div class="sect2">

 <h3 id="S_ImportingDR5">16.3. Importing from Heinrichs Weikamp DR5</h3>

 <div class="admonitionblock">

@@ -5460,9 +5654,9 @@ Within the list of dives, select the dives you would like to import later:
 </p>

 <div class="ulist"><ul>

 <li>

-<p>

-To select certain dives: hold <em>ctrl</em> and click the dive

-</p>

+<p>
+To select certain dives: hold <em>ctrl</em> and click the dive
+</p>
 </li>
 <li>
 <p>
@@ -5471,9 +5665,9 @@ To select all dives: Select the first dive, hold down shift and select the
 </p>
 </li>
 </ul></div>
-</li>

-<li>

-<p>

+</li>
+<li>
+<p>
 With the dives marked, use the program menu <em>File &#8594; Export</em>

 </p>

 </li>

@@ -5700,39 +5894,41 @@ information for each dive is stored in a single row.  <em>Subsurface</em> suppor
 many data items (Dive #, Date, Time, Duration, Location, GPS, Max Depth,

 Mean Depth, Buddy, Notes, Weight and Tags).  The user can organize dive data

 following a few simple rules:</p></div>

-<div class="olist arabic"><ol class="arabic">

-<li>

-<p>

-Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy

-</p>

-</li>

-<li>

-<p>

-Duration: the format should be minutes:seconds.

-</p>

-</li>

-<li>

+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa
+</p>
+</li>
+<li>
+<p>
+Durée : le format est minutes:secondes.
+</p>
+</li>
+<li>
 <p>

 Unit system: only one unit system should be used (i.e., no mixture between

    imperial and metric units)

 </p>

-</li>

-<li>

-<p>

-Tags and buddies: values should be separated using a comma.

-</p>

-</li>

-<li>

-<p>

-GPS position: users must use decimal degrees, e.g. 30.22496 30.821798

-</p>

-</li>

-</ol></div>

-<div class="sect2">

-<h3 id="_em_libreoffice_calc_em_and_em_openoffice_calc_em">18.1. <em>LibreOffice Calc</em> and <em>OpenOffice Calc</em></h3>

-<div class="paragraph"><p>These are open source spreadsheet applications forming parts of larger open

-source office suite applications. The user interaction with <em>LibreOffice</em>

-and <em>OpenOffice</em> is very similar.  In Libreoffice Calc the time format

+</li>
+<li>
+<p>
+Étiquettes et équipiers : les valeurs doivent être séparées par des
+   virgules.
+</p>
+</li>
+<li>
+<p>
+Position GPS : vous devez utiliser les degrés décimaux, par exemple :
+   30.22496 30.821798
+</p>
+</li>
+</ol></div>
+<div class="sect2">
+<h3 id="_em_libreoffice_calc_em_et_em_openoffice_calc_em">18.1. <em>LibreOffice Calc</em> et <em>OpenOffice Calc</em></h3>
+<div class="paragraph"><p>These are open source spreadsheet applications forming parts of larger open
+source office suite applications. The user interaction with <em>LibreOffice</em>
+and <em>OpenOffice</em> is very similar.  In Libreoffice Calc the time format
 should be set to minutes:seconds - [mm]:ss and dates should be set to one

 of: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy. A typical dive log may look like

 this:</p></div>

@@ -5881,16 +6077,16 @@ because you have fifty minutes worth of samples - but subsurface will say
 it&#8217;s 45 minutes - because you were actually diving for 45 minutes.  It&#8217;s

 even more noticeable if you do things like divemastering the initial OW

 dives, when you may stay in the water for a long time, but spend most of it

-at the surface. And then you don&#8217;t want that to count as some kind of long

-dive”.</p></div>

-</div>

+at the surface. And then you don&#8217;t want that to count as some kind of long
+dive”.</p></div>
+</div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-05-18 11:34:51 CEST
+Last updated 2015-05-28 16:14:18 CEST
 </div>
 </div>
 </body>
diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt
index 2a023f563..5acf5d2f6 100644
--- a/Documentation/user-manual_fr.txt
+++ b/Documentation/user-manual_fr.txt
@@ -1664,7 +1664,7 @@ tab only shows the file names of the photos. This is normal behaviour.  If,
 later, the external drive with the photos is connected again, the photos can
 be seen in the normal way.
 
-[[Moving_images]]
+[[S_FindMovedImages]]
 ==== Moving photographs among directories, hard disks or computers
 
 After a photograph has been loaded into _Subsurface_ and associated with a specific dive, the directory
@@ -3434,6 +3434,10 @@ des sections de ce manuel traitant des opérations relatives.
   formats.
 - <<S_PrintDivelog,_Imprimer_>> - Imprimer le carnet de plongée actuellement
   ouvert.
+- <<S_FindMovedImages, _Find moved images_>> - If photos taken during dives
+  have been moved to
+      a different disk or directory, locate them and link them to the appropriate
+      dives.
 - <<S_Preferences,_Préférences_>> - Définir les  préférences de _Subsurface_.
 - <<S_Configure,_Configurer l'ordinateur de plongée_>> - Modifier la
   configuration d'un ordinateur de plongée.
@@ -3454,10 +3458,12 @@ des sections de ce manuel traitant des opérations relatives.
 === Journal (log)
 - <<S_EnterData,_Ajouter une plongée_>> -  Ajouter manuellement une nouvelle
   plongée au panneau de la *liste des plongées*.
+- _Edit dive_ - Edit a dive of which the profile was entered by hande and not
+  from a dive computer.
 - <<S_DivePlanner,_Planifier une plongée_>> - Cette fonctionnalité permet de
   planifier des plongées.
-- <<S_Replan,_Replanifier une plongée_>> - Modifier une plongée planifiée qui
-  a été enregistrée dans la *liste des plongées*.
+- <<S_Replan,_Modifier la plongée dans le planificateur_>> - Modifier une
+  plongée planifiée qui a été enregistrée dans la *liste des plongées*.
 - <<S_CopyComponents,_Copier les composants de la plongée_>> - En
   sélectionnant cette option, vous pouvez copier les informations de plusieurs
   champs d'un journal de plongée vers le presse-papier.
@@ -3620,14 +3626,15 @@ Log_ and wait for the _Wait PC_ message.
 
  * *Pair the _Subsurface_ computer with the dive computer.*
 
-.Sur Windows :
+==== Sur Windows :
 
 Bluetooth is most likely already enabled. For pairing with the dive computer
 choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_.  This
-should bring up a dialog showing your dive computer (in Bluetooth mode) and
-allowing pairing. Right click on it and choose _Propertie s-> COM Ports_ to
-identify the port used for your dive computer. If there are several ports
-listed, use the one saying "Outgoing" instead of "Incoming".
+should bring up a dialog showing your dive computer (which should be in
+Bluetooth mode) and allowing pairing. Right click on it and choose
+_Properties-> COM Ports_ to identify the port used for your dive
+computer. If there are several ports listed, use the one saying "Outgoing"
+instead of "Incoming".
 
 For downloading to _Subsurface_, the _Subsurface_ drop-down list should
 contain this COM port already. If not, enter it manually.
@@ -3635,7 +3642,7 @@ contain this COM port already. If not, enter it manually.
 Note: If there are issues afterwards when downloading from the dive computer
 using other software, remove the existing pairing with the dive computer.
 
-.Sur MacOS :
+==== Sur MacOS :
 
 Click on the Bluetooth symbol in the menu bar and select _Set up Bluetooth
 Device..._. The dive computer should then show up in the list of
@@ -3645,45 +3652,182 @@ be needed once for initial setup.
 Once the pairing is completed the correct device is shown in the 'Device or
 Mount Point' drop-down in the _Subsurface_ *Import* dialog.
 
-.Sur Linux
+==== Sur Linux
 Ensure Bluetooth is enabled on the _Subsurface_ computer.  On most common
 distributions this should be true out of the box and pairing should be
-straight forward. For instance, Gnome3 shows a Bluetooth icon in the upper
-right corner of the desktop where one selects 'Set up New Device'. This
-should show a dialog where one can select the dive computer (which already
-should be in Bluetooth mode) and pair it.  If a PIN is required, try
-manually setting '0000'.
-
-In the rare cases where the above is not true, then depending on your
-system, try +initd+ or +systemd+. This might be different and also involve
-loading modules specific to your hardware. In case your system is running
-+systemd+, manually run +systemctl start bluetooth.service+ to enable it, in
-case of +initd+, run something like +rc.config start bluetoothd+ or
-+/etc/init.d/bluetooth start+.
-
-One may also use a manual approach by using such commands:
-
- * +hciconfig+ shows the Bluetooth devices available on your computer (not dive
-   computer), most likely one will see a hci0, if not try +hcitool -a+ to see
-   inactive devices and run +sudo hciconfig hci0 up+ to bring them up.
-
- * +hcitool scanning+ gets a list of bluetooth enabled client devices, look for
-   the dive computer and remember the MAC address are shown there
-
- * +bluez-simple-agent hci0 10:00:E8:C4:BE:C4+ pairs the dive computer with the
-   bluetooth stack of the _Subsurface_ computer, copy/paste the MAC address
-   from the output of 'hcitool scanning'
-
-Unfortunately on Linux binding to a communication device has to be done
-manually by running:
-
- * +rfcomm bind /dev/rfcomm0 10:00:E8:C4:BE:C4+ binds the dive computer to a
-   communication device in the desktop computer, in case rfcomm is already
-   taken use rfcomm1 or up. IMPORTANT: Copy/paste the MAC address from the
-   output of +hcitool scanning+, the MAC address shown above will not work.
+straight forward. For instance, Gnome3 shows a Bluetooth icon on the right
+of the toolbar at the top of the screen.  Users have reported difficulties
+with some Bluetooth controllers.  If you have an onboard controller, try
+that first.  It is simplest if you remove any USB Bluetooth dongles.  If you
+have a USB dongle that came with your dive computer, try that before any
+others.
+
+Setting up a connection to download dives from your Bluetooth-enabled
+device, such as the _Shearwater Petrel_, is not yet an automated process and
+will generally require the command prompt.  It is essentially a three step
+process.
 
-For downloading dives in _Subsurface_ specify the device name connected to
-the MAC address in the last step above, e.g. _/dev/rfcomm0_.
+ - Enable the Bluetooth controller and pair your dive computer</li>
+ - Establish an RFCOMM connection
+ - Download the dives with Subsurface
+
+Ensure the dive computer is in upload mode. On the _Shearwater Petrel_ and
+_Petrel 2_, cycle through the menu, select 'Dive Log', then 'Upload Log'.
+The display will read 'Initializing', then 'Wait PC 3:00' and will
+countdown.  Once the connection is established, the display reads 'Wait CMD
+...' and the countdown continues. When downloading the dive from Subsurface,
+the display reads 'Sending' then 'Sent Dive'.
+
+To establish the connection, establish root access through +sudo+ or +su+.
+The correct permission is required to download the dives in the computer. On
+most Linux systems this means becoming a member of the dialout group (This
+is identical as for many dive computers using a Linux USB port, descibed in
+the previous section). On the command terminal, enter:
+
++sudo usermod -a -G dialout username+
+
+Then log out and log in for the change to take effect.
+
+===== Enabling the Bluetooth controller and pairing your dive computer
+
+Attempt to set up the Bluetooth controller and pair your dive computer using
+the graphical environment of the operating system. After setting the dive
+computer to upload mode, click the Bluetooth icon in the system tray and
+select 'Add new device'. The dive computer should appear. If asked for a
+password, enter 0000.  Write down or copy the MAC address of your dive
+computer - this needed later and should be in the form 	00:11:22:33:44:55.
+
+If the graphical method didn't work, pair the device from the command
+line. Open a terminal and use +hciconfig+ to check the Bluetooth controller
+status
+
+	$ hciconfig
+	hci0:	Type: BR/EDR  Bus: USB
+		BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+		*DOWN*
+		RX bytes:504 acl:0 sco:0 events:22 errors:0
+		TX bytes:92 acl:0 sco:0 commands:21 errors:0
+
+This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB,
+connected as hci0.  Its status is 'DOWN', i.e. not powered.  Additional
+controllers will appear as hci1, etc.  If there is not a Bluetooth dongle
+plugged in upon booting the computer, hci0 is probably the onboard.  Now
+power on the controller and enable authentication:
+
+	sudo hciconfig hci0 up auth+  (enter password when prompted)
+	hciconfig
+	hci0:  Type: BR/EDR  Bus: USB
+		BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+		*UP RUNNING PSCAN AUTH*
+		RX bytes:1026 acl:0 sco:0 events:47 errors:0
+		TX bytes:449 acl:0 sco:0 commands:46 errors:0
+
++Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+.
+
+If there are multiple controllers running, it's easiest to off the unused
+controller(s). For example, for +hci1+:
+
+	sudo hciconfig hci1 down
+
+Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez
+5, such as Fedora 22, one can use a tool called +blutootctl+, which will
+bring up its own command prompt.
+
+	bluetoothctl
+	[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]
+	[bluetooth]# agent on
+	Agent registered
+	[bluetooth]# default-agent
+	Default agent request successful
+	[bluetooth]# scan on                        <----now set your dive computer to upload mode
+	Discovery started
+	[CHG] Controller 01:23:45:67:89:AB Discovering: yes
+	[NEW] Device 00:11:22:33:44:55 Petrel
+	[bluetooth]# trust 00:11:22:33:44:55        <----you can use the tab key to autocomplete the MAC address
+	[CHG] Device 00:11:22:33:44:55 Trusted: yes
+	Changing 00:11:22:33:44:55 trust succeeded
+	[bluetooth]# pair 00:11:22:33:44:55
+	Attempting to pair with 00:11:22:33:44:55
+	[CHG] Device 00:11:22:33:44:55 Connected: yes
+	[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345
+	[CHG] Device 00:11:22:33:44:55 Paired: yes
+	Pairing successful
+	[CHG] Device 00:11:22:33:44:55 Connected: no
+
+If asked for a password, enter 0000. It's ok if the last line says
+'Connected: no'. The important part is the line above, +Pairing successful+.
+
+If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04),
+there is probably not a +bluetoothctl+, but a script called
++bluez-simple-agent+ or just +simple-agent+.
+
+	hcitool -i hci0 scanning
+	Scanning ...
+		00:11:22:33:44:55       Petrel
+		bluez-simple-agent hci0 00:11:22:33:44:55
+
+Once ther dive computer is pired, set up the RFCOMM connection
+
+===== Establishing the RFCOMM connection
+
+The command to establish an RFCOMM connection is:
+
++sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+
+
+- <controller>+ is the Bluetooth controller, +hci0+.
+- <dev> is the RFCOMM device file, +rfcomm0+
+- <bdaddr> is the dive computer's MAC address, +00:11:22:33:44:55+
+- [channel] is the dive computer's Bluetooth channel we need to connect to.
+
+If one omits it, channel 1 is assumed.  Based on a limited number of user
+reports, the appropriate channel for the dive computer is probably:
+
+- _Shearwater Petrel 2_: channel 5
+- _Shearwater Petrel 1_: channel 1
+- _Heinrichs-Weikamp OSTC Sport_: channel 1
+
+E.g. to connect a _Shearwater Petrel 2_, set the dive computer to upload
+mode and enter:
+
+	sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)
+
+This gives the response:
+
+	Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5
+	Press CTRL-C for hangup
+
+To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive
+computer to upload mode and enter:
+
+	sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)
+	Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1
+	Press CTRL-C for hangup
+
+If the specific channel the dive computer needs is not known, or the channel
+in the list above doesn't work, the command +sdptool records+ should help
+determine the appropriate channel. The output below is for a _Shearwater
+Petrel 2_.
+
+	sdptool -i hci0 records 00:11:22:33:44:55
+	Service Name: Serial Port
+	Service RecHandle: 0x10000
+	Service Class ID List:
+		"Serial Port" (0x1101)
+		Protocol Descriptor List:
+		"L2CAP" (0x0100)
+		"RFCOMM" (0x0003)
+		Channel: 5
+
+For a Bluetooth dive computer not in the list above, or if the channel
+listed is not correct, please let the Subsurface developers know on the user
+forum or the developer mailing list _subsurface@subsurface-divelog.org_.
+
+===== Download the dives with Subsurface</em>
+After establishing the RFCOMM connection and while the dive computer's
+upload mode countdown is still running, go to_Subsurface_, select
+_Import->Import from dive computer_ and enter appropriate Vendor
+(e.g. _Shearwater_), Dive Computer (_Petrel_), Device or Mount Point
+(_/dev/rfcomm0_) and click _Download_.
 
 [[_appendix_b_dive_computer_specific_information_for_importing_dive_information]]
 
@@ -3743,6 +3887,9 @@ computer and download dive information.
 Under Windows, a similar situation exists. Drivers for the MCS7780 are
 available from some Internet web sites e.g.
 http://www.drivers-download.com/Drv/MosChip/MCS7780/[www.drivers-download.com].
+Windows-based IrDA drivers for the Uwatec can also be downloaded from the
+ScubaPro web site, drivers being located on the download page for the
+ScubaPro SmartTrak software.
 
 For the Apple Mac, IrDA communication via the MCS7780 link is not available
 for OSX 10.6 or higher.
@@ -3990,14 +4137,16 @@ many data items (Dive #, Date, Time, Duration, Location, GPS, Max Depth,
 Mean Depth, Buddy, Notes, Weight and Tags).  The user can organize dive data
 following a few simple rules:
 
-1. Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy
-2. Duration: the format should be minutes:seconds.
+1. Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa
+2. Durée : le format est minutes:secondes.
 3. Unit system: only one unit system should be used (i.e., no mixture between
    imperial and metric units)
-4. Tags and buddies: values should be separated using a comma.
-5. GPS position: users must use decimal degrees, e.g. 30.22496 30.821798
+4. Étiquettes et équipiers : les valeurs doivent être séparées par des
+   virgules.
+5. Position GPS : vous devez utiliser les degrés décimaux, par exemple :
+   30.22496 30.821798
 
-=== _LibreOffice Calc_ and _OpenOffice Calc_
+=== _LibreOffice Calc_ et _OpenOffice Calc_
 
 These are open source spreadsheet applications forming parts of larger open
 source office suite applications. The user interaction with _LibreOffice_