diff options
| -rw-r--r-- | Documentation/50-pot/subsurface-mobile-manual.pot | 475 | ||||
| -rw-r--r-- | Documentation/50-pot/subsurface-user-manual.pot | 777 | ||||
| -rw-r--r-- | Documentation/fr/po/subsurface-mobile-manual.fr.po | 512 | ||||
| -rw-r--r-- | Documentation/fr/po/subsurface-user-manual.fr.po | 2413 | ||||
| -rw-r--r-- | Documentation/mobile-manual_fr.html.git | 275 | ||||
| -rw-r--r-- | Documentation/mobile-manual_fr.txt | 231 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.html.git | 1766 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.txt | 19 |
8 files changed, 3748 insertions, 2720 deletions
diff --git a/Documentation/50-pot/subsurface-mobile-manual.pot b/Documentation/50-pot/subsurface-mobile-manual.pot index f2aa4c1be..dab6f11c9 100644 --- a/Documentation/50-pot/subsurface-mobile-manual.pot +++ b/Documentation/50-pot/subsurface-mobile-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: 2017-07-04 13:37+0200\n" +"POT-Creation-Date: 2017-10-11 10:20+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" @@ -19,34 +19,34 @@ msgstr "" #. :website: http://subsurface-divelog.org #. type: Target for macro image -#: mobile-manual.txt:12 +#: mobile-manual.txt:13 #, no-wrap msgid "mobile-images/banner.jpg" msgstr "" #. type: Plain text -#: mobile-manual.txt:15 +#: mobile-manual.txt:16 msgid "[big]#Subsurface-mobile USER MANUAL#" msgstr "" #. type: Plain text -#: mobile-manual.txt:17 +#: mobile-manual.txt:18 #, no-wrap -msgid "*Manual author*: Willem Ferguson\n" +msgid "*Manual authors*: Willem Ferguson, Dirk Hohndel\n" msgstr "" #. type: Plain text -#: mobile-manual.txt:19 +#: mobile-manual.txt:20 msgid "toc::[]" msgstr "" #. type: Plain text -#: mobile-manual.txt:21 -msgid "[blue]#_Version 1.1, September 2016_#" +#: mobile-manual.txt:22 +msgid "[blue]#_Version 2, July 2017_#" msgstr "" #. type: Plain text -#: mobile-manual.txt:29 +#: mobile-manual.txt:30 msgid "" "Welcome as a user of _Subsurface_, advanced dive logging software with " "extensive infrastructure to describe, organize, interpret and print scuba " @@ -58,111 +58,116 @@ msgid "" msgstr "" #. type: Title - -#: mobile-manual.txt:31 +#: mobile-manual.txt:32 #, no-wrap msgid "Introducing Subsurface-mobile" msgstr "" #. type: Plain text -#: mobile-manual.txt:39 +#: mobile-manual.txt:40 msgid "" "_Subsurface-mobile_ is an extension of _Subsurface_ which runs on Android " -"smartphone and tablet devices and is a tool for viewing or sharing dive " -"information at dive sites where a larger computer is not " +"and iOS smartphone and tablet devices and is a tool for viewing or sharing " +"dive information at dive sites where a larger computer is not " "useful. _Subsurface-mobile_ for Android also allows the gathering of GPS " "locations where dives are performed (Subsurface-mobile for iOS currently " -"does not support GPS functionality)." +"does not have full functionality)." msgstr "" #. type: Plain text -#: mobile-manual.txt:51 +#: mobile-manual.txt:52 msgid "" "_Subsurface-mobile_ allows you to enter and save dive information using a " -"mobile device. Most users of _Subsurface-mobile_ typically use the mobile " -"app as an extension to the laptop/desktop version of _Subsurface_. This " -"allows the storage of dive logs on the Internet sharing them between the " -"mobile and the desktop versions. But _Subsurface-mobile_ can be used " -"independently of _Subsurface_ and does not require the use of cloud " -"storage. While the desktop version of _Subsurface_ shows much more detailed " -"information for each dive, the mobile version allows a more accessible dive " -"log on a dive trip, useful for proving dive experience to dive shops or to " -"review previous dives." +"mobile device. Users of _Subsurface-mobile_ typically use the mobile app as " +"an extension to the laptop/desktop version of _Subsurface_ that allows the " +"storage of dive logs on the Internet and sharing them between the mobile and " +"the desktop versions. But _Subsurface-mobile_ can also be used independently " +"of _Subsurface_ and does not require the use of cloud storage. While the " +"desktop version of _Subsurface_ shows much more detailed information for " +"each dive, the mobile version allows a more accessible dive log on a dive " +"trip, useful for proving dive experience to dive shops or to review previous " +"dives." msgstr "" #. type: Plain text -#: mobile-manual.txt:53 +#: mobile-manual.txt:54 msgid "_Subsurface-mobile_ allows you to:" msgstr "" #. type: Plain text -#: mobile-manual.txt:55 +#: mobile-manual.txt:56 msgid "Download existing dive log information from the Internet." msgstr "" #. type: Plain text -#: mobile-manual.txt:56 +#: mobile-manual.txt:57 msgid "View this information on a mobile device." msgstr "" #. type: Plain text -#: mobile-manual.txt:58 +#: mobile-manual.txt:59 msgid "" "Edit many of the dive log data fields, e.g. divemaster, buddy, equipment or " "notes about a dive." msgstr "" #. type: Plain text -#: mobile-manual.txt:59 +#: mobile-manual.txt:60 msgid "Manually create and add new dive records to your dive log." msgstr "" #. type: Plain text -#: mobile-manual.txt:60 +#: mobile-manual.txt:61 +msgid "Download dive data directly from many dive computers." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:62 msgid "Store the updated dive log in the _Subsurface_ cloud storage." msgstr "" #. type: Plain text -#: mobile-manual.txt:61 +#: mobile-manual.txt:63 msgid "Record, store and apply GPS positions of dives (Android only)." msgstr "" #. type: Plain text -#: mobile-manual.txt:63 +#: mobile-manual.txt:65 msgid "View the localities of recorded GPS positions and of dives on a map." msgstr "" #. type: Plain text -#: mobile-manual.txt:70 +#: mobile-manual.txt:71 msgid "" -"These items are discussed in greater detail in the following text. What " -"_Subsurface-mobile_ does not support (at this time) is downloading dive data " -"directly from a dive computer. That still needs to be done using " -"_Subsurface_ on a desktop or laptop computer. We are investigating ways to " -"support downloading from a subset of the supported dive computers on Android " -"devices, but this is not yet ready for testing." +"These items are discussed in greater detail in the following text. " +"_Subsurface-mobile_ does not yet support download of dive data from all the " +"dive computers that the desktop/laptop version can: that still needs to be " +"done using _Subsurface_ on a desktop or laptop computer. Only a subset of " +"dive computers that use a FTDI USB interface or a Bluetooth/BTLE interface " +"are accessible by _Subsurface-mobile_." msgstr "" #. type: Title == -#: mobile-manual.txt:71 +#: mobile-manual.txt:72 #, no-wrap msgid "Installing _Subsurface-mobile_ on your mobile device" msgstr "" #. type: Plain text -#: mobile-manual.txt:75 +#: mobile-manual.txt:76 msgid "" "Find _Subsurface-mobile_ in the _Google Play Store_ or the _iTunes Store_ " "and install it." msgstr "" #. type: Title == -#: mobile-manual.txt:76 +#: mobile-manual.txt:77 #, no-wrap msgid "Using _Subsurface-mobile_ for the first time" msgstr "" #. type: Plain text -#: mobile-manual.txt:82 +#: mobile-manual.txt:83 msgid "" "Upon starting _Subsurface-mobile_ for the first time, a Subsurface splash " "screen is shown while the program loads. On some devices this may take " @@ -171,34 +176,34 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:84 +#: mobile-manual.txt:85 msgid "" "Select whether _Subsurface-mobile_ should access the Internet for dive log " -"information." +"information as follows:" msgstr "" #. type: Title === -#: mobile-manual.txt:85 +#: mobile-manual.txt:86 #, no-wrap msgid "When NOT Using Cloud Storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:90 +#: mobile-manual.txt:91 msgid "" "Tap the striked-out cloud icon. The app will not access the _Subsurface_ " "cloud storage server to obtain dive log information. This means that dive " -"log information is manually entered and stored on the mobile device only." +"log information is stored on the mobile device only." msgstr "" #. type: Title === -#: mobile-manual.txt:91 +#: mobile-manual.txt:92 #, no-wrap msgid "Using Cloud Storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:95 +#: mobile-manual.txt:96 msgid "" "In order to use the _Subsurface_ cloud storage, an account on the cloud " "server is required. If you have already set up an account from the " @@ -206,18 +211,18 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:97 -msgid "You can also create a new account from your mobile device." +#: mobile-manual.txt:98 +msgid "You can also create a new cloud storage account from your mobile device." msgstr "" #. type: Title ==== -#: mobile-manual.txt:98 +#: mobile-manual.txt:99 #, no-wrap msgid "Using the desktop version of _Subsurface_:" msgstr "" #. type: Plain text -#: mobile-manual.txt:109 +#: mobile-manual.txt:110 #, no-wrap msgid "" "Open the desktop version of _Subsurface_ and\n" @@ -235,7 +240,7 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:118 +#: mobile-manual.txt:119 msgid "" "Once the dive list has been downloaded from the Internet, " "_Subsurface-mobile_ keeps a local copy on the mobile device. This means that " @@ -247,19 +252,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:120 +#: mobile-manual.txt:121 #, no-wrap msgid "mobile-images/Credentials.jpg" msgstr "" #. type: Title ==== -#: mobile-manual.txt:123 +#: mobile-manual.txt:124 #, no-wrap msgid "Using _Subsurface-mobile_:" msgstr "" #. type: Plain text -#: mobile-manual.txt:131 +#: mobile-manual.txt:132 msgid "" "Enter an e-mail address and a password in the fields indicated on the " "screen. The e-mail should be in lower case and the password should contain " @@ -272,14 +277,14 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:134 +#: mobile-manual.txt:135 msgid "" "Tap the Disk (Save) icon at the bottom of the screen. A PIN is sent to the " "e-mail address provided." msgstr "" #. type: Plain text -#: mobile-manual.txt:137 +#: mobile-manual.txt:138 msgid "" "Enter the PIN into the field indicated and tap the _Save_ icon again. The " "user information is stored on the cloud server and access to the cloud is " @@ -287,21 +292,21 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:141 +#: mobile-manual.txt:142 msgid "" -"The dive list is initially empty. You can now start entering dives in the " -"dive log or you can download existing dives from your _Subsurface_ cloud " -"storage account." +"The dive list is initially empty. Start entering dives in the dive log or " +"download dive information from either a _Subsurface_ cloud storage account " +"or from a dive computer." msgstr "" #. type: Title == -#: mobile-manual.txt:143 +#: mobile-manual.txt:144 #, no-wrap -msgid "A Few Remarks About The User Interface" +msgid "Menu Structure and User Interface" msgstr "" #. type: Plain text -#: mobile-manual.txt:152 +#: mobile-manual.txt:153 msgid "" "At the bottom of many Subsurface-mobile screens is a round button that " "provides for several actions and which allows the selection of the main " @@ -313,20 +318,20 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:155 +#: mobile-manual.txt:156 msgid "" "On iOS devices, on screens where a \"back\" action is enabled, a back arrow " "is shown in the top left corner of the screen." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:156 +#: mobile-manual.txt:157 #, no-wrap msgid "mobile-images/actionbutton.jpg" msgstr "" #. type: Plain text -#: mobile-manual.txt:164 +#: mobile-manual.txt:165 msgid "" "In order to have a consistent experience between iOS and Android, " "_Subsurface-mobile_ on Android does not use the traditional \"hamburger\" " @@ -337,40 +342,40 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:167 +#: mobile-manual.txt:168 msgid "" "Tap the \"hamburger\" symbol in the lower left corner of the screen (easy to " "reach for hand held devices)" msgstr "" #. type: Plain text -#: mobile-manual.txt:168 +#: mobile-manual.txt:169 msgid "Swipe towards the right across the left edge of the screen" msgstr "" #. type: Plain text -#: mobile-manual.txt:170 +#: mobile-manual.txt:171 msgid "Drag the action button visible on most screens to the right" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:171 +#: mobile-manual.txt:172 #, no-wrap -msgid "mobile-images/menu.jpg" +msgid "mobile-images/MainMenu2.jpg" msgstr "" #. type: Plain text -#: mobile-manual.txt:177 +#: mobile-manual.txt:179 msgid "" "The images above indicate some of the important features of the menu " -"system. On the left is the main menu that is activated as described " -"above. In the middle is the menu that opens if you tap the _GPS_ option on " -"the main menu. On the right is the menu that opens if you tap the _Manage " -"Dives_ option on the main menu." +"system. On the left is the main menu, activated as described above. On the " +"right, above, is a representation of the menu items of all the submenus " +"accessible from the main menu: the main menu items are shown on the left " +"while the submenu contents are shown on a blue background on the right." msgstr "" #. type: Plain text -#: mobile-manual.txt:181 +#: mobile-manual.txt:183 msgid "" "All screenshots in this user manual are currently from the Android " "version. As indicated earlier, the iOS version currently doesn't support " @@ -378,31 +383,31 @@ msgid "" msgstr "" #. type: Title == -#: mobile-manual.txt:182 +#: mobile-manual.txt:184 #, no-wrap msgid "Viewing the Dive List" msgstr "" #. type: Plain text -#: mobile-manual.txt:190 +#: mobile-manual.txt:193 msgid "" "Most of the actions of _Subsurface-mobile_ center around the dives on the " "dive list. While the dive list is loading from the cloud, a message appears " -"at the bottom of the screen, indicating that the cloud is being accessed " -"(see image on left, below). Once the list is loaded you can scroll up and " -"down. Tapping a dive on the list brings up a display of _Details View_ for " -"that dive (see image on right below). This includes the dive profile as " -"well as additional information and notes." +"at the bottom of the screen, indicating that the cloud is being " +"accessed. Once the list is loaded you can scroll up and down. Tapping a " +"dive on the list brings up a display of _Details View_ for that dive (see " +"image on right below). This includes the dive profile as well as additional " +"information and notes." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:191 +#: mobile-manual.txt:194 #, no-wrap msgid "mobile-images/DiveList.jpg" msgstr "" #. type: Plain text -#: mobile-manual.txt:199 +#: mobile-manual.txt:202 msgid "" "You can view other dives by swiping the _Details view_ to the right (for the " "previous dive) or to the left (following dive). Using the Action Bar, it is " @@ -412,13 +417,13 @@ msgid "" msgstr "" #. type: Title == -#: mobile-manual.txt:200 +#: mobile-manual.txt:204 #, no-wrap msgid "Editing dive details" msgstr "" #. type: Plain text -#: mobile-manual.txt:211 +#: mobile-manual.txt:215 msgid "" "At the bottom of the dive details screen the _Action Button_ contains a " "pencil (image on right, above). Tapping the pencil button brings up a panel " @@ -432,19 +437,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:212 +#: mobile-manual.txt:216 #, no-wrap msgid "mobile-images/EditDive.jpg" msgstr "" #. type: Title == -#: mobile-manual.txt:214 +#: mobile-manual.txt:219 #, no-wrap msgid "Adding a new dive to the dive list" msgstr "" #. type: Plain text -#: mobile-manual.txt:226 +#: mobile-manual.txt:231 msgid "" "You can manually add a dive to the existing dive list. On the dive list tap " "the \"plus\" sign in the _Action Button_, or use the main menu and tap " @@ -460,19 +465,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:227 +#: mobile-manual.txt:232 #, no-wrap msgid "mobile-images/ManuallyEnterDive.jpg" msgstr "" #. type: Title == -#: mobile-manual.txt:229 +#: mobile-manual.txt:234 #, no-wrap msgid "Deleting a dive" msgstr "" #. type: Plain text -#: mobile-manual.txt:235 +#: mobile-manual.txt:240 msgid "" "The _Details View_ of a dive has an Action Bar, including a dustbin. If this " "is tapped, the dive shown in the _Details View_ is deleted. You have a brief " @@ -481,13 +486,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:236 +#: mobile-manual.txt:241 #, no-wrap msgid "mobile-images/Delete_undo.jpg" msgstr "" #. type: Plain text -#: mobile-manual.txt:243 +#: mobile-manual.txt:248 msgid "" "You can also delete a dive from the dive list by long-pressing a specific " "dive until a red dustbin appears on the right-hand side (see image " @@ -498,65 +503,183 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:244 +#: mobile-manual.txt:249 #, no-wrap msgid "mobile-images/RedDustbin.jpg" msgstr "" #. type: Title == -#: mobile-manual.txt:246 +#: mobile-manual.txt:251 #, no-wrap -msgid "Dive log management" +msgid "Download dives from a dive computer" +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:254 +msgid "" +"Download of dives is possible from dive computers with a FTDI USB interface, " +"or with a Bluetooth interface." msgstr "" #. type: Plain text #: mobile-manual.txt:256 +msgid "First, establish a link between the dive computer and the mobile device." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:265 +msgid "" +"For USB dive computers, USB cables \"normally\" used for uploading dives to " +"a desktop/laptop computer do NOT work: these cables often have a full-sized " +"male USB plug on one end which plugs into the USB port of a desktop/laptop " +"computer. For downloads to a mobile device one needs a USB OTG (USB " +"On-The-Go) cable. In most cases it is required to plug the USB cable " +"\"normally\" used with the dive computer into a USB OTG cable which, in " +"turn, plugs into the mini-USB receptacle of the mobile device. The OTG cable " +"often has a full-size female receptacle at one end which accommodates the " +"full-sized male plug of the USB cable \"normally\" used (see image " +"below). This means that two cables are used to connect the dive computer to " +"the mobile device." +msgstr "" + +#. type: Target for macro image +#: mobile-manual.txt:266 +#, no-wrap +msgid "mobile-images/USB-OTG.jpg" +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:273 +msgid "" +"For Bluetooth-equipped dive computers, establish a Bluetooth connection " +"between the dive computer and the mobile device. Use the tools on the mobile " +"device to achieve this. For of Android mobile devices, the Settings -> " +"Bluetooth tool is probably appropriate. Ensure pairing of the dive computer " +"and mobile device. _Subsurface-mobile_ performs communication using both " +"Bluetooth and Bluetooth-low-energy (BTLE). The appropriate choice of " +"Bluetooth communication is made by the software and the user need not be " +"concerned with this." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:280 +msgid "" +"With propper communication between dive computer and _Subsurface-mobile_ " +"having been set up, dive download is simple. From the main menu, tap " +"_Manage dives -> Download from DC_. A screen is shown requiring that the " +"user specify the names of the vendor and model of the dive computer. For " +"instance, when using a Shearwater Petrel 2 dive computer, the vendor is " +"_Shearwater_ and the Dive computer name is _Petrel 2_. From the two dropdown " +"lists at the top of the screen, select the correct vendor and dive computer " +"names (see image on the left, below). If using a dive computer using a " +"Bluetooth connection, then tap the check box labelled _Bluetooth download_." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:288 +msgid "" +"Now tap the button labled _DOWNLOAD_. The downloaded dives appear in the " +"bottom part of the screen, the most recent dive at the top (see image on " +"right, below). Be patient because the download can sometimes take a few " +"mimnutes. Each dive has a check-box on the left hand side, used for " +"selecting which dives need to be added to the _Subsurface-mobile_ dive list: " +"dives that are not checked are ignored. With the appropriate downloaded " +"dives having been checked, tap the button at the bottom left labled " +"_ACCEPT_. All the selected dives appear on the _Subsurface-mobile_ dive " +"list. The downloaded dive information can now be edited as described in the " +"section above xref:S_Edit_Dive[Edit a dive]." +msgstr "" + +#. type: Target for macro image +#: mobile-manual.txt:289 +#, no-wrap +msgid "mobile-images/DC-Download.jpg" +msgstr "" + +#. type: Title == +#: mobile-manual.txt:291 +#, no-wrap +msgid "Viewing the dive location on Google Maps" +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:296 +msgid "" +"The site of a specific dive can be viewed in two ways using the _Details " +"View_. The Action Bar at the bottom has a GPS pin on the left hand " +"side. Tap that pin and the dive site is shown in Google Maps. Close Google " +"Maps by using the Android _Back_ button." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:299 +msgid "" +"Alternatively, the _Details View_ has a button at the top right hand marked " +"_Map it_. Tap this button to open Google Maps showing the dive site." +msgstr "" + +#. type: Target for macro image +#: mobile-manual.txt:300 +#, no-wrap +msgid "mobile-images/Map.jpg" +msgstr "" + +#. type: Title == +#: mobile-manual.txt:302 +#, no-wrap +msgid "Dive log management" +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:312 msgid "" "A central part of _Subsurface-mobile_ is the ability to store the dive log " "using the _Subsurface_ cloud storage. This provides security against loss " "or damage to the dive information contained in a local copy of the dive log " "and allows the desktop version of _Subsurface_ to access changes made using " "the mobile device. This ability is accessed through the main menu (by " -"dragging the Action Button to the right, or alternatively tappping the " +"dragging the Action Button to the right, or alternatively tapping the " "\"Hamburger\" icon at the bottom left of the screen). Tap the option " "_Manage dives_, enabling a number of options:" msgstr "" #. type: Title === -#: mobile-manual.txt:257 +#: mobile-manual.txt:313 #, no-wrap msgid "Add new dive manually" msgstr "" #. type: Plain text -#: mobile-manual.txt:260 -msgid "This is described above under the section dealing with the dive list." +#: mobile-manual.txt:316 +msgid "" +"This is described above under the section dealing with " +"xref:S_Add_Dive[Adding a new dive to the dive list]." msgstr "" #. type: Title === -#: mobile-manual.txt:261 +#: mobile-manual.txt:317 #, no-wrap msgid "Sync the dive log with the _Subsurface_ cloud storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:268 +#: mobile-manual.txt:324 msgid "" -"You can upload the dives contained on the mobile device to the _Subsurface_ " -"cloud storage by tapping the option _Manual sync with coud_. This " -"synchronizes the local changes to the dive log with the cloud storage. It " -"also downloads changes made on another device or computer and stored in " +"Upload the dives contained on the mobile device to the _Subsurface_ cloud " +"storage by tapping the option _Manual sync with cloud_. This synchronizes " +"the local changes to the dive log with the cloud storage. It also downloads " +"changes made to the dive log using another device or computer and stored in " "cloud storage." msgstr "" #. type: Title === -#: mobile-manual.txt:269 +#: mobile-manual.txt:325 #, no-wrap msgid "Working offline or online" msgstr "" #. type: Plain text -#: mobile-manual.txt:278 +#: mobile-manual.txt:334 msgid "" "By default _Subsurface-mobile_ runs offline and only syncs the dive list " "with cloud storage when explicily told to do so (see above). You can choose " @@ -567,27 +690,49 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:279 +#: mobile-manual.txt:335 #, no-wrap msgid "Changing the login credentials on the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:285 +#: mobile-manual.txt:341 +msgid "" +"The login credentials (for example to work with multiple accounts) can be " +"changed by opening the main menu and by tapping _Settings -> Cloud " +"credentials_. This opens the screen for specifying new credentials." +msgstr "" + +#. type: Title === +#: mobile-manual.txt:342 +#, no-wrap +msgid "Changing the colour scheme of _Subsurface-mobile_" +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:349 msgid "" -"If you need to change your login credentials (for example to work with " -"multiple accounts) you can open the main menu and tap _Cloud " -"credentials_. This opens the setup screen for specifying new credentials." +"_Subsurface-mobile_ has three colour schemes to please users with different " +"tastes. This user manual shows the default colour scheme, comprising blue " +"colours. Change to a pink or a dark colour scheme by opening the main menu " +"and tap Settings -> Preferences. This opens the Preferences screen that " +"includes the three colour schemes (see image below)." +msgstr "" + +#. type: Target for macro image +#: mobile-manual.txt:350 +#, no-wrap +msgid "mobile-images/ColourSchemes.jpg" msgstr "" #. type: Title == -#: mobile-manual.txt:287 +#: mobile-manual.txt:352 #, no-wrap msgid "Recording dive locations using GPS (Android only)." msgstr "" #. type: Plain text -#: mobile-manual.txt:294 +#: mobile-manual.txt:359 msgid "" "The fact that most smartphones have GPS facilities allows " "_Subsurface-mobile_ on Android to record the locations of dives. You can " @@ -597,111 +742,109 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:295 +#: mobile-manual.txt:360 #, no-wrap msgid "Setting up the GPS" msgstr "" #. type: Plain text -#: mobile-manual.txt:304 +#: mobile-manual.txt:368 msgid "" "Open the main menu and tap _GPS -> Preferences_. Now specify the way in " -"which GPS data need to be automatically collected (image on right, " -"below). You can specify that data are collected at regular intervals, e.g. " -"every 10 minutes, or at regular distances, e.g. after the boat has moved " -"more than 200m, or a combination of both of the above approaches. Provide " -"the appropriate information and tap the _Save_ action button. The program is " -"now ready to collect GPS positions." +"which GPS data need to be automatically collected (image above). Data are " +"collected at regular intervals, e.g. every 5 minutes, or at regular " +"distances, e.g. after the boat has moved more than 200m, or a combination of " +"both of these approaches. Provide the appropriate information and tap the " +"_Save_ action button. The program is now ready to collect GPS positions." msgstr "" -#. type: Target for macro image -#: mobile-manual.txt:305 +#. type: Title === +#: mobile-manual.txt:369 #, no-wrap -msgid "mobile-images/gpssetup.jpg" +msgid "Collecting GPS positions" msgstr "" -#. type: Title === -#: mobile-manual.txt:307 +#. type: Target for macro image +#: mobile-manual.txt:371 #, no-wrap -msgid "Collecting GPS positions" +msgid "mobile-images/Mainmenu.jpg" msgstr "" #. type: Plain text -#: mobile-manual.txt:316 +#: mobile-manual.txt:380 msgid "" "Ensure that the GPS on the Android device has been activated. At the bottom " -"of the GPS submenu is a check box _Run location service_ (image on left, " -"above). Check this box and _Subsurface-mobile_ starts to collect GPS " -"locations automatically, following the preferences specified as described " -"above. After return from the dive trip you can deactivate the collection of " -"GPS data by de-activating the same check box at the bottom of the main menu." +"of the GPS submenu is a check box _Run location service_ (image above). " +"Check this box and _Subsurface-mobile_ starts to collect GPS locations " +"automatically, following the preferences specified as described above. After " +"return from the dive trip you can deactivate the collection of GPS data by " +"de-activating the same check box at the bottom of the main menu." msgstr "" #. type: Title === -#: mobile-manual.txt:317 +#: mobile-manual.txt:381 #, no-wrap msgid "Storing the GPS data on the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:324 +#: mobile-manual.txt:388 msgid "" "Activate the main menu and select the _GPS_ option that brings up the " -"submenu of GPS-related actions (image on left, above). Tap _Upload GPS data_ " -"that saves the GPS data on the _Subsurface_ cloud server. These GPS data are " -"saved *separately* from the other dive log data. All collected GPS data are " -"kept on the Android device, independent of whether they have been uploaded " -"or not." +"submenu of GPS-related actions. Tap _Upload GPS data_ that saves the GPS " +"data on the _Subsurface_ cloud server. These GPS data are saved *separately* " +"from the other dive log data. All collected GPS data are kept on the Android " +"device, independent of whether they have been uploaded or not." msgstr "" #. type: Title === -#: mobile-manual.txt:325 +#: mobile-manual.txt:389 #, no-wrap msgid "Downloading GPS data from the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:330 +#: mobile-manual.txt:394 msgid "" "Download the GPS data that have been saved on the cloud (possibly by a " "different device) by selecting _Download GPS Data_ from the GPS subpanel." msgstr "" #. type: Title === -#: mobile-manual.txt:331 +#: mobile-manual.txt:395 #, no-wrap msgid "Viewing GPS data" msgstr "" #. type: Plain text -#: mobile-manual.txt:342 +#: mobile-manual.txt:406 msgid "" -"From the GPS submenu (image on left, above) select _Show GPS fixes_. This " -"brings up a list of GPS positions obtained using the location service (image " -"on left, below). Two actions are possible for each of the locations, enabled " -"if you tap the handle (the three horisontal stripes on the right, see image " -"on left, below) and then drags the specific item to the left (image on " -"right, below). This exposes two options. Tapping the dustbin deletes this " -"particular GPS location. Tapping the teardrop-shaped icon (actually a Google " -"Maps pin) opens up Google Maps with a pin indicating the exact map position " -"of the GPS record being viewed. The two above options can be hidden by " -"drawing the GPS record to the right, again using the handle." +"From the GPS submenu select _Show GPS fixes_. This brings up a list of GPS " +"positions obtained using the location service (image on left, below). Two " +"actions are possible for each of the locations, enabled if you tap the " +"handle (the three horisontal stripes on the right, see image on left, below) " +"and then drags the specific item to the left (image on right, below). This " +"exposes two options. Tapping the dustbin deletes this particular GPS " +"location. Tapping the teardrop-shaped icon (actually a Google Maps pin) " +"opens up Google Maps with a pin indicating the exact map position of the GPS " +"record being viewed. The two above options can be hidden by drawing the GPS " +"record to the right, again using the handle." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:343 +#: mobile-manual.txt:407 #, no-wrap msgid "mobile-images/gpsmanagement.jpg" msgstr "" #. type: Title === -#: mobile-manual.txt:345 +#: mobile-manual.txt:409 #, no-wrap msgid "Applying GPS data to dives in the dive log" msgstr "" #. type: Plain text -#: mobile-manual.txt:353 +#: mobile-manual.txt:417 msgid "" "Assuming that all the dives have been entered into the dive log or have been " "downloaded from the _Subsurface_ cloud, you can apply the GPS positions to " diff --git a/Documentation/50-pot/subsurface-user-manual.pot b/Documentation/50-pot/subsurface-user-manual.pot index a081cd0d5..f2c7c47bc 100644 --- a/Documentation/50-pot/subsurface-user-manual.pot +++ b/Documentation/50-pot/subsurface-user-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: 2017-07-04 13:37+0200\n" +"POT-Creation-Date: 2017-10-11 10:20+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" @@ -917,7 +917,7 @@ msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:479 user-manual.txt:4022 +#: user-manual.txt:479 user-manual.txt:4033 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "" @@ -1046,7 +1046,7 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:556 user-manual.txt:3949 user-manual.txt:4037 +#: user-manual.txt:556 user-manual.txt:3960 user-manual.txt:4048 #, no-wrap msgid "On Windows:" msgstr "" @@ -6108,7 +6108,7 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3088 user-manual.txt:4605 +#: user-manual.txt:3088 user-manual.txt:4616 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "" @@ -7333,26 +7333,41 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3572 +#: user-manual.txt:3581 +msgid "" +"Please note as well that there is an intrinsic assumption of the VPM-B model " +"that off-gassing only happens during the ascent phase of the dive (which is " +"the part controlled by the planner). Thus it is possible to get misleading " +"results if you manually enter waypoints well in the decompression phase of " +"your dive. This is particularly relevant when editing a dive read from disk " +"in the planner since that will have waypoints up to the surface. Thus for " +"those dives, first delete all waypoints during the ascent phase. This is " +"most easily done by holding the Ctrl- or Command-key while clicking on the " +"trash can icon next to the first ascent waypoint in the table on the left " +"hand side." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3583 msgid "For more information external to this manual see:" msgstr "" #. type: Plain text -#: user-manual.txt:3574 +#: user-manual.txt:3585 msgid "" "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " "M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" msgstr "" #. type: Plain text -#: user-manual.txt:3575 +#: user-manual.txt:3586 msgid "" "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient " "factors for dummies, by Kevin Watts]" msgstr "" #. type: Plain text -#: user-manual.txt:3577 +#: user-manual.txt:3588 msgid "" "link:https://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers[_Deco " "for Divers_, by Mark Powell (2008). Aquapress] Southend-on-Sea, UK. ISBN 10: " @@ -7361,7 +7376,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3585 +#: user-manual.txt:3596 msgid "" "The ascent rate is critical for nitrogen off-gassing at the end of the dive " "and is specified for several depth ranges, using the mean depth as a " @@ -7374,7 +7389,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3594 +#: user-manual.txt:3605 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, " @@ -7393,7 +7408,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3625 +#: user-manual.txt:3636 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary\n" @@ -7450,7 +7465,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3638 +#: user-manual.txt:3649 msgid "" "Now you can start the detailed time-depth planning of the dive. _Subsurface_ " "offers an unique graphical interface for doing planning. The mechanics are " @@ -7468,7 +7483,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3649 +#: user-manual.txt:3660 msgid "" "Each waypoint on the dive profile creates a _Dive Planner Point_ in the " "table on the left of the dive planner panel. Ensure the _Used Gas_ value in " @@ -7485,7 +7500,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3655 +#: user-manual.txt:3666 msgid "" "Show any changes in gas cylinder used by indicating gas changes as explained " "in the section <<S_CreateProfile,hand-creating a dive profile>>. These " @@ -7495,7 +7510,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3664 +#: user-manual.txt:3675 msgid "" "A non-zero value in the \"CC setpoint\" column of the table of dive planner " "points indicates a valid setpoint for oxygen partial pressure and that the " @@ -7508,20 +7523,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3667 +#: user-manual.txt:3678 msgid "" "Below is an example of a dive plan to 45m using Tx21/35, followed by an " "ascent using EAN50 and oxygen and using the settings as described above." msgstr "" #. type: Target for macro image -#: user-manual.txt:3668 +#: user-manual.txt:3679 #, no-wrap msgid "images/Planner_OC_deco_VPM.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3673 +#: user-manual.txt:3684 msgid "" "Once the above steps have been completed, save by clicking the _Save_ button " "towards the top middle of the planner. The saved dive plan will appear in " @@ -7529,13 +7544,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3675 +#: user-manual.txt:3686 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3683 +#: user-manual.txt:3694 msgid "" "On the bottom right of the dive planner, under _Dive Plan Details_, the " "exact details of the dive plan are provided. These details may be modified " @@ -7548,7 +7563,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3688 +#: user-manual.txt:3699 msgid "" "If the option _Display segment duration_ is checked, then the duration of " "each depth level is indicated in the _Dive Plan Details_. This duration " @@ -7558,13 +7573,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3689 +#: user-manual.txt:3700 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3706 +#: user-manual.txt:3717 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ " @@ -7598,26 +7613,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3707 +#: user-manual.txt:3718 #, no-wrap msgid "images/Planner_pSCR1_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3710 +#: user-manual.txt:3721 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3714 +#: user-manual.txt:3725 msgid "" "To plan a dive using a closed circuit rebreather, select the _CCR_ option in " "the dropdown list, circled in blue in the image below." msgstr "" #. type: Plain text -#: user-manual.txt:3718 +#: user-manual.txt:3729 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder " @@ -7628,7 +7643,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3728 +#: user-manual.txt:3739 #, no-wrap msgid "" "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by " @@ -7650,31 +7665,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3730 +#: user-manual.txt:3741 msgid "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:3731 +#: user-manual.txt:3742 #, no-wrap msgid "images/Planner_CCR1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3735 +#: user-manual.txt:3746 msgid "" "Note that, in the _Dive plan details_, the gas consumption for a CCR segment " "is not calculated, so gas consumptions of 0 liters are the norm." msgstr "" #. type: Title === -#: user-manual.txt:3737 +#: user-manual.txt:3748 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3744 +#: user-manual.txt:3755 msgid "" "Normally, when a dive plan has been saved, it is accessible from the *Dive " "List*, like any other dive log. Within the *Dive List* there is no way to " @@ -7685,7 +7700,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3750 +#: user-manual.txt:3761 msgid "" "In addition, there is the option \"Save new\". This keeps the original " "planned dive and adds a (possibly modified, - earlier dives are now taken " @@ -7696,13 +7711,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3751 +#: user-manual.txt:3762 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: user-manual.txt:3758 +#: user-manual.txt:3769 msgid "" "Repetitive dives can easily be planned if the dates and start times of the " "repetitive dive set are specified appropriately in the top left-hand _Start " @@ -7711,7 +7726,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3764 +#: user-manual.txt:3775 msgid "" "If you have just completed a long/deep dive and are planning another dive, " "then highlight, in the *Dive List*, the dive that has just been logged then " @@ -7721,7 +7736,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3769 +#: user-manual.txt:3780 msgid "" "If only a few standard configurations are used (e.g. in GUE), then a " "template dive can be created conforming to one of the configurations. If you " @@ -7731,13 +7746,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3770 +#: user-manual.txt:3781 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3775 +#: user-manual.txt:3786 msgid "" "Selecting the _Print_ button in the planner allows printing of the _Dive " "Plan Details_ for wet notes. You can also cut and paste the _Dive Plan " @@ -7745,7 +7760,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3781 +#: user-manual.txt:3792 msgid "" "However, after the plan has been saved, it is represented in a way very " "similar to a dive log and the gas calculations cannot be accessed in the " @@ -7755,13 +7770,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3783 +#: user-manual.txt:3794 #, no-wrap msgid "Saving a dive with its dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3790 +#: user-manual.txt:3801 msgid "" "In the section dealing with <<S_MultipleDiveComputers, dives using more than " "one dive computer>> we discussed the way in which multiple profiles for a " @@ -7772,24 +7787,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3792 +#: user-manual.txt:3803 msgid "Do the dive planning and save the final plan in the _Dive List_." msgstr "" #. type: Plain text -#: user-manual.txt:3793 +#: user-manual.txt:3804 msgid "After diving, upload the dive data from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3795 +#: user-manual.txt:3806 msgid "" "Change the date and time of the _dive plan_ to coincide with that of the " "real-life dive from the _dive computer_." msgstr "" #. type: Plain text -#: user-manual.txt:3798 +#: user-manual.txt:3809 msgid "" "In the _Dive List_, highlight the dive plan as well as the data for the real " "dive and merge the two dives, making use of the Dive List Context Menu " @@ -7797,7 +7812,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3802 +#: user-manual.txt:3813 msgid "" "The text version of the dive plan is appended to the Notes in the _Notes " "Tab_. With this merged dive highlighted in the _Dive List_, switch between " @@ -7806,13 +7821,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3803 +#: user-manual.txt:3814 #, no-wrap msgid "Running _Subsurface_ from the command-line" msgstr "" #. type: Plain text -#: user-manual.txt:3807 +#: user-manual.txt:3818 msgid "" "_Subsurface_ can be launched from the command-line to set some specialised " "settings or as part of an script-based automated process for manipulating a " @@ -7820,18 +7835,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3809 +#: user-manual.txt:3820 #, no-wrap msgid "\tsubsurface [options] [logfile ...] [--import logfile ...]\n" msgstr "" #. type: Plain text -#: user-manual.txt:3811 +#: user-manual.txt:3822 msgid "The options include:" msgstr "" #. type: delimited block | -#: user-manual.txt:3825 +#: user-manual.txt:3836 #, no-wrap msgid "" "|*Command-line option*|*Description*\n" @@ -7856,13 +7871,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3827 +#: user-manual.txt:3838 #, no-wrap msgid "Description of the Subsurface Main Menu items" msgstr "" #. type: Plain text -#: user-manual.txt:3832 +#: user-manual.txt:3843 msgid "" "This section describes the functions and operation of the items in the Main " "Menu of Subsurface. Several of the items below are links to sections of this " @@ -7870,261 +7885,261 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3833 +#: user-manual.txt:3844 #, no-wrap msgid "File" msgstr "" #. type: Plain text -#: user-manual.txt:3836 +#: user-manual.txt:3847 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." msgstr "" #. type: Plain text -#: user-manual.txt:3838 +#: user-manual.txt:3849 msgid "_Open logbook_ - Open the file manager to select a dive logbook to open." msgstr "" #. type: Plain text -#: user-manual.txt:3839 +#: user-manual.txt:3850 msgid "_Save_ - Save the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:3840 +#: user-manual.txt:3851 msgid "_Save as_ - Save the current logbook under a different file name." msgstr "" #. type: Plain text -#: user-manual.txt:3841 +#: user-manual.txt:3852 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3842 +#: user-manual.txt:3853 msgid "" "_Save to cloud storage_ - Save the current dive log to " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3843 +#: user-manual.txt:3854 msgid "" "_Take cloud storage online_ - " "******************************************************" msgstr "" #. type: Plain text -#: user-manual.txt:3844 +#: user-manual.txt:3855 msgid "_Close_ - Close the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:3846 +#: user-manual.txt:3857 msgid "" "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the " "selected dives in the logbook) to one of several formats." msgstr "" #. type: Plain text -#: user-manual.txt:3847 +#: user-manual.txt:3858 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook." msgstr "" #. type: Plain text -#: user-manual.txt:3848 +#: user-manual.txt:3859 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences." msgstr "" #. type: Plain text -#: user-manual.txt:3849 +#: user-manual.txt:3860 msgid "" "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:3850 +#: user-manual.txt:3861 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:3851 +#: user-manual.txt:3862 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." msgstr "" #. type: Plain text -#: user-manual.txt:3852 +#: user-manual.txt:3863 msgid "_Quit_ - Quit _Subsurface_." msgstr "" #. type: Title === -#: user-manual.txt:3854 +#: user-manual.txt:3865 #, no-wrap msgid "Edit" msgstr "" #. type: Plain text -#: user-manual.txt:3856 +#: user-manual.txt:3867 msgid "The Edit option allows one to undo or redo an action, e.g. deleting dives." msgstr "" #. type: Title === -#: user-manual.txt:3857 +#: user-manual.txt:3868 #, no-wrap msgid "Import" msgstr "" #. type: Plain text -#: user-manual.txt:3860 +#: user-manual.txt:3871 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3862 +#: user-manual.txt:3873 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:3864 +#: user-manual.txt:3875 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:3866 +#: user-manual.txt:3877 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." msgstr "" #. type: Title === -#: user-manual.txt:3867 +#: user-manual.txt:3878 #, no-wrap msgid "Log" msgstr "" #. type: Plain text -#: user-manual.txt:3869 +#: user-manual.txt:3880 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:3870 +#: user-manual.txt:3881 msgid "" "_Edit dive_ - Edit a dive where the profile was entered by hand and not from " "a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3871 +#: user-manual.txt:3882 msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives." msgstr "" #. type: Plain text -#: user-manual.txt:3872 +#: user-manual.txt:3883 msgid "" "<<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:3874 +#: user-manual.txt:3885 msgid "" "<<S_CopyComponents,_Copy dive components_>> - Copy information from several " "fields of a dive log onto the clipboard." msgstr "" #. type: Plain text -#: user-manual.txt:3876 +#: user-manual.txt:3887 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:3878 +#: user-manual.txt:3889 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:3880 +#: user-manual.txt:3891 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." msgstr "" #. type: Plain text -#: user-manual.txt:3881 +#: user-manual.txt:3892 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "coordinate your logs." msgstr "" #. type: Plain text -#: user-manual.txt:3882 +#: user-manual.txt:3893 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." msgstr "" #. type: Title === -#: user-manual.txt:3883 +#: user-manual.txt:3894 #, no-wrap msgid "View" msgstr "" #. type: Plain text -#: user-manual.txt:3886 +#: user-manual.txt:3897 msgid "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once." msgstr "" #. type: Plain text -#: user-manual.txt:3887 +#: user-manual.txt:3898 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3888 +#: user-manual.txt:3899 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3889 +#: user-manual.txt:3900 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3890 +#: user-manual.txt:3901 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3892 +#: user-manual.txt:3903 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." msgstr "" #. type: Plain text -#: user-manual.txt:3895 +#: user-manual.txt:3906 msgid "" "_Prev DC_ - Switch to data from previous dive computer, if a single dive was " "logged from more than one. See the sections on " @@ -8133,50 +8148,50 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3896 +#: user-manual.txt:3907 msgid "_Next DC_ - Switch to next dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3897 +#: user-manual.txt:3908 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "" #. type: Title === -#: user-manual.txt:3898 +#: user-manual.txt:3909 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:3900 +#: user-manual.txt:3911 msgid "" "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your " "Facebook timeline." msgstr "" #. type: Title === -#: user-manual.txt:3901 +#: user-manual.txt:3912 #, no-wrap msgid "Help" msgstr "" #. type: Plain text -#: user-manual.txt:3904 +#: user-manual.txt:3915 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." msgstr "" #. type: Plain text -#: user-manual.txt:3906 +#: user-manual.txt:3917 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the https://subsurface-divelog.org/[_Subsurface_ web site]." msgstr "" #. type: Plain text -#: user-manual.txt:3908 +#: user-manual.txt:3919 msgid "" "<<S_UserSurvey,_User survey_>> - Help to make _Subsurface_ even better by " "taking part in our user survey or by completing another survey if your " @@ -8184,12 +8199,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3909 +#: user-manual.txt:3920 msgid "_User manual_ - Open a window showing this user manual." msgstr "" #. type: Title == -#: user-manual.txt:3912 +#: user-manual.txt:3923 #, no-wrap msgid "" "APPENDIX A: Operating system specific information for importing dive " @@ -8197,19 +8212,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3914 +#: user-manual.txt:3925 #, 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:3915 +#: user-manual.txt:3926 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3920 +#: user-manual.txt:3931 msgid "" "The operating system of the desktop computer needs the appropriate drivers " "in order to communicate with the dive computer, the way the dive computer " @@ -8217,7 +8232,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3926 +#: user-manual.txt:3937 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 " @@ -8226,7 +8241,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3930 +#: user-manual.txt:3941 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 " @@ -8234,7 +8249,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3937 +#: user-manual.txt:3948 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 " @@ -8245,19 +8260,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3939 +#: user-manual.txt:3950 #, 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:3940 +#: user-manual.txt:3951 #, no-wrap msgid "images/icons/usb.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3948 +#: user-manual.txt:3959 msgid "" "When connecting a dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list with the correct device " @@ -8267,61 +8282,61 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3953 +#: user-manual.txt:3964 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." msgstr "" #. type: Title ==== -#: user-manual.txt:3954 user-manual.txt:4052 +#: user-manual.txt:3965 user-manual.txt:4063 #, no-wrap msgid "On MacOS:" msgstr "" #. type: Plain text -#: user-manual.txt:3957 +#: user-manual.txt:3968 msgid "The drop down box should find all connected dive computers." msgstr "" #. type: Block title -#: user-manual.txt:3958 +#: user-manual.txt:3969 #, no-wrap msgid "On Linux:" msgstr "" #. type: Plain text -#: user-manual.txt:3961 +#: user-manual.txt:3972 msgid "There is a definitive way to find the port:" msgstr "" #. type: Plain text -#: user-manual.txt:3963 +#: user-manual.txt:3974 msgid "Disconnect the USB cable from the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3964 +#: user-manual.txt:3975 msgid "Open a terminal" msgstr "" #. type: Plain text -#: user-manual.txt:3965 user-manual.txt:3967 +#: user-manual.txt:3976 user-manual.txt:3978 msgid "Type the command: 'dmesg' and press enter" msgstr "" #. type: Plain text -#: user-manual.txt:3966 +#: user-manual.txt:3977 msgid "Plug in the USB cable of the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3969 +#: user-manual.txt:3980 msgid "A message similar to this one should appear:" msgstr "" #. type: Plain text -#: user-manual.txt:3985 +#: user-manual.txt:3996 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -8342,7 +8357,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3990 +#: user-manual.txt:4001 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 " @@ -8350,12 +8365,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3992 +#: user-manual.txt:4003 msgid "Ensuring the user has write permission to the USB serial port:" msgstr "" #. type: Plain text -#: user-manual.txt:4002 +#: user-manual.txt:4013 msgid "" "On Unix-like operating systems the USB ports can only be accessed by users " "who are members special group that can be e.g. +dialout+ or +uucp+. This " @@ -8367,14 +8382,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4006 +#: user-manual.txt:4017 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:4011 +#: user-manual.txt:4022 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -8386,7 +8401,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4013 +#: user-manual.txt:4024 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) " @@ -8395,7 +8410,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4018 +#: user-manual.txt:4029 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 you " @@ -8403,13 +8418,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4021 +#: user-manual.txt:4032 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:4028 +#: user-manual.txt:4039 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a " @@ -8418,7 +8433,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4030 +#: user-manual.txt:4041 #, no-wrap msgid "" "*For the dive computer, after enabling Bluetooth, be sure it is in Upload " @@ -8426,7 +8441,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4034 +#: user-manual.txt:4045 msgid "" "For Bluetooth pairing of the dive computer, refer to the manufacturer's user " "guide. When using a Shearwater Predator/Petrel/Nerd, select _Dive Log -> " @@ -8434,13 +8449,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4036 +#: user-manual.txt:4047 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4045 +#: user-manual.txt:4056 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -8452,21 +8467,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4048 +#: user-manual.txt:4059 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:4051 +#: user-manual.txt:4062 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:4058 +#: user-manual.txt:4069 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 " @@ -8475,20 +8490,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4061 +#: user-manual.txt:4072 msgid "" "Once the pairing is complete, the correct device is shown in the 'Device or " "Mount Point' drop-down in the _Subsurface_ *Import* dialog." msgstr "" #. type: Title ==== -#: user-manual.txt:4062 +#: user-manual.txt:4073 #, no-wrap msgid "On Linux" msgstr "" #. type: Plain text -#: user-manual.txt:4070 +#: user-manual.txt:4081 msgid "" "Be sure Bluetooth is enabled on the _Subsurface_ computer. On most common " "distributions this should be true out of the box and pairing should be " @@ -8500,7 +8515,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4074 +#: user-manual.txt:4085 msgid "" "Setting up a connection to download dives from your Bluetooth-enabled " "device, such as the _Shearwater Petrel_, is not yet an automated process and " @@ -8509,23 +8524,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4076 +#: user-manual.txt:4087 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4077 +#: user-manual.txt:4088 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:4078 user-manual.txt:4218 +#: user-manual.txt:4089 user-manual.txt:4229 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:4084 +#: user-manual.txt:4095 msgid "" "Ensure the dive computer is in upload mode. On the _Shearwater Petrel_, " "_Petrel 2_ and _Nerd_ cycle through the menu, select 'Dive Log', then " @@ -8536,7 +8551,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4089 +#: user-manual.txt:4100 msgid "" "To establish the connection, establish root access through +sudo+ or +su+. " "The correct permission is required to download the dives in the computer. On " @@ -8546,23 +8561,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4091 +#: user-manual.txt:4102 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:4093 +#: user-manual.txt:4104 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:4094 +#: user-manual.txt:4105 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4100 +#: user-manual.txt:4111 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 " @@ -8573,7 +8588,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4103 +#: user-manual.txt:4114 msgid "" "If the graphical method doesn't work, pair the device from the command " "line. Open a terminal and use +hciconfig+ to check the Bluetooth controller " @@ -8581,7 +8596,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4110 +#: user-manual.txt:4121 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -8593,7 +8608,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4115 +#: user-manual.txt:4126 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 " @@ -8603,7 +8618,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4123 +#: user-manual.txt:4134 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -8616,25 +8631,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4125 +#: user-manual.txt:4136 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: user-manual.txt:4127 +#: user-manual.txt:4138 msgid "" "If there are multiple controllers running, it's easiest to turn off the " "unused controller(s). For example, for +hci1+:" msgstr "" #. type: Plain text -#: user-manual.txt:4129 +#: user-manual.txt:4140 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:4132 +#: user-manual.txt:4143 msgid "" "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez " "5, such as Fedora 22, you can use a tool called +blutootctl+, which will " @@ -8642,7 +8657,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4153 +#: user-manual.txt:4164 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -8671,14 +8686,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4156 +#: user-manual.txt:4167 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:4159 +#: user-manual.txt:4170 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 " @@ -8686,7 +8701,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4164 +#: user-manual.txt:4175 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -8696,82 +8711,82 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4166 +#: user-manual.txt:4177 msgid "Once the dive computer is paired, set up the RFCOMM connection." msgstr "" #. type: Title ===== -#: user-manual.txt:4167 +#: user-manual.txt:4178 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:4170 +#: user-manual.txt:4181 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:4172 +#: user-manual.txt:4183 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:4174 +#: user-manual.txt:4185 msgid "+<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:4175 +#: user-manual.txt:4186 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:4176 +#: user-manual.txt:4187 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:4177 +#: user-manual.txt:4188 msgid "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:4180 +#: user-manual.txt:4191 msgid "" "If you omit 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:4182 +#: user-manual.txt:4193 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4183 +#: user-manual.txt:4194 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4184 +#: user-manual.txt:4195 msgid "_Shearwater Nerd_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4185 +#: user-manual.txt:4196 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4187 +#: user-manual.txt:4198 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:4189 +#: user-manual.txt:4200 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, " @@ -8779,12 +8794,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4191 +#: user-manual.txt:4202 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:4194 +#: user-manual.txt:4205 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -8792,14 +8807,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4196 +#: user-manual.txt:4207 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:4200 +#: user-manual.txt:4211 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, " @@ -8809,7 +8824,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4204 +#: user-manual.txt:4215 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 " @@ -8818,7 +8833,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4214 +#: user-manual.txt:4225 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -8833,7 +8848,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4217 +#: user-manual.txt:4228 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 " @@ -8841,7 +8856,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4220 +#: user-manual.txt:4231 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select " @@ -8851,25 +8866,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4226 +#: user-manual.txt:4237 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:4229 +#: user-manual.txt:4240 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4231 +#: user-manual.txt:4242 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4247 +#: user-manual.txt:4258 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and " @@ -8886,7 +8901,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4262 +#: user-manual.txt:4273 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -8903,19 +8918,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4264 +#: user-manual.txt:4275 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4266 +#: user-manual.txt:4277 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4281 +#: user-manual.txt:4292 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -8931,14 +8946,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4284 +#: user-manual.txt:4295 msgid "" "After executing this command, Subsurface will recognize the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:4290 +#: user-manual.txt:4301 msgid "" "Under Windows, a similar situation exists. Drivers for the MCS7780 are " "available from some Internet web sites e.g. " @@ -8949,26 +8964,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4293 +#: user-manual.txt:4304 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:4295 +#: user-manual.txt:4306 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4297 +#: user-manual.txt:4308 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4307 +#: user-manual.txt:4318 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. " @@ -8981,19 +8996,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4310 +#: user-manual.txt:4321 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4312 +#: user-manual.txt:4323 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4321 +#: user-manual.txt:4332 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 " @@ -9007,19 +9022,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4323 +#: user-manual.txt:4334 #, no-wrap msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4325 +#: user-manual.txt:4336 #, no-wrap msgid "images/icons/predator.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4328 +#: user-manual.txt:4339 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled " @@ -9027,19 +9042,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4330 +#: user-manual.txt:4341 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4332 +#: user-manual.txt:4343 #, no-wrap msgid "images/MkVI.jpeg" msgstr "" #. type: Plain text -#: user-manual.txt:4340 +#: user-manual.txt:4351 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -9051,45 +9066,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4343 +#: user-manual.txt:4354 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4344 +#: user-manual.txt:4355 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4346 +#: user-manual.txt:4357 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:4348 +#: user-manual.txt:4359 msgid "" "_Subsurface_ accesses the .txt and the .csv files to get dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:4350 +#: user-manual.txt:4361 #, no-wrap msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4352 +#: user-manual.txt:4363 #, no-wrap msgid "images/APDComputer.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4360 +#: user-manual.txt:4371 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -9101,55 +9116,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4362 +#: user-manual.txt:4373 msgid "Download the dive using _AP Communicator_." msgstr "" #. type: Plain text -#: user-manual.txt:4363 +#: user-manual.txt:4374 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:4364 +#: user-manual.txt:4375 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4365 +#: user-manual.txt:4376 msgid "" "With the raw dive log data show on the screen, click on \"_Copy to " "Clipboard_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4366 +#: user-manual.txt:4377 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:4368 +#: user-manual.txt:4379 msgid "" "Copy the contents of the clipboard into the text editor and save the text " "file with a filename extension of _.apd_." msgstr "" #. type: Plain text -#: user-manual.txt:4369 +#: user-manual.txt:4380 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the " "xref:Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:4370 +#: user-manual.txt:4381 msgid "" "In the dropdown list towards the bottom right of the dialogue (labeled " "'Filter:'), select \"APD log viewer\"." msgstr "" #. type: Plain text -#: user-manual.txt:4374 +#: user-manual.txt:4385 #, no-wrap msgid "" "On the list of file names select the _.apd_ file created. An import\n" @@ -9159,13 +9174,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4375 +#: user-manual.txt:4386 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4383 +#: user-manual.txt:4394 msgid "" "The top left hand dropdown box in the import panel lets you select the APD " "dive computer for which the dive log needs to be imported. The default it is " @@ -9177,12 +9192,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4384 +#: user-manual.txt:4395 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:4389 +#: user-manual.txt:4400 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer- " "generated ceiling provided by the Inspiration can be viewed by selecting the " @@ -9192,13 +9207,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4390 +#: user-manual.txt:4401 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:4399 +#: user-manual.txt:4410 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, " @@ -9208,22 +9223,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4401 +#: user-manual.txt:4412 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:4402 +#: user-manual.txt:4413 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4403 +#: user-manual.txt:4414 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4407 +#: user-manual.txt:4418 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -9231,19 +9246,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4409 +#: user-manual.txt:4420 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4410 +#: user-manual.txt:4421 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4417 +#: user-manual.txt:4428 msgid "" "DiveManager is a Windows application for Suunto dive computers. Divemanager " "3 (DM3) is an older version of the Suunto software. More recent Suunto dive " @@ -9253,64 +9268,64 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4419 +#: user-manual.txt:4430 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4421 +#: user-manual.txt:4432 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:4422 +#: user-manual.txt:4433 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4424 +#: user-manual.txt:4435 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:4425 +#: user-manual.txt:4436 msgid "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:4426 +#: user-manual.txt:4437 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:4428 +#: user-manual.txt:4439 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:4429 +#: user-manual.txt:4440 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:4430 +#: user-manual.txt:4441 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:4431 +#: user-manual.txt:4442 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:4433 +#: user-manual.txt:4444 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -9318,13 +9333,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4434 +#: user-manual.txt:4445 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:4436 +#: user-manual.txt:4447 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -9332,25 +9347,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4437 +#: user-manual.txt:4448 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:4438 +#: user-manual.txt:4449 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:4440 +#: user-manual.txt:4451 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4445 +#: user-manual.txt:4456 msgid "" "DM4 and DM5 use identical mechanisms for exporting dive logs. To export a " "divelog from Divemanager you need to locate the DM4/DM5 database where the " @@ -9359,81 +9374,81 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4447 +#: user-manual.txt:4458 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:4449 user-manual.txt:4458 +#: user-manual.txt:4460 user-manual.txt:4469 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:4450 +#: user-manual.txt:4461 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:4451 +#: user-manual.txt:4462 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:4452 +#: user-manual.txt:4463 msgid "Open Windows Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4453 +#: user-manual.txt:4464 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4454 +#: user-manual.txt:4465 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:4456 +#: user-manual.txt:4467 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:4459 +#: user-manual.txt:4470 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:4461 +#: user-manual.txt:4472 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:4462 +#: user-manual.txt:4473 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:4463 +#: user-manual.txt:4474 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:4465 +#: user-manual.txt:4476 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4468 +#: user-manual.txt:4479 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4475 +#: user-manual.txt:4486 msgid "" "Atomic Logbook is Windows software by Atomic Aquatics. It allows downloading " "of dive information from Cobalt and Cobalt 2 dive computers. The divelog is " @@ -9443,19 +9458,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4477 +#: user-manual.txt:4488 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4480 +#: user-manual.txt:4491 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4488 +#: user-manual.txt:4499 msgid "" "Mares Dive Organizer is a Windows application. The dive log is kept as a " "Microsoft SQL Compact Edition database with a '.sdf' filename extension. The " @@ -9466,7 +9481,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4493 +#: user-manual.txt:4504 msgid "" "Within Dive Organizer, select _Database -> Backup_ from the main menu and " "back up the database to the desk top. This creates a zipped file " @@ -9474,36 +9489,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4496 +#: user-manual.txt:4507 msgid "" "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganizer.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4497 +#: user-manual.txt:4508 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4498 +#: user-manual.txt:4509 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4500 +#: user-manual.txt:4511 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4502 +#: user-manual.txt:4513 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4509 +#: user-manual.txt:4520 msgid "" "The best way to bring your logs from DivingLog to Subsurface is to convert " "the whole database. This is because other export formats do not include all " @@ -9513,37 +9528,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4511 +#: user-manual.txt:4522 msgid "To transfer all files from DivingLog to Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:4513 +#: user-manual.txt:4524 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4514 +#: user-manual.txt:4525 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4515 +#: user-manual.txt:4526 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4516 +#: user-manual.txt:4527 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4517 +#: user-manual.txt:4528 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4521 +#: user-manual.txt:4532 msgid "" "Once this is done, open the saved database file with Subsurface and the " "dives are automatically converted to Subsurface’s own format. Last step to " @@ -9551,13 +9566,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4522 +#: user-manual.txt:4533 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:4532 +#: user-manual.txt:4543 msgid "" "Many divers keep a dive log in some form of digital file, commonly a " "spreadsheet with various fields of information. These logs can be easily " @@ -9569,7 +9584,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4538 +#: user-manual.txt:4549 msgid "" "Organize the diving data in the spreadsheet, so the first row contains the " "names (or titles) of each column and the information for each dive is stored " @@ -9579,40 +9594,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4540 +#: user-manual.txt:4551 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: user-manual.txt:4541 +#: user-manual.txt:4552 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: user-manual.txt:4542 +#: user-manual.txt:4553 msgid "" "Unit system: only one unit system should be used (no mix of imperial and " "metric units)" msgstr "" #. type: Plain text -#: user-manual.txt:4543 +#: user-manual.txt:4554 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: user-manual.txt:4544 +#: user-manual.txt:4555 msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: user-manual.txt:4544 +#: user-manual.txt:4555 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: user-manual.txt:4548 +#: user-manual.txt:4559 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -9623,13 +9638,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4549 +#: user-manual.txt:4560 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4552 +#: user-manual.txt:4563 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 " @@ -9637,13 +9652,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4553 +#: user-manual.txt:4564 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4556 +#: user-manual.txt:4567 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -9651,13 +9666,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4557 +#: user-manual.txt:4568 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4560 +#: user-manual.txt:4571 msgid "" "Double check the .CSV file by opening it with a text editor, and then import " "the dive data as explained on the section xref:S_ImportingCSVDives[Importing " @@ -9665,13 +9680,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4561 +#: user-manual.txt:4572 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: user-manual.txt:4567 +#: user-manual.txt:4578 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -9682,67 +9697,67 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4569 +#: user-manual.txt:4580 msgid "" "In Microsoft Windows, click the *Start* button, then select _Control Panel_ " "from the list on the right-hand side." msgstr "" #. type: Plain text -#: user-manual.txt:4570 +#: user-manual.txt:4581 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4572 +#: user-manual.txt:4583 msgid "" "Do the following: ** In Windows 7, click the _Formats_ tab, and then click " "_Customize this format_." msgstr "" #. type: Plain text -#: user-manual.txt:4573 +#: user-manual.txt:4584 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:4574 +#: user-manual.txt:4585 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4576 +#: user-manual.txt:4587 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4577 +#: user-manual.txt:4588 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4580 +#: user-manual.txt:4591 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4582 +#: user-manual.txt:4593 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:4583 +#: user-manual.txt:4594 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4589 +#: user-manual.txt:4600 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 " @@ -9752,13 +9767,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4590 +#: user-manual.txt:4601 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4596 +#: user-manual.txt:4607 msgid "" "Select the _Save_ button. The CSV-formatted file is saved into the folder " "that was selected. You can double check the .CSV file by opening it with a " @@ -9767,13 +9782,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4597 +#: user-manual.txt:4608 #, no-wrap msgid "APPENDIX E: Writing a custom print template" msgstr "" #. type: Plain text -#: user-manual.txt:4602 +#: user-manual.txt:4613 msgid "" "_Subsurface_ has a way to create or modify templates for printing dive logs " "to produce customized printouts of them. Templates written in HTML, as well " @@ -9782,12 +9797,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4604 +#: user-manual.txt:4615 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4612 +#: user-manual.txt:4623 msgid "" "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, " "_Import_ and _Export_ templates (see image *A* above). New or modified " @@ -9799,18 +9814,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4614 +#: user-manual.txt:4625 msgid "The Edit Panel has three tabs:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4615 +#: user-manual.txt:4626 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4619 +#: user-manual.txt:4630 msgid "" "The _Style_ tab (image *A* above) controls the font, line spacing and color " "template used for printing the dive log. The style attributes are " @@ -9818,7 +9833,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4623 +#: user-manual.txt:4634 msgid "" "The _Colors_ tab (image *B* above) allows editing the colors used for " "printing the dive log. The colors are highly customizable: the _Edit_ " @@ -9827,7 +9842,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4632 +#: user-manual.txt:4643 msgid "" "The _Template_ tab of the Edit Panel (see image below) allows creating a " "template using HTML as well as a few Grantlee programming " @@ -9843,13 +9858,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4633 +#: user-manual.txt:4644 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4638 +#: user-manual.txt:4649 msgid "" "You can adapt any of the existing templates and save it to the dive log " "directory. The standard templates (e.g. One dive, Six dives, Table) can be " @@ -9858,33 +9873,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4640 +#: user-manual.txt:4651 msgid "" "To write a custom template, the following elements must exist so the " "template will be correctly handled and rendered." msgstr "" #. type: Title === -#: user-manual.txt:4641 +#: user-manual.txt:4652 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4643 +#: user-manual.txt:4654 msgid "" "_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ back " "end. It is possible to iterate over the list as follows:" msgstr "" #. type: Block title -#: user-manual.txt:4643 user-manual.txt:4708 user-manual.txt:4725 +#: user-manual.txt:4654 user-manual.txt:4719 user-manual.txt:4736 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4648 +#: user-manual.txt:4659 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -9893,13 +9908,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4650 user-manual.txt:4713 user-manual.txt:4732 +#: user-manual.txt:4661 user-manual.txt:4724 user-manual.txt:4743 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4655 +#: user-manual.txt:4666 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -9908,25 +9923,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4658 +#: user-manual.txt:4669 msgid "" "Additional information about _Grantlee_ can be found " "http://www.grantlee.org/apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:4659 +#: user-manual.txt:4670 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:4661 +#: user-manual.txt:4672 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:4690 +#: user-manual.txt:4701 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9960,7 +9975,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4694 +#: user-manual.txt:4705 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -9968,7 +9983,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4706 +#: user-manual.txt:4717 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9987,26 +10002,26 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4711 +#: user-manual.txt:4722 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4716 +#: user-manual.txt:4727 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:4719 +#: user-manual.txt:4730 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:4722 +#: user-manual.txt:4733 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -10015,7 +10030,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4730 +#: user-manual.txt:4741 #, no-wrap msgid "" "\tbody {\n" @@ -10024,7 +10039,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4737 +#: user-manual.txt:4748 #, no-wrap msgid "" "\tbody {\n" @@ -10033,13 +10048,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4739 +#: user-manual.txt:4750 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:4742 +#: user-manual.txt:4753 msgid "" "As the dive profile is placed after rendering, _Subsurface_ uses special " "_CSS_ selectors to search in the HTML output. The _CSS_ selectors in the " @@ -10047,7 +10062,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4749 +#: user-manual.txt:4760 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -10060,20 +10075,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4752 +#: user-manual.txt:4763 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:4753 +#: user-manual.txt:4764 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:4757 +#: user-manual.txt:4768 msgid "" "There are two ways of rendering- either rendering a specific number of dives " "in each page or make _Subsurface_ try to fit as many dives as possible into " @@ -10081,55 +10096,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4759 +#: user-manual.txt:4770 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode." msgstr "" #. type: Plain text -#: user-manual.txt:4761 +#: user-manual.txt:4772 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:4764 +#: user-manual.txt:4775 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4767 +#: user-manual.txt:4778 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:4770 +#: user-manual.txt:4781 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4773 +#: user-manual.txt:4784 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" #. type: Title == -#: user-manual.txt:4774 +#: user-manual.txt:4785 #, no-wrap msgid "APPENDIX F: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:4776 +#: user-manual.txt:4787 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:4780 +#: user-manual.txt:4791 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_ " @@ -10137,7 +10152,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4786 +#: user-manual.txt:4797 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -10147,7 +10162,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4792 +#: user-manual.txt:4803 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 " @@ -10157,12 +10172,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4794 +#: user-manual.txt:4805 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:4800 +#: user-manual.txt:4811 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 " @@ -10173,12 +10188,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4802 +#: user-manual.txt:4813 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:4807 +#: user-manual.txt:4818 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 " @@ -10188,7 +10203,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4813 +#: user-manual.txt:4824 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 " @@ -10199,7 +10214,7 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4814 +#: user-manual.txt:4825 #, no-wrap msgid "" "Some dive profiles have time discrepancies with the recorded samples from my " @@ -10207,7 +10222,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4818 +#: user-manual.txt:4829 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -10215,7 +10230,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4826 +#: user-manual.txt:4837 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 " @@ -10229,13 +10244,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4827 +#: user-manual.txt:4838 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:4841 +#: user-manual.txt:4852 msgid "" "'Question': I cannot download all my dives, only the most recent ones, even " "though my dive computer's manual states that it records history of e.g. 999 " @@ -10250,7 +10265,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4845 +#: user-manual.txt:4856 msgid "" "If you have downloaded your dives to different dive logging software before " "they were overwritten, there is a good chance that Subsurface can import " diff --git a/Documentation/fr/po/subsurface-mobile-manual.fr.po b/Documentation/fr/po/subsurface-mobile-manual.fr.po index bbff215aa..cb828dfdb 100644 --- a/Documentation/fr/po/subsurface-mobile-manual.fr.po +++ b/Documentation/fr/po/subsurface-mobile-manual.fr.po @@ -2,52 +2,52 @@ # Copyright (C) 2016 Free Software Foundation, Inc. # This file is distributed under the same license as the subsurface-manual package. # -# Guillaume GARDET <guillaume.gardet@free.fr>, 2016. +# Guillaume GARDET <guillaume.gardet@free.fr>, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: subsurface-manual VERSION\n" "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n" -"POT-Creation-Date: 2016-11-30 13:40+0100\n" -"PO-Revision-Date: 2016-11-30 13:42+0100\n" -"Last-Translator: Guillaume GARDET <guillaume.gardet@opensuse.org>\n" -"Language-Team: French <opensuse-fr@opensuse.org>\n" +"POT-Creation-Date: 2017-10-11 10:20+0200\n" +"PO-Revision-Date: 2017-10-11 10:33+0100\n" +"Last-Translator: Guillaume GARDET <guillaume.gardet@free.fr>\n" +"Language-Team: French <kde-i18n-doc@kde.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #. :website: http://subsurface-divelog.org #. type: Target for macro image -#: mobile-manual.txt:12 +#: mobile-manual.txt:13 #, no-wrap msgid "mobile-images/banner.jpg" msgstr "mobile-images/banner.jpg" #. type: Plain text -#: mobile-manual.txt:15 +#: mobile-manual.txt:16 msgid "[big]#Subsurface-mobile USER MANUAL#" msgstr "[big]#MANUEL UTILISATEUR de Subsurface-mobile#" #. type: Plain text -#: mobile-manual.txt:17 +#: mobile-manual.txt:18 #, no-wrap -msgid "*Manual author*: Willem Ferguson\n" -msgstr "*Auteur du manuel* : Willem Ferguson\n" +msgid "*Manual authors*: Willem Ferguson, Dirk Hohndel\n" +msgstr "*Auteurs du manuel* : Willem Ferguson, Dirk Hohndel\n" #. type: Plain text -#: mobile-manual.txt:19 +#: mobile-manual.txt:20 msgid "toc::[]" msgstr "toc::[]" #. type: Plain text -#: mobile-manual.txt:21 -msgid "[blue]#_Version 1.1, September 2016_#" -msgstr "[blue]#_Version 1.1, Septembre 2016_#" +#: mobile-manual.txt:22 +msgid "[blue]#_Version 2, July 2017_#" +msgstr "[blue]#_Version 2, juillet 2017_#" #. type: Plain text -#: mobile-manual.txt:29 +#: mobile-manual.txt:30 msgid "" "Welcome as a user of _Subsurface_, advanced dive logging software with " "extensive infrastructure to describe, organize, interpret and print scuba " @@ -59,117 +59,123 @@ msgid "" msgstr "" #. type: Title - -#: mobile-manual.txt:31 +#: mobile-manual.txt:32 #, no-wrap msgid "Introducing Subsurface-mobile" msgstr "Présentation de Subsurface-mobile" #. type: Plain text -#: mobile-manual.txt:39 +#: mobile-manual.txt:40 msgid "" "_Subsurface-mobile_ is an extension of _Subsurface_ which runs on Android " -"smartphone and tablet devices and is a tool for viewing or sharing dive " -"information at dive sites where a larger computer is not useful. _Subsurface-" -"mobile_ for Android also allows the gathering of GPS locations where dives " -"are performed (Subsurface-mobile for iOS currently does not support GPS " -"functionality)." +"and iOS smartphone and tablet devices and is a tool for viewing or sharing " +"dive information at dive sites where a larger computer is not useful. " +"_Subsurface-mobile_ for Android also allows the gathering of GPS locations " +"where dives are performed (Subsurface-mobile for iOS currently does not have " +"full functionality)." msgstr "" "_Subsurface-mobile_ est une extension de _Subsurface_ qui fonctionne sur les " -"smartphones et les tablettes Android et c'est un outil pour visualiser et " -"partager des informations de plongées sur des sites de plongées où un " -"ordinateur n'est pas utile. _Subsurface-mobile_ permet également de " -"collecter des positions GPS où sont effectuées les plongées. (Subsurface-" -"mobile pour iOS ne supporte pas les fonctions GPS pour le moment)." +"smartphones Android et iOS et sur les tablettes. C'est un outil pour " +"visualiser et partager des informations de plongées sur des sites de " +"plongées où un ordinateur n'est pas utile. _Subsurface-mobile_ permet " +"également de collecter des positions GPS où sont effectuées les plongées. " +"(Subsurface-mobile pour iOS ne supporte pas toutes les fonctions pour le " +"moment)." #. type: Plain text -#: mobile-manual.txt:51 +#: mobile-manual.txt:52 msgid "" "_Subsurface-mobile_ allows you to enter and save dive information using a " -"mobile device. Most users of _Subsurface-mobile_ typically use the mobile " -"app as an extension to the laptop/desktop version of _Subsurface_. This " -"allows the storage of dive logs on the Internet sharing them between the " -"mobile and the desktop versions. But _Subsurface-mobile_ can be used " -"independently of _Subsurface_ and does not require the use of cloud " -"storage. While the desktop version of _Subsurface_ shows much more detailed " -"information for each dive, the mobile version allows a more accessible dive " -"log on a dive trip, useful for proving dive experience to dive shops or to " -"review previous dives." +"mobile device. Users of _Subsurface-mobile_ typically use the mobile app as " +"an extension to the laptop/desktop version of _Subsurface_ that allows the " +"storage of dive logs on the Internet and sharing them between the mobile and " +"the desktop versions. But _Subsurface-mobile_ can also be used independently " +"of _Subsurface_ and does not require the use of cloud storage. While the " +"desktop version of _Subsurface_ shows much more detailed information for " +"each dive, the mobile version allows a more accessible dive log on a dive " +"trip, useful for proving dive experience to dive shops or to review previous " +"dives." msgstr "" #. type: Plain text -#: mobile-manual.txt:53 +#: mobile-manual.txt:54 msgid "_Subsurface-mobile_ allows you to:" msgstr "" #. type: Plain text -#: mobile-manual.txt:55 +#: mobile-manual.txt:56 msgid "Download existing dive log information from the Internet." msgstr "" #. type: Plain text -#: mobile-manual.txt:56 +#: mobile-manual.txt:57 msgid "View this information on a mobile device." msgstr "" #. type: Plain text -#: mobile-manual.txt:58 +#: mobile-manual.txt:59 msgid "" "Edit many of the dive log data fields, e.g. divemaster, buddy, equipment or " "notes about a dive." msgstr "" #. type: Plain text -#: mobile-manual.txt:59 +#: mobile-manual.txt:60 msgid "Manually create and add new dive records to your dive log." msgstr "" #. type: Plain text -#: mobile-manual.txt:60 +#: mobile-manual.txt:61 +msgid "Download dive data directly from many dive computers." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:62 msgid "Store the updated dive log in the _Subsurface_ cloud storage." msgstr "" #. type: Plain text -#: mobile-manual.txt:61 +#: mobile-manual.txt:63 msgid "Record, store and apply GPS positions of dives (Android only)." msgstr "" #. type: Plain text -#: mobile-manual.txt:63 +#: mobile-manual.txt:65 msgid "View the localities of recorded GPS positions and of dives on a map." msgstr "" #. type: Plain text -#: mobile-manual.txt:70 +#: mobile-manual.txt:71 msgid "" -"These items are discussed in greater detail in the following text. What " -"_Subsurface-mobile_ does not support (at this time) is downloading dive data " -"directly from a dive computer. That still needs to be done using " -"_Subsurface_ on a desktop or laptop computer. We are investigating ways to " -"support downloading from a subset of the supported dive computers on Android " -"devices, but this is not yet ready for testing." +"These items are discussed in greater detail in the following text. " +"_Subsurface-mobile_ does not yet support download of dive data from all the " +"dive computers that the desktop/laptop version can: that still needs to be " +"done using _Subsurface_ on a desktop or laptop computer. Only a subset of " +"dive computers that use a FTDI USB interface or a Bluetooth/BTLE interface " +"are accessible by _Subsurface-mobile_." msgstr "" #. type: Title == -#: mobile-manual.txt:71 +#: mobile-manual.txt:72 #, no-wrap msgid "Installing _Subsurface-mobile_ on your mobile device" msgstr "" #. type: Plain text -#: mobile-manual.txt:75 +#: mobile-manual.txt:76 msgid "" "Find _Subsurface-mobile_ in the _Google Play Store_ or the _iTunes Store_ " "and install it." msgstr "" #. type: Title == -#: mobile-manual.txt:76 +#: mobile-manual.txt:77 #, no-wrap msgid "Using _Subsurface-mobile_ for the first time" msgstr "" #. type: Plain text -#: mobile-manual.txt:82 +#: mobile-manual.txt:83 msgid "" "Upon starting _Subsurface-mobile_ for the first time, a Subsurface splash " "screen is shown while the program loads. On some devices this may take " @@ -178,34 +184,34 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:84 +#: mobile-manual.txt:85 msgid "" "Select whether _Subsurface-mobile_ should access the Internet for dive log " -"information." +"information as follows:" msgstr "" #. type: Title === -#: mobile-manual.txt:85 +#: mobile-manual.txt:86 #, no-wrap msgid "When NOT Using Cloud Storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:90 +#: mobile-manual.txt:91 msgid "" "Tap the striked-out cloud icon. The app will not access the _Subsurface_ " "cloud storage server to obtain dive log information. This means that dive " -"log information is manually entered and stored on the mobile device only." +"log information is stored on the mobile device only." msgstr "" #. type: Title === -#: mobile-manual.txt:91 +#: mobile-manual.txt:92 #, no-wrap msgid "Using Cloud Storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:95 +#: mobile-manual.txt:96 msgid "" "In order to use the _Subsurface_ cloud storage, an account on the cloud " "server is required. If you have already set up an account from the " @@ -213,18 +219,19 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:97 -msgid "You can also create a new account from your mobile device." +#: mobile-manual.txt:98 +msgid "" +"You can also create a new cloud storage account from your mobile device." msgstr "" #. type: Title ==== -#: mobile-manual.txt:98 +#: mobile-manual.txt:99 #, no-wrap msgid "Using the desktop version of _Subsurface_:" msgstr "" #. type: Plain text -#: mobile-manual.txt:109 +#: mobile-manual.txt:110 #, no-wrap msgid "" "Open the desktop version of _Subsurface_ and\n" @@ -239,7 +246,7 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:118 +#: mobile-manual.txt:119 msgid "" "Once the dive list has been downloaded from the Internet, _Subsurface-" "mobile_ keeps a local copy on the mobile device. This means that even if " @@ -251,19 +258,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:120 +#: mobile-manual.txt:121 #, no-wrap msgid "mobile-images/Credentials.jpg" msgstr "mobile-images/Credentials.jpg" #. type: Title ==== -#: mobile-manual.txt:123 +#: mobile-manual.txt:124 #, no-wrap msgid "Using _Subsurface-mobile_:" msgstr "" #. type: Plain text -#: mobile-manual.txt:131 +#: mobile-manual.txt:132 msgid "" "Enter an e-mail address and a password in the fields indicated on the " "screen. The e-mail should be in lower case and the password should contain " @@ -276,14 +283,14 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:134 +#: mobile-manual.txt:135 msgid "" "Tap the Disk (Save) icon at the bottom of the screen. A PIN is sent to the e-" "mail address provided." msgstr "" #. type: Plain text -#: mobile-manual.txt:137 +#: mobile-manual.txt:138 msgid "" "Enter the PIN into the field indicated and tap the _Save_ icon again. The " "user information is stored on the cloud server and access to the cloud is " @@ -291,21 +298,21 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:141 +#: mobile-manual.txt:142 msgid "" -"The dive list is initially empty. You can now start entering dives in the " -"dive log or you can download existing dives from your _Subsurface_ cloud " -"storage account." +"The dive list is initially empty. Start entering dives in the dive log or " +"download dive information from either a _Subsurface_ cloud storage account " +"or from a dive computer." msgstr "" #. type: Title == -#: mobile-manual.txt:143 +#: mobile-manual.txt:144 #, no-wrap -msgid "A Few Remarks About The User Interface" +msgid "Menu Structure and User Interface" msgstr "" #. type: Plain text -#: mobile-manual.txt:152 +#: mobile-manual.txt:153 msgid "" "At the bottom of many Subsurface-mobile screens is a round button that " "provides for several actions and which allows the selection of the main " @@ -317,20 +324,20 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:155 +#: mobile-manual.txt:156 msgid "" "On iOS devices, on screens where a \"back\" action is enabled, a back arrow " "is shown in the top left corner of the screen." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:156 +#: mobile-manual.txt:157 #, no-wrap msgid "mobile-images/actionbutton.jpg" msgstr "mobile-images/actionbutton.jpg" #. type: Plain text -#: mobile-manual.txt:164 +#: mobile-manual.txt:165 msgid "" "In order to have a consistent experience between iOS and Android, " "_Subsurface-mobile_ on Android does not use the traditional \"hamburger\" " @@ -341,40 +348,40 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:167 +#: mobile-manual.txt:168 msgid "" "Tap the \"hamburger\" symbol in the lower left corner of the screen (easy to " "reach for hand held devices)" msgstr "" #. type: Plain text -#: mobile-manual.txt:168 +#: mobile-manual.txt:169 msgid "Swipe towards the right across the left edge of the screen" msgstr "" #. type: Plain text -#: mobile-manual.txt:170 +#: mobile-manual.txt:171 msgid "Drag the action button visible on most screens to the right" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:171 +#: mobile-manual.txt:172 #, no-wrap -msgid "mobile-images/menu.jpg" -msgstr "mobile-images/menu.jpg" +msgid "mobile-images/MainMenu2.jpg" +msgstr "mobile-images/MainMenu2.jpg" #. type: Plain text -#: mobile-manual.txt:177 +#: mobile-manual.txt:179 msgid "" "The images above indicate some of the important features of the menu " -"system. On the left is the main menu that is activated as described above. " -"In the middle is the menu that opens if you tap the _GPS_ option on the main " -"menu. On the right is the menu that opens if you tap the _Manage Dives_ " -"option on the main menu." +"system. On the left is the main menu, activated as described above. On the " +"right, above, is a representation of the menu items of all the submenus " +"accessible from the main menu: the main menu items are shown on the left " +"while the submenu contents are shown on a blue background on the right." msgstr "" #. type: Plain text -#: mobile-manual.txt:181 +#: mobile-manual.txt:183 msgid "" "All screenshots in this user manual are currently from the Android version. " "As indicated earlier, the iOS version currently doesn't support _GPS_ " @@ -382,31 +389,31 @@ msgid "" msgstr "" #. type: Title == -#: mobile-manual.txt:182 +#: mobile-manual.txt:184 #, no-wrap msgid "Viewing the Dive List" msgstr "" #. type: Plain text -#: mobile-manual.txt:190 +#: mobile-manual.txt:193 msgid "" "Most of the actions of _Subsurface-mobile_ center around the dives on the " "dive list. While the dive list is loading from the cloud, a message appears " -"at the bottom of the screen, indicating that the cloud is being accessed " -"(see image on left, below). Once the list is loaded you can scroll up and " -"down. Tapping a dive on the list brings up a display of _Details View_ for " -"that dive (see image on right below). This includes the dive profile as " -"well as additional information and notes." +"at the bottom of the screen, indicating that the cloud is being accessed. " +"Once the list is loaded you can scroll up and down. Tapping a dive on the " +"list brings up a display of _Details View_ for that dive (see image on right " +"below). This includes the dive profile as well as additional information and " +"notes." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:191 +#: mobile-manual.txt:194 #, no-wrap msgid "mobile-images/DiveList.jpg" msgstr "mobile-images/DiveList.jpg" #. type: Plain text -#: mobile-manual.txt:199 +#: mobile-manual.txt:202 msgid "" "You can view other dives by swiping the _Details view_ to the right (for the " "previous dive) or to the left (following dive). Using the Action Bar, it is " @@ -416,13 +423,13 @@ msgid "" msgstr "" #. type: Title == -#: mobile-manual.txt:200 +#: mobile-manual.txt:204 #, no-wrap msgid "Editing dive details" msgstr "" #. type: Plain text -#: mobile-manual.txt:211 +#: mobile-manual.txt:215 msgid "" "At the bottom of the dive details screen the _Action Button_ contains a " "pencil (image on right, above). Tapping the pencil button brings up a panel " @@ -436,19 +443,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:212 +#: mobile-manual.txt:216 #, no-wrap msgid "mobile-images/EditDive.jpg" msgstr "mobile-images/EditDive.jpg" #. type: Title == -#: mobile-manual.txt:214 +#: mobile-manual.txt:219 #, no-wrap msgid "Adding a new dive to the dive list" msgstr "" #. type: Plain text -#: mobile-manual.txt:226 +#: mobile-manual.txt:231 msgid "" "You can manually add a dive to the existing dive list. On the dive list tap " "the \"plus\" sign in the _Action Button_, or use the main menu and tap " @@ -464,19 +471,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:227 +#: mobile-manual.txt:232 #, no-wrap msgid "mobile-images/ManuallyEnterDive.jpg" msgstr "mobile-images/ManuallyEnterDive.jpg" #. type: Title == -#: mobile-manual.txt:229 +#: mobile-manual.txt:234 #, no-wrap msgid "Deleting a dive" msgstr "" #. type: Plain text -#: mobile-manual.txt:235 +#: mobile-manual.txt:240 msgid "" "The _Details View_ of a dive has an Action Bar, including a dustbin. If this " "is tapped, the dive shown in the _Details View_ is deleted. You have a brief " @@ -485,13 +492,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:236 +#: mobile-manual.txt:241 #, no-wrap msgid "mobile-images/Delete_undo.jpg" msgstr "mobile-images/Delete_undo.jpg" #. type: Plain text -#: mobile-manual.txt:243 +#: mobile-manual.txt:248 msgid "" "You can also delete a dive from the dive list by long-pressing a specific " "dive until a red dustbin appears on the right-hand side (see image below). " @@ -502,65 +509,183 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:244 +#: mobile-manual.txt:249 #, no-wrap msgid "mobile-images/RedDustbin.jpg" msgstr "mobile-images/RedDustbin.jpg" #. type: Title == -#: mobile-manual.txt:246 +#: mobile-manual.txt:251 #, no-wrap -msgid "Dive log management" +msgid "Download dives from a dive computer" +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:254 +msgid "" +"Download of dives is possible from dive computers with a FTDI USB interface, " +"or with a Bluetooth interface." msgstr "" #. type: Plain text #: mobile-manual.txt:256 msgid "" +"First, establish a link between the dive computer and the mobile device." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:265 +msgid "" +"For USB dive computers, USB cables \"normally\" used for uploading dives to " +"a desktop/laptop computer do NOT work: these cables often have a full-sized " +"male USB plug on one end which plugs into the USB port of a desktop/laptop " +"computer. For downloads to a mobile device one needs a USB OTG (USB On-The-" +"Go) cable. In most cases it is required to plug the USB cable \"normally\" " +"used with the dive computer into a USB OTG cable which, in turn, plugs into " +"the mini-USB receptacle of the mobile device. The OTG cable often has a full-" +"size female receptacle at one end which accommodates the full-sized male " +"plug of the USB cable \"normally\" used (see image below). This means that " +"two cables are used to connect the dive computer to the mobile device." +msgstr "" + +#. type: Target for macro image +#: mobile-manual.txt:266 +#, no-wrap +msgid "mobile-images/USB-OTG.jpg" +msgstr "mobile-images/USB-OTG.jpg" + +#. type: Plain text +#: mobile-manual.txt:273 +msgid "" +"For Bluetooth-equipped dive computers, establish a Bluetooth connection " +"between the dive computer and the mobile device. Use the tools on the mobile " +"device to achieve this. For of Android mobile devices, the Settings -> " +"Bluetooth tool is probably appropriate. Ensure pairing of the dive computer " +"and mobile device. _Subsurface-mobile_ performs communication using both " +"Bluetooth and Bluetooth-low-energy (BTLE). The appropriate choice of " +"Bluetooth communication is made by the software and the user need not be " +"concerned with this." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:280 +msgid "" +"With propper communication between dive computer and _Subsurface-mobile_ " +"having been set up, dive download is simple. From the main menu, tap " +"_Manage dives -> Download from DC_. A screen is shown requiring that the " +"user specify the names of the vendor and model of the dive computer. For " +"instance, when using a Shearwater Petrel 2 dive computer, the vendor is " +"_Shearwater_ and the Dive computer name is _Petrel 2_. From the two dropdown " +"lists at the top of the screen, select the correct vendor and dive computer " +"names (see image on the left, below). If using a dive computer using a " +"Bluetooth connection, then tap the check box labelled _Bluetooth download_." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:288 +msgid "" +"Now tap the button labled _DOWNLOAD_. The downloaded dives appear in the " +"bottom part of the screen, the most recent dive at the top (see image on " +"right, below). Be patient because the download can sometimes take a few " +"mimnutes. Each dive has a check-box on the left hand side, used for " +"selecting which dives need to be added to the _Subsurface-mobile_ dive list: " +"dives that are not checked are ignored. With the appropriate downloaded " +"dives having been checked, tap the button at the bottom left labled " +"_ACCEPT_. All the selected dives appear on the _Subsurface-mobile_ dive " +"list. The downloaded dive information can now be edited as described in the " +"section above xref:S_Edit_Dive[Edit a dive]." +msgstr "" + +#. type: Target for macro image +#: mobile-manual.txt:289 +#, no-wrap +msgid "mobile-images/DC-Download.jpg" +msgstr "mobile-images/DC-Download.jpg" + +#. type: Title == +#: mobile-manual.txt:291 +#, no-wrap +msgid "Viewing the dive location on Google Maps" +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:296 +msgid "" +"The site of a specific dive can be viewed in two ways using the _Details " +"View_. The Action Bar at the bottom has a GPS pin on the left hand side. " +"Tap that pin and the dive site is shown in Google Maps. Close Google Maps by " +"using the Android _Back_ button." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:299 +msgid "" +"Alternatively, the _Details View_ has a button at the top right hand marked " +"_Map it_. Tap this button to open Google Maps showing the dive site." +msgstr "" + +#. type: Target for macro image +#: mobile-manual.txt:300 +#, no-wrap +msgid "mobile-images/Map.jpg" +msgstr "mobile-images/Map.jpg" + +#. type: Title == +#: mobile-manual.txt:302 +#, no-wrap +msgid "Dive log management" +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:312 +msgid "" "A central part of _Subsurface-mobile_ is the ability to store the dive log " "using the _Subsurface_ cloud storage. This provides security against loss " "or damage to the dive information contained in a local copy of the dive log " "and allows the desktop version of _Subsurface_ to access changes made using " "the mobile device. This ability is accessed through the main menu (by " -"dragging the Action Button to the right, or alternatively tappping the " +"dragging the Action Button to the right, or alternatively tapping the " "\"Hamburger\" icon at the bottom left of the screen). Tap the option " "_Manage dives_, enabling a number of options:" msgstr "" #. type: Title === -#: mobile-manual.txt:257 +#: mobile-manual.txt:313 #, no-wrap msgid "Add new dive manually" msgstr "" #. type: Plain text -#: mobile-manual.txt:260 -msgid "This is described above under the section dealing with the dive list." +#: mobile-manual.txt:316 +msgid "" +"This is described above under the section dealing with xref:" +"S_Add_Dive[Adding a new dive to the dive list]." msgstr "" #. type: Title === -#: mobile-manual.txt:261 +#: mobile-manual.txt:317 #, no-wrap msgid "Sync the dive log with the _Subsurface_ cloud storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:268 +#: mobile-manual.txt:324 msgid "" -"You can upload the dives contained on the mobile device to the _Subsurface_ " -"cloud storage by tapping the option _Manual sync with coud_. This " -"synchronizes the local changes to the dive log with the cloud storage. It " -"also downloads changes made on another device or computer and stored in " +"Upload the dives contained on the mobile device to the _Subsurface_ cloud " +"storage by tapping the option _Manual sync with cloud_. This synchronizes " +"the local changes to the dive log with the cloud storage. It also downloads " +"changes made to the dive log using another device or computer and stored in " "cloud storage." msgstr "" #. type: Title === -#: mobile-manual.txt:269 +#: mobile-manual.txt:325 #, no-wrap msgid "Working offline or online" msgstr "" #. type: Plain text -#: mobile-manual.txt:278 +#: mobile-manual.txt:334 msgid "" "By default _Subsurface-mobile_ runs offline and only syncs the dive list " "with cloud storage when explicily told to do so (see above). You can choose " @@ -571,27 +696,49 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:279 +#: mobile-manual.txt:335 #, no-wrap msgid "Changing the login credentials on the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:285 +#: mobile-manual.txt:341 +msgid "" +"The login credentials (for example to work with multiple accounts) can be " +"changed by opening the main menu and by tapping _Settings -> Cloud " +"credentials_. This opens the screen for specifying new credentials." +msgstr "" + +#. type: Title === +#: mobile-manual.txt:342 +#, no-wrap +msgid "Changing the colour scheme of _Subsurface-mobile_" +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:349 msgid "" -"If you need to change your login credentials (for example to work with " -"multiple accounts) you can open the main menu and tap _Cloud credentials_. " -"This opens the setup screen for specifying new credentials." +"_Subsurface-mobile_ has three colour schemes to please users with different " +"tastes. This user manual shows the default colour scheme, comprising blue " +"colours. Change to a pink or a dark colour scheme by opening the main menu " +"and tap Settings -> Preferences. This opens the Preferences screen that " +"includes the three colour schemes (see image below)." msgstr "" +#. type: Target for macro image +#: mobile-manual.txt:350 +#, no-wrap +msgid "mobile-images/ColourSchemes.jpg" +msgstr "mobile-images/ColourSchemes.jpg" + #. type: Title == -#: mobile-manual.txt:287 +#: mobile-manual.txt:352 #, no-wrap msgid "Recording dive locations using GPS (Android only)." msgstr "" #. type: Plain text -#: mobile-manual.txt:294 +#: mobile-manual.txt:359 msgid "" "The fact that most smartphones have GPS facilities allows _Subsurface-" "mobile_ on Android to record the locations of dives. You can take the " @@ -601,111 +748,109 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:295 +#: mobile-manual.txt:360 #, no-wrap msgid "Setting up the GPS" msgstr "" #. type: Plain text -#: mobile-manual.txt:304 +#: mobile-manual.txt:368 msgid "" "Open the main menu and tap _GPS -> Preferences_. Now specify the way in " -"which GPS data need to be automatically collected (image on right, below). " -"You can specify that data are collected at regular intervals, e.g. every 10 " -"minutes, or at regular distances, e.g. after the boat has moved more than " -"200m, or a combination of both of the above approaches. Provide the " -"appropriate information and tap the _Save_ action button. The program is now " -"ready to collect GPS positions." +"which GPS data need to be automatically collected (image above). Data are " +"collected at regular intervals, e.g. every 5 minutes, or at regular " +"distances, e.g. after the boat has moved more than 200m, or a combination of " +"both of these approaches. Provide the appropriate information and tap the " +"_Save_ action button. The program is now ready to collect GPS positions." msgstr "" -#. type: Target for macro image -#: mobile-manual.txt:305 -#, no-wrap -msgid "mobile-images/gpssetup.jpg" -msgstr "mobile-images/gpssetup.jpg" - #. type: Title === -#: mobile-manual.txt:307 +#: mobile-manual.txt:369 #, no-wrap msgid "Collecting GPS positions" msgstr "" +#. type: Target for macro image +#: mobile-manual.txt:371 +#, no-wrap +msgid "mobile-images/Mainmenu.jpg" +msgstr "mobile-images/Mainmenu.jpg" + #. type: Plain text -#: mobile-manual.txt:316 +#: mobile-manual.txt:380 msgid "" "Ensure that the GPS on the Android device has been activated. At the bottom " -"of the GPS submenu is a check box _Run location service_ (image on left, " -"above). Check this box and _Subsurface-mobile_ starts to collect GPS " -"locations automatically, following the preferences specified as described " -"above. After return from the dive trip you can deactivate the collection of " -"GPS data by de-activating the same check box at the bottom of the main menu." +"of the GPS submenu is a check box _Run location service_ (image above). " +"Check this box and _Subsurface-mobile_ starts to collect GPS locations " +"automatically, following the preferences specified as described above. After " +"return from the dive trip you can deactivate the collection of GPS data by " +"de-activating the same check box at the bottom of the main menu." msgstr "" #. type: Title === -#: mobile-manual.txt:317 +#: mobile-manual.txt:381 #, no-wrap msgid "Storing the GPS data on the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:324 +#: mobile-manual.txt:388 msgid "" "Activate the main menu and select the _GPS_ option that brings up the " -"submenu of GPS-related actions (image on left, above). Tap _Upload GPS data_ " -"that saves the GPS data on the _Subsurface_ cloud server. These GPS data are " -"saved *separately* from the other dive log data. All collected GPS data are " -"kept on the Android device, independent of whether they have been uploaded " -"or not." +"submenu of GPS-related actions. Tap _Upload GPS data_ that saves the GPS " +"data on the _Subsurface_ cloud server. These GPS data are saved *separately* " +"from the other dive log data. All collected GPS data are kept on the Android " +"device, independent of whether they have been uploaded or not." msgstr "" #. type: Title === -#: mobile-manual.txt:325 +#: mobile-manual.txt:389 #, no-wrap msgid "Downloading GPS data from the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:330 +#: mobile-manual.txt:394 msgid "" "Download the GPS data that have been saved on the cloud (possibly by a " "different device) by selecting _Download GPS Data_ from the GPS subpanel." msgstr "" #. type: Title === -#: mobile-manual.txt:331 +#: mobile-manual.txt:395 #, no-wrap msgid "Viewing GPS data" msgstr "" #. type: Plain text -#: mobile-manual.txt:342 +#: mobile-manual.txt:406 msgid "" -"From the GPS submenu (image on left, above) select _Show GPS fixes_. This " -"brings up a list of GPS positions obtained using the location service (image " -"on left, below). Two actions are possible for each of the locations, enabled " -"if you tap the handle (the three horisontal stripes on the right, see image " -"on left, below) and then drags the specific item to the left (image on " -"right, below). This exposes two options. Tapping the dustbin deletes this " -"particular GPS location. Tapping the teardrop-shaped icon (actually a Google " -"Maps pin) opens up Google Maps with a pin indicating the exact map position " -"of the GPS record being viewed. The two above options can be hidden by " -"drawing the GPS record to the right, again using the handle." +"From the GPS submenu select _Show GPS fixes_. This brings up a list of GPS " +"positions obtained using the location service (image on left, below). Two " +"actions are possible for each of the locations, enabled if you tap the " +"handle (the three horisontal stripes on the right, see image on left, below) " +"and then drags the specific item to the left (image on right, below). This " +"exposes two options. Tapping the dustbin deletes this particular GPS " +"location. Tapping the teardrop-shaped icon (actually a Google Maps pin) " +"opens up Google Maps with a pin indicating the exact map position of the GPS " +"record being viewed. The two above options can be hidden by drawing the GPS " +"record to the right, again using the handle." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:343 +#: mobile-manual.txt:407 #, no-wrap msgid "mobile-images/gpsmanagement.jpg" msgstr "mobile-images/gpsmanagement.jpg" #. type: Title === -#: mobile-manual.txt:345 +#: mobile-manual.txt:409 #, no-wrap msgid "Applying GPS data to dives in the dive log" msgstr "" #. type: Plain text -#: mobile-manual.txt:353 +#: mobile-manual.txt:417 msgid "" "Assuming that all the dives have been entered into the dive log or have been " "downloaded from the _Subsurface_ cloud, you can apply the GPS positions to " @@ -717,6 +862,9 @@ msgid "" "the dive log." msgstr "" +#~ msgid "mobile-images/gpssetup.jpg" +#~ msgstr "mobile-images/gpssetup.jpg" + #~ msgid "" #~ "Because of the restrictions of iOS, _Subsurface-mobile_ for iOS does not " #~ "have all the features of the same app for Android." diff --git a/Documentation/fr/po/subsurface-user-manual.fr.po b/Documentation/fr/po/subsurface-user-manual.fr.po index ed4aef3e8..72df302bf 100644 --- a/Documentation/fr/po/subsurface-user-manual.fr.po +++ b/Documentation/fr/po/subsurface-user-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: 2017-07-04 13:37+0200\n" -"PO-Revision-Date: 2017-07-04 13:47+0100\n" +"POT-Creation-Date: 2017-10-11 10:20+0200\n" +"PO-Revision-Date: 2017-10-11 10:28+0100\n" "Last-Translator: Guillaume GARDET <guillaume.gardet@free.fr>\n" "Language-Team: French <kde-i18n-doc@kde.org>\n" "Language: fr\n" @@ -36,12 +36,16 @@ msgstr "[big]#MANUEL UTILISATEUR#" #: user-manual.txt:21 #, no-wrap msgid "" -"*Manual authors*: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,\n" -"Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves,\n" +"*Manual authors*: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout" +" Hoornweg,\n" +"Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat," +" Pedro Neves,\n" "Stefan Fuchs\n" msgstr "" -"*Auteurs du manuel* : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,\n" -"Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves,\n" +"*Auteurs du manuel* : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout" +" Hoornweg,\n" +"Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat," +" Pedro Neves,\n" "Stefan Fuchs\n" #. type: Plain text @@ -86,11 +90,10 @@ msgstr "" msgid "" "Do you use two different dive computer brands, each with its own proprietary " "software for downloading dive logs? Do you dive with rebreathers as well as " -"open circuit or recreational equipment? Do you use a Reefnet Sensus " -"time-depth recorder along with a dive computer? _Subsurface_ offers a " -"standard interface for downloading dive logs from all of these different " -"pieces of equipment, storing and analyzing the dive logs within a unified " -"system." +"open circuit or recreational equipment? Do you use a Reefnet Sensus time-" +"depth recorder along with a dive computer? _Subsurface_ offers a standard " +"interface for downloading dive logs from all of these different pieces of " +"equipment, storing and analyzing the dive logs within a unified system." msgstr "" "Utilisez-vous deux marques différentes d'ordinateurs de plongée, chacun avec " "son propre logiciel propriétaire pour télécharger les enregistrements des " @@ -171,23 +174,22 @@ msgstr "" #: user-manual.txt:64 msgid "" "This manual explains how to use the _Subsurface_ program. To install the " -"software, consult the _Downloads_ page on the " -"https://subsurface-divelog.org/[_Subsurface_ web site]. Please discuss " -"issues with this program by sending an email to " -"mailto:subsurface@subsurface-divelog.org[our mailing list] and report bugs " -"at https://github.com/Subsurface-divelog/subsurface/issues[our bugtracker]. " -"For instructions on how to build the software and (if needed) its " -"dependencies please consult the INSTALL file included with the source code." +"software, consult the _Downloads_ page on the https://subsurface-divelog.org/" +"[_Subsurface_ web site]. Please discuss issues with this program by sending " +"an email to mailto:subsurface@subsurface-divelog.org[our mailing list] and " +"report bugs at https://github.com/Subsurface-divelog/subsurface/issues[our " +"bugtracker]. For instructions on how to build the software and (if needed) " +"its dependencies please consult the INSTALL file included with the source " +"code." msgstr "" "Ce manuel explique comment utiliser le programme _Subsurface_. Pour " -"installer le logiciel, consultez la page _Téléchargement_ sur le " -"https://subsurface-divelog.org/[site web de _Subsurface_]. En cas de " -"problème, vous pouvez envoyer un e-mail sur " -"mailto:subsurface@subsurface-divelog.org[notre liste de diffusion] et " -"rapportez les bogues sur http://trac.hohndel.org[notre bugtracker]. Pour " -"des instructions de compilation du logiciel et (si besoin) de ses " -"dépendances, merci de consulter le fichier INSTALL inclus dans les sources " -"logicielles." +"installer le logiciel, consultez la page _Téléchargement_ sur le https://" +"subsurface-divelog.org/[site web de _Subsurface_]. En cas de problème, vous " +"pouvez envoyer un e-mail sur mailto:subsurface@subsurface-divelog.org[notre " +"liste de diffusion] et rapportez les bogues sur http://trac.hohndel." +"org[notre bugtracker]. Pour des instructions de compilation du logiciel et " +"(si besoin) de ses dépendances, merci de consulter le fichier INSTALL inclus " +"dans les sources logicielles." #. type: Plain text #: user-manual.txt:67 @@ -307,8 +309,8 @@ msgstr "" "ou cliquez sur l'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'utilisation de Subsurface changent, vous pouvez " -"envoyer un nouveau sondage en démarrant _Subsurface_ avec l'option " -"_--survey_ sur la ligne de commande." +"envoyer un nouveau sondage en démarrant _Subsurface_ avec l'option _--" +"survey_ sur la ligne de commande." #. type: Title - #: user-manual.txt:115 @@ -433,7 +435,9 @@ msgstr "" #: user-manual.txt:159 #, no-wrap msgid "*All*: show all four of the panels as in the screenshot above.\n" -msgstr "*Tout* : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.\n" +msgstr "" +"*Tout* : affiche les quatre panneaux tels que sur la capture d'écran" +" ci-dessus.\n" #. type: Plain text #: user-manual.txt:161 @@ -445,7 +449,9 @@ msgstr "*Liste des plongées* : affiche uniquement la liste des plongées.\n" #: user-manual.txt:163 #, no-wrap msgid "*Profile*: Show only the Dive Profile of the selected dive.\n" -msgstr "*Profil* : affiche uniquement le profile de plongée de la plongée sélectionnée.\n" +msgstr "" +"*Profil* : affiche uniquement le profile de plongée de la plongée" +" sélectionnée.\n" #. type: Plain text #: user-manual.txt:166 @@ -454,14 +460,17 @@ msgid "" "*Info*: Show only the Notes about the last selected dive and statistics for\n" "all highlighted dives.\n" msgstr "" -"*Info* : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour\n" +"*Info* : affiche uniquement les notes de plongées de la dernière plongée" +" sélectionnée et les statistiques pour\n" "toutes les plongées mises en surbrillance.\n" #. type: Plain text #: user-manual.txt:168 #, no-wrap msgid "*Globe*: Show only the world map, centered on the last selected dive.\n" -msgstr "*Globe* : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.\n" +msgstr "" +"*Globe* : affiche uniquement la carte mondiale, centrée sur la dernière" +" plongée sélectionnée.\n" #. type: Plain text #: user-manual.txt:173 @@ -552,8 +561,8 @@ msgstr "" #. type: Plain text #: user-manual.txt:198 msgid "" -"use a dive computer and dives were recorded in a written logbook. See: " -"xref:S_EnterData[Entering dive information by hand]" +"use a dive computer and dives were recorded in a written logbook. See: xref:" +"S_EnterData[Entering dive information by hand]" msgstr "" "utilisé d'ordinateur de plongée et que les plongées sont inscrites dans un " "carnet manuscrit. Voir xref:S_EnterData[Entrer les informations de plongée " @@ -575,8 +584,8 @@ msgid "" "in CSV format]." msgstr "" "soit dans un fichier CSV. Se reporter à : xref:S_Appendix_D[ANNEXE D : " -"Exporter un tableur vers le format CSV] et à " -"xref:S_ImportingCSVDives[Importer des plongées au format CSV]." +"Exporter un tableur vers le format CSV] et à xref:" +"S_ImportingCSVDives[Importer des plongées au format CSV]." #. type: Plain text #: user-manual.txt:206 @@ -821,8 +830,8 @@ msgstr "images/DiveProfile3_f20.jpg" msgid "" "With the profile now defined, more details must be added to have a fuller " "record of the dive. To do this, the *Notes* and the *Equipment* tabs on the " -"top left hand of the _Subsurface_ window should be used. Click on " -"xref:S_Notes_dc[*this link*] for instructions on how to use these tabs." +"top left hand of the _Subsurface_ window should be used. Click on xref:" +"S_Notes_dc[*this link*] for instructions on how to use these tabs." msgstr "" "Une fois le profil déterminé, d'autres détails doivent être ajoutés pour " "obtenir un enregistrement complet de la plongée. Pour y arriver, les onglets " @@ -834,7 +843,9 @@ msgstr "" #: user-manual.txt:296 #, no-wrap msgid "Importing new dive information from a Dive Computer" -msgstr "Importer de nouvelles informations de plongée à partir de l'ordinateur de plongée" +msgstr "" +"Importer de nouvelles informations de plongée à partir de l'ordinateur de" +" plongée" #. type: Title ==== #: user-manual.txt:298 @@ -849,9 +860,9 @@ msgid "" "information about each dive, e.g. a detailed record of depth, duration, " "rates of ascent/descent and of gas partial pressures. _Subsurface_ can " "capture this information, using dive details from a wide range of dive " -"computers. The latest list of supported dive computers can be found at: " -"link:https://subsurface-divelog.org/documentation/supported-dive-computers/[ " -"Supported dive computers]." +"computers. The latest list of supported dive computers can be found at: link:" +"https://subsurface-divelog.org/documentation/supported-dive-computers/" +"[ Supported dive computers]." msgstr "" "L'utilisation d'ordinateurs de plongée permet la collecte d'un grand nombre " "d'informations à propos de chaque plongée, comme un enregistrement détaillé " @@ -899,11 +910,12 @@ msgid "" "of the computer with _Subsurface_ that communicates with the dive computer. " "To set up this communication, users need to find the appropriate information " "to instruct _Subsurface_ where and how to import the dive information. xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " +"_appendix_a_operating_system_specific_information_for_importing_dive_informati" +"on_from_a_dive_computer[Appendix " "A] provides the technical information to help the user achieve this for " "different operating systems and xref:" -"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix " - +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[" +"Appendix " "B] has dive computer specific information." msgstr "" "Pour importer les informations depuis un ordinateur de plongée vers un " @@ -914,10 +926,12 @@ msgstr "" "cette communication, les utilisateurs doivent trouver l'information " "appropriée pour renseigner à _Subsurface_ d'où et comment importer les " "informations de plongée. xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Annexe " +"_appendix_a_operating_system_specific_information_for_importing_dive_informati" +"on_from_a_dive_computer[Annexe " "A] donne les informations techniques pour aider l'utilisateur à configurer " "ceci pour les différents systèmes d'exploitation et xref:" -"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Annexe " +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[" +"Annexe " "B] contient des informations spécifiques à chaque ordinateur de plongée." #. type: Plain text @@ -1008,9 +1022,11 @@ msgid "" "The *Device or Mount Point* drop-down list contains the USB or Bluetooth " "port name that _Subsurface_ needs in order to communicate with the dive " "computer. The appropriate port name must be selected. Consult xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " +"_appendix_a_operating_system_specific_information_for_importing_dive_informati" +"on_from_a_dive_computer[Appendix " "A] and xref:" -"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix " +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[" +"Appendix " "B] for technical details on how to find the appropriate port information for " "a specific dive computer and, in some cases, how to do the correct settings " "to the operating system of the computer on which _Subsurface_ is running." @@ -1018,9 +1034,11 @@ msgstr "" "Le menu déroulant *Périphérique ou point de montage* le nom du port USB ou " "Bluetooth dont _Subsurface_ a besoin pour communiquer avec l'ordinateur de " "plongée. Le port approprié doit être sélectionné. Consultez xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Annexe " +"_appendix_a_operating_system_specific_information_for_importing_dive_informati" +"on_from_a_dive_computer[Annexe " "A] et xref:" -"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Annexe " +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[" +"Annexe " "B] pour obtenir des détails techniques sur la façon de trouver des " "informations sur le port approprié à chaque ordinateur de plongée et, dans " "certains cas, sur les réglages requis pour le système d'exploitation de " @@ -1145,7 +1163,8 @@ msgstr "" #: user-manual.txt:424 #, no-wrap msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n" -msgstr "*PROBLÈMES AVEC LE TÉLÉCHARGEMENT DES DONNÉS DE L'ORDINATEUR DE PLONGÉE?*\n" +msgstr "" +"*PROBLÈMES AVEC LE TÉLÉCHARGEMENT DES DONNÉS DE L'ORDINATEUR DE PLONGÉE?*\n" #. type: Named 'icon' AttributeList argument for style 'icon' #: user-manual.txt:424 user-manual.txt:531 user-manual.txt:575 @@ -1191,11 +1210,13 @@ msgstr "" #: user-manual.txt:441 msgid "" "Consult xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " +"_appendix_a_operating_system_specific_information_for_importing_dive_informati" +"on_from_a_dive_computer[Appendix " "A] to be sure the correct Mount Point was specified (see above)." msgstr "" "Consultez xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Annexe " +"_appendix_a_operating_system_specific_information_for_importing_dive_informati" +"on_from_a_dive_computer[Annexe " "A] pour être certain que le point de montage correct a été spécifié (voir ci-" "dessus)." @@ -1204,12 +1225,14 @@ msgstr "" msgid "" "On Unix-like operating systems, does the user have write permission to the " "USB port? If not, consult xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " +"_appendix_a_operating_system_specific_information_for_importing_dive_informati" +"on_from_a_dive_computer[Appendix " "A]" msgstr "" "Sur les systèmes d'exploitation de type Unix, l'utilisateur a-t-il les " "droits d'écriture sur le port USB? Si non, consultez xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Annexe " +"_appendix_a_operating_system_specific_information_for_importing_dive_informati" +"on_from_a_dive_computer[Annexe " "A]" #. type: delimited block * @@ -1247,14 +1270,19 @@ msgstr "" #, no-wrap msgid "" "*Important*: These check boxes are only used when problems are encountered\n" -"during the download process. Under normal circumstances they should not be checked.\n" -"When checking these boxes, the user is prompted to select a folder where the information will be saved. The default folder is the one in which the\n" +"during the download process. Under normal circumstances they should not be" +" checked.\n" +"When checking these boxes, the user is prompted to select a folder where the" +" information will be saved. The default folder is the one in which the\n" "_Subsurface_\n" "dive log is kept.\n" msgstr "" -"*Important*: ces cases à cocher ne doivent être utilisées qu'en cas de problème\n" -"durant le processus de téléchargement. En temps normal, elles ne doivent pas être cochées.\n" -"En cochant ces cases, l'utilisateur doit sélectionner un dossier où l'information sera enregistrée. Le dossier par défaut est celui dans lequel\n" +"*Important*: ces cases à cocher ne doivent être utilisées qu'en cas de" +" problème\n" +"durant le processus de téléchargement. En temps normal, elles ne doivent pas" +" être cochées.\n" +"En cochant ces cases, l'utilisateur doit sélectionner un dossier où" +" l'information sera enregistrée. Le dossier par défaut est celui dans lequel\n" "le carnet de\n" "_Subsurface_ est stocké.\n" @@ -1268,7 +1296,8 @@ msgid "" msgstr "" "*Important:* _après un téléchargement avec les cases ci-dessus\n" "cochées, aucune plongée n'est ajoutée à la\n" -"*Liste des plongées* mais deux fichiers sont créés dans le dossier sélectionné précédemment_:\n" +"*Liste des plongées* mais deux fichiers sont créés dans le dossier" +" sélectionné précédemment_:\n" #. type: delimited block * #: user-manual.txt:469 @@ -1297,10 +1326,11 @@ msgstr "" #: user-manual.txt:478 #, no-wrap msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer" -msgstr "Connection de _Subsurface_ à un ordinateur de plongée équipé de Bluetooth" +msgstr "" +"Connection de _Subsurface_ à un ordinateur de plongée équipé de Bluetooth" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:479 user-manual.txt:4022 +#: user-manual.txt:479 user-manual.txt:4033 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "images/icons/bluetooth.jpg" @@ -1496,7 +1526,7 @@ msgstr "" "la boîte de dialogue de téléchargement." #. type: Title ==== -#: user-manual.txt:556 user-manual.txt:3949 user-manual.txt:4037 +#: user-manual.txt:556 user-manual.txt:3960 user-manual.txt:4048 #, no-wrap msgid "On Windows:" msgstr "Sur Windows :" @@ -1585,18 +1615,23 @@ msgstr "" #: user-manual.txt:597 #, no-wrap msgid "" -"*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_ computer\n" +"*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_" +" computer\n" "gets stuck and the _Download_ process fails repeatedly,\n" -" _unpair_ the devices and then repeat the above steps. If this is not successful,\n" +" _unpair_ the devices and then repeat the above steps. If this is not" +" successful,\n" " xref:S_HowFindBluetoothDeviceName[_Appendix A_] contains\n" "information for manually setting up and inspecting the Bluetooth connection\n" "with _Subsurface_.\n" msgstr "" -"*EN CAS DE PROBLÈMES*: si l'adaptateur Bluetooth de l'ordinateur utilisant _Subsurface_\n" +"*EN CAS DE PROBLÈMES*: si l'adaptateur Bluetooth de l'ordinateur utilisant" +" _Subsurface_\n" "se bloque et que le processus de _téléchargement_ échoue de façon répétée,\n" -" _dissociez_ les périphériques et répétez les étapes ci-dessus. Si cela ne fonctionne pas,\n" +" _dissociez_ les périphériques et répétez les étapes ci-dessus. Si cela ne" +" fonctionne pas,\n" " l' xref:S_HowFindBluetoothDeviceName[_Annexe A_] contient\n" -"des informations sur la configuration manuelle et la vérification de la connection Bluetooth\n" +"des informations sur la configuration manuelle et la vérification de la" +" connection Bluetooth\n" "avec _Subsurface_.\n" #. type: Title ==== @@ -1644,7 +1679,9 @@ msgstr "" #: user-manual.txt:617 #, no-wrap msgid "Uploading data for a specific dive from more than one dive computer" -msgstr "Chargement des données d'une plongée spécifique depuis plusieurs ordinateurs de plongée" +msgstr "" +"Chargement des données d'une plongée spécifique depuis plusieurs ordinateurs" +" de plongée" #. type: Plain text #: user-manual.txt:628 @@ -1704,8 +1741,8 @@ msgstr "Notes" #: user-manual.txt:644 msgid "" "To have a more complete dive record, the user needs to add additional " -"information by hand. The procedure below is virtually identical for " -"hand-entered dives and for dives downloaded from a dive computer." +"information by hand. The procedure below is virtually identical for hand-" +"entered dives and for dives downloaded from a dive computer." msgstr "" "Pour obtenir un enregistrement plus comple de la plongée, l'utilisateur doit " "ajouter manuellement certaines informations. La procédure expliquée ci-" @@ -1762,22 +1799,33 @@ msgstr "" #: user-manual.txt:674 #, no-wrap msgid "" -"*Air/water temperatures*: Air and water temperatures during the dive are shown\n" -"in text boxes to the right of the Start time. Many dive computers supply water\n" +"*Air/water temperatures*: Air and water temperatures during the dive are" +" shown\n" +"in text boxes to the right of the Start time. Many dive computers supply" +" water\n" "temperature information and this box may have information.\n" -"If air temperature isn’t provided by the dive computer, the first temperature reading\n" -"might be used for the air temperature. Generally this is close to the real air temperature.\n" -"If editing is required, only a value is required, the units of temperature will be\n" +"If air temperature isn’t provided by the dive computer, the first temperature" +" reading\n" +"might be used for the air temperature. Generally this is close to the real" +" air temperature.\n" +"If editing is required, only a value is required, the units of temperature" +" will be\n" "automatically supplied by\n" "_Subsurface_ (following the _Preferences_, metric or imperial units will\n" "be used).\n" msgstr "" -"*Température de l'air/eau*: les températures de l'air et de l'eau pendant la plongée sont affichées\n" -"dans des boîtes de texte à droite de l'heure de début de plongée. De nombreux ordinateurs de plongée \n" -"renseignent la température de l'eau, et cette boîte peut contenir cette information.\n" -"Si la température de l'air n'est pas renseignée par l'ordinateur de plongée, la première température pour l'eau\n" -"peut être utilisée comme température de l'air. En général, elle est proche de la température de l'air.\n" -"S'il est nécessaire d'éditer ces informations, seule une valeur est nécessaire, l'unité de température étant\n" +"*Température de l'air/eau*: les températures de l'air et de l'eau pendant la" +" plongée sont affichées\n" +"dans des boîtes de texte à droite de l'heure de début de plongée. De nombreux" +" ordinateurs de plongée \n" +"renseignent la température de l'eau, et cette boîte peut contenir cette" +" information.\n" +"Si la température de l'air n'est pas renseignée par l'ordinateur de plongée," +" la première température pour l'eau\n" +"peut être utilisée comme température de l'air. En général, elle est proche de" +" la température de l'air.\n" +"S'il est nécessaire d'éditer ces informations, seule une valeur est" +" nécessaire, l'unité de température étant\n" "automatiquement fournie par\n" "_Subsurface_ (sur base des _Préférences_, les unités métriques ou impériales\n" "seront utilisées).\n" @@ -1943,7 +1991,8 @@ msgid "" "same).\n" msgstr "" "*Important*: les coordonnées GPS d'un site de plongée sont liées au nom de\n" -"lieu - ainsi, *enregistrer* un site de plongée avec uniquement les coordonnées mais aucun nom\n" +"lieu - ainsi, *enregistrer* un site de plongée avec uniquement les" +" coordonnées mais aucun nom\n" "causera des problèmes. (Subsurface pensera que toutes ces\n" "plongées ont le même lieu et tentera de garder leurs coordonnées GPS\n" "identiques).\n" @@ -1954,21 +2003,29 @@ msgstr "" msgid "" "*Dive site name lookup:* If you typed coordinates into the appropriate\n" "text box, you can do an automated name lookup based on the coordinates.\n" -"This is done when _Subsurface_ uses the Internet to find the name of the dive site\n" +"This is done when _Subsurface_ uses the Internet to find the name of the dive" +" site\n" "based on the coordinates that were typed. If a name has been found, it is\n" "automatically inserted into the tags box. The list box\n" "(Titled _Dive sites on same coordinates_\") at the bottom\n" "of the dive site panel contains the names of other dives sites used at the\n" -"current location. For instance if the dive site is \"Blue Hole\" and there are several\n" +"current location. For instance if the dive site is \"Blue Hole\" and there" +" are several\n" "sites named \"Blue Hole\", all of them are listed.\n" msgstr "" -"*Recherche du nom d'un site de plongée*: si vous avez entré les coordonnées dans la boîte\n" -"de texte appropriée, vous pouvez lancer une recherche de nom sur base des coordonnées.\n" -"Ceci est réalisé lorsque _Subsurface_ utilise Internet pour trouver le nom d'un site de plongée\n" +"*Recherche du nom d'un site de plongée*: si vous avez entré les coordonnées" +" dans la boîte\n" +"de texte appropriée, vous pouvez lancer une recherche de nom sur base des" +" coordonnées.\n" +"Ceci est réalisé lorsque _Subsurface_ utilise Internet pour trouver le nom" +" d'un site de plongée\n" "sur base des coordonées que vous avez entrées. Si un nom est trouvé, il est\n" -"automatiquement inséré dans la boîte Étiquettes. La liste (intitulée _\"Sites de plongée situés aux mêmes coordonnées_\") en bas\n" -"du panneau du site de plongée contient les noms d'autres sites de plongée utilisés\n" -"au même endroit. Par exemple, si le site de plongée est \"Blue Hole\" et qu'il y a plusieurs\n" +"automatiquement inséré dans la boîte Étiquettes. La liste (intitulée _\"Sites" +" de plongée situés aux mêmes coordonnées_\") en bas\n" +"du panneau du site de plongée contient les noms d'autres sites de plongée" +" utilisés\n" +"au même endroit. Par exemple, si le site de plongée est \"Blue Hole\" et" +" qu'il y a plusieurs\n" "sites nommés \"Blue Hole\", ils seront tous listés.\n" #. type: Plain text @@ -1990,12 +2047,15 @@ msgstr "" #, no-wrap msgid "" "*Dive mode*: This is a dropdown box allowing you to choose the type of dive\n" -"performed. The options are OC (Open Circuit SCUBA, the default setting, for most recreational dives),\n" +"performed. The options are OC (Open Circuit SCUBA, the default setting, for" +" most recreational dives),\n" "Freedive (dive without SCUBA equipment), CCR (Closed-circuit\n" "rebreather) and pSCR (Passive semi-closed rebreather).\n" msgstr "" -"*Mode de plongée*: cette liste déroulante vous permet de choisir le type de plongée\n" -"réalisée. Les options sont OC (scaphandre en circuit ouvert, le choix par défaut pour la plupart des plongées loisir),\n" +"*Mode de plongée*: cette liste déroulante vous permet de choisir le type de" +" plongée\n" +"réalisée. Les options sont OC (scaphandre en circuit ouvert, le choix par" +" défaut pour la plupart des plongées loisir),\n" "Apnée (plongée sans scaphandre), CCR (recycleur\n" "en circuit fermé) et pSCR (recycleur passif semi-fermé).\n" @@ -2008,7 +2068,8 @@ msgid "" "which offers auto selection based on the list of divemasters in\n" "the current logbook.\n" msgstr "" -"*Moniteur/Guide de palanquée*: le nom du moniteur ou du guide de palanquée doit être\n" +"*Moniteur/Guide de palanquée*: le nom du moniteur ou du guide de palanquée" +" doit être\n" "entré dans ce champ\n" "qui permet une sélection automatique basé sur la liste des moniteurs\n" "déjà présents dans le carnet en cours.\n" @@ -2024,7 +2085,8 @@ msgid "" msgstr "" "*Équipier*: dans ce champ, entrez le(s) nom(s) de votre/vos équipier(s)\n" "(sparés par des virgules) qui participaient à la\n" -"plongée. Une sélection automatique se base sur la liste des équipiers déjà présents dans le\n" +"plongée. Une sélection automatique se base sur la liste des équipiers déjà" +" présents dans le\n" "carnet en cours.\n" #. type: Plain text @@ -2033,12 +2095,14 @@ msgstr "" msgid "" "*Suit*: Here the type of dive suit used can be entered.\n" "Auto selection of the suit description is available.\n" -"Some dry-suit users may choose to use this field to record what combination of\n" +"Some dry-suit users may choose to use this field to record what combination" +" of\n" "suit and thermal under suit was used.\n" msgstr "" "*Combinaison*: le type de combinaison peut être entré ici.\n" "Une sélection automatique est disponible.\n" -"Certains utilisateurs de vêtement étanche peuvent utiliser ce champ pour enregistrer quelle ensemble de\n" +"Certains utilisateurs de vêtement étanche peuvent utiliser ce champ pour" +" enregistrer quelle ensemble de\n" "combinaison et souris ils ont utilisé.\n" #. type: Plain text @@ -2066,16 +2130,20 @@ msgstr "" #, no-wrap msgid "" "*Tags*: Tags that describe the type of dive done can be entered\n" -"here (separated by commas). Examples of common tags are boat, drift, training,\n" +"here (separated by commas). Examples of common tags are boat, drift," +" training,\n" "cave, etc.\n" -"_Subsurface_ has many built-in tags. By starting to type a tag, _Subsurface_ lists\n" +"_Subsurface_ has many built-in tags. By starting to type a tag, _Subsurface_" +" lists\n" "the tags that correspond to the typing. For instance, by typing\n" "+cav+, the tags *cave* and *cavern* are shown to choose from.\n" msgstr "" "*Étiquettes*: il est possible de définir ici des étiquettes qui décrivent le\n" -"type de plongée (séparées par des virgules). Des exemples courants d'étiquettes sont bateau, \n" +"type de plongée (séparées par des virgules). Des exemples courants" +" d'étiquettes sont bateau, \n" "plongée dérivante, exercice, grotte, etc.\n" -"_Subsurface_ contient de nombreuses étiquettes. En commençant à taper une étiquette, _Subsurface_ liste\n" +"_Subsurface_ contient de nombreuses étiquettes. En commençant à taper une" +" étiquette, _Subsurface_ liste\n" "les étiquettes correspondant à la frappe. Par exemple, en entrant\n" "+cav+, les étiquettes *cave* et *caverne* sont proposées.\n" @@ -2083,16 +2151,18 @@ msgstr "" #: user-manual.txt:790 #, no-wrap msgid "*Notes*: Any additional information for the dive can be entered here.\n" -msgstr "*Notes*: toute information supplémentaire concernant une plongée peut être entrée ici.\n" +msgstr "" +"*Notes*: toute information supplémentaire concernant une plongée peut être" +" entrée ici.\n" #. type: Plain text #: user-manual.txt:795 msgid "" "The _Apply changes_ and _Discard changes_ buttons are used to save all the " "information for tabs in the *Info* panel and in the *Dive Profile* panel. " -"Use them when *ALL* other information has been added. The image " -"xref:S_Notes_dc[at the beginning of this section] shows an example of a " -"*Notes tab* after completing the dive information." +"Use them when *ALL* other information has been added. The image xref:" +"S_Notes_dc[at the beginning of this section] shows an example of a *Notes " +"tab* after completing the dive information." msgstr "" "Les boutons _Appliquer les modifications_ et _Annuler les modifications_ " "sont utilisés pour enregistrer toutes les informations des onglets du " @@ -2134,10 +2204,12 @@ msgstr "" #: user-manual.txt:812 #, no-wrap msgid "" -"*Cylinders*: The cylinder information is entered through a dialogue that looks\n" +"*Cylinders*: The cylinder information is entered through a dialogue that" +" looks\n" "like this:\n" msgstr "" -"*Blocs*: les informations concernant les blocs sont entrées via une boîte de dialogue\n" +"*Blocs*: les informations concernant les blocs sont entrées via une boîte de" +" dialogue\n" "qui ressemble à ceci:\n" #. type: Target for macro image @@ -2156,8 +2228,8 @@ msgid "" "dive. The dark dustbin icon on the left allows you to delete information for " "a cylinder. Note that it is not possible to delete a cylinder if it is used " "during the dive. A cylinder might be implicitly used in the dive, even " -"without a gas change event. Start by selecting a cylinder type on the " -"left-hand side of the table. To select a cylinder, the _Type_ box should be " +"without a gas change event. Start by selecting a cylinder type on the left-" +"hand side of the table. To select a cylinder, the _Type_ box should be " "clicked. This brings up a list button that can be used to display a dropdown " "list of cylinders:" msgstr "" @@ -2452,8 +2524,12 @@ msgstr "" #. type: Title === #: user-manual.txt:949 #, no-wrap -msgid "Importing dive information from other digital data sources or other data formats" -msgstr "Importer les informations à partir d'autres sources de données numériques ou d'autres formats de données" +msgid "" +"Importing dive information from other digital data sources or other data" +" formats" +msgstr "" +"Importer les informations à partir d'autres sources de données numériques ou" +" d'autres formats de données" #. type: Plain text #: user-manual.txt:972 @@ -2682,9 +2758,9 @@ msgstr "Importation depuis Mares Dive Organizer V2.1" #. type: Plain text #: user-manual.txt:1047 msgid "" -"Since Mares uses proprietary Windows software not compatible with " -"multi-platform applications, these dive logs cannot be directly imported " -"into _Subsurface_. Mares dive logs need to be imported using a three-step " +"Since Mares uses proprietary Windows software not compatible with multi-" +"platform applications, these dive logs cannot be directly imported into " +"_Subsurface_. Mares dive logs need to be imported using a three-step " "process, using _www.divelogs.de_ as a gateway to extract the dive log " "information." msgstr "" @@ -2753,8 +2829,8 @@ msgstr "" #. type: Plain text #: user-manual.txt:1078 msgid "" -"Feel free to contact the _Subsurface_ development team on " -"mailto:subsurface@subsurface-divelog.org[our mailing list] for assistance in " +"Feel free to contact the _Subsurface_ development team on mailto:" +"subsurface@subsurface-divelog.org[our mailing list] for assistance in " "importing _SmartTrak_ dive logs." msgstr "" "N'hésitez pas à contacter l'équipe de développement de _Subsurface_ via " @@ -2874,8 +2950,8 @@ msgid "" "Import log file_ and choose the _.xml_ file containing the imported dives: " "these will show in the *Dive List*, time ordered, along with the existing " "dives. The new dives, although time ordered, will keep the numbering system " -"from _SmartTrak_, so a renumbering action is needed. See the section on " -"xref:S_Renumber[Renumbering the dives] for instructions on this topic." +"from _SmartTrak_, so a renumbering action is needed. See the section on xref:" +"S_Renumber[Renumbering the dives] for instructions on this topic." msgstr "" #. type: Title ==== @@ -2920,8 +2996,8 @@ msgid "" "allows easy information exchange between different computers or software " "packages. For an introduction to CSV-formatted files see xref:S_CSV_Intro[A " "Diver's Introduction To CSV Files]. _Subsurface_ dive logs can also be " -"exported in _CSV_ format to other software that reads this format. See " -"xref:S_Appendix_D[APPENDIX D: Exporting a spreadsheet to CSV format] for " +"exported in _CSV_ format to other software that reads this format. See xref:" +"S_Appendix_D[APPENDIX D: Exporting a spreadsheet to CSV format] for " "information that may be helpful for importing spreadsheet-based data into " "_Subsurface_." msgstr "" @@ -2929,8 +3005,11 @@ msgstr "" #. type: Title ===== #: user-manual.txt:1163 #, no-wrap -msgid "Importing dives in CSV format from dive computers or other dive log software" -msgstr "Importer les plongées au format CSV à partir des ordinateurs de plongées ou d'autres logiciels de carnet de plongée" +msgid "" +"Importing dives in CSV format from dive computers or other dive log software" +msgstr "" +"Importer les plongées au format CSV à partir des ordinateurs de plongées ou" +" d'autres logiciels de carnet de plongée" #. type: Plain text #: user-manual.txt:1168 @@ -2971,8 +3050,8 @@ msgid "" "in time during the dive, 30 seconds after that of the previous instant. Many " "lines are required to complete the depth profile information for a single " "dive. This is a common export format used by closed-circuit rebreather (CCR) " -"dive equipment and many software packages that handle dive computer data " -"and/or dive logs." +"dive equipment and many software packages that handle dive computer data and/" +"or dive logs." msgstr "" #. type: Plain text @@ -2990,8 +3069,8 @@ msgid "" "TAB character. This can be determined by opening the file with a text " "editor. If it is comma-delimited or semicolon-delimited, the comma or " "semicolon characters between the values are clearly visible. If these are " -"not evident and the numbers are aligned in columns, the file is probably " -"TAB-delimited (i.e. it uses a TAB as a field separator)." +"not evident and the numbers are aligned in columns, the file is probably TAB-" +"delimited (i.e. it uses a TAB as a field separator)." msgstr "" #. type: Plain text @@ -3035,10 +3114,14 @@ msgid "" "settings for common dive computers and software packages.\n" " If the _CSV_ file being imported originated from any of\n" "these pre-configured items, select it. Otherwise use the _Manual Import_\n" -"option. The configuration panel also has dropdown lists for the specification of the appropriate\n" -"field separator (Tab, comma or semicolon), the date format used in the _CSV_ file,\n" -"the time units (seconds, minutes or minutes:seconds), as well as the unit system\n" -"(metric or imperial). Selecting the appropriate options among these is critical for\n" +"option. The configuration panel also has dropdown lists for the specification" +" of the appropriate\n" +"field separator (Tab, comma or semicolon), the date format used in the _CSV_" +" file,\n" +"the time units (seconds, minutes or minutes:seconds), as well as the unit" +" system\n" +"(metric or imperial). Selecting the appropriate options among these is" +" critical for\n" "successful data import.\n" msgstr "" @@ -3125,13 +3208,12 @@ msgstr "" #. type: delimited block * #: user-manual.txt:1275 -#, fuzzy msgid "" "The above data are not easily read by a human. Here is the same information " "in TAB-delimited format:" msgstr "" "Les données ci-dessus ne sont pas aisément lisible pour un être humain. " -"Voici les mêmes informations dans un format avec tabulations:" +"Voici les mêmes informations dans un format séparé par des tabulations :" #. type: delimited block * #: user-manual.txt:1281 @@ -3147,8 +3229,8 @@ msgstr "" #. type: delimited block * #: user-manual.txt:1289 msgid "" -"It is clear why many people prefer the TAB-delimited format to the " -"comma-delimited format. The disadvantage is that you cannot see the TAB " +"It is clear why many people prefer the TAB-delimited format to the comma-" +"delimited format. The disadvantage is that you cannot see the TAB " "characters. For instance, the space between _Dive_ and _date_ in the top " "line may be a SPACE character or a TAB character (in this case it is a SPACE " "character: the tabs are before and after _Dive date_). If the field names in " @@ -3162,7 +3244,8 @@ msgstr "" #: user-manual.txt:1300 #, no-wrap msgid "" -"\tDive Time (s)\tDepth (m)\tpO~2~ - Setpoint (Bar) \tpO~2~ - C1 Cell 1 (Bar)\tAmbient temp. (Celsius)\n" +"\tDive Time (s)\tDepth (m)\tpO~2~ - Setpoint (Bar) \tpO~2~ - C1 Cell 1" +" (Bar)\tAmbient temp. (Celsius)\n" "\t0 0.0 0.70 0.81 13.1\n" "\t0 1.2 0.70 0.71 13.1\n" "\t0 0.0 0.70 0.71 13.1\n" @@ -3202,7 +3285,8 @@ msgstr "" #: user-manual.txt:1320 #, no-wrap msgid "Importing Dive coordinates from a mobile device with GPS." -msgstr "Importation des coordonnées de plongée depuis un appareil mobile avec GPS." +msgstr "" +"Importation des coordonnées de plongée depuis un appareil mobile avec GPS." #. type: Plain text #: user-manual.txt:1324 @@ -3266,8 +3350,8 @@ msgstr "" #. type: Plain text #: user-manual.txt:1349 msgid "" -"For information on using the _Subsurface Companion App_, click " -"xref:S_Companion[_here_]." +"For information on using the _Subsurface Companion App_, click xref:" +"S_Companion[_here_]." msgstr "" "Pour plus d'information sur l'utilisation de l'application _Subsurface " "Companion_, cliquez xref:S_Companion[_ici_]." @@ -3288,10 +3372,9 @@ msgstr "" #: user-manual.txt:1358 msgid "" "Find _Subsurface-mobile_ on Google Play and install it on an Android device. " -"The app is free. The iOS version is currently experimental. " -"_Subsurface-mobile_ has an extensive " -"https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[user " -"manual] accessible from within that app." +"The app is free. The iOS version is currently experimental. _Subsurface-" +"mobile_ has an extensive https://subsurface-divelog.org/documentation/" +"subsurface-mobile-user-manual[user manual] accessible from within that app." msgstr "" #. type: Title ===== @@ -3316,7 +3399,8 @@ msgstr "" #: user-manual.txt:1370 #, no-wrap msgid "" -"*N.B.:* To successfully create a user account, the mobile device must have Internet connectivity,\n" +"*N.B.:* To successfully create a user account, the mobile device must have" +" Internet connectivity,\n" "either through the cellular network or via wifi.\n" msgstr "" @@ -3358,14 +3442,20 @@ msgstr "" #: user-manual.txt:1393 #, no-wrap msgid "" -"*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and 50\n" -"meters in the settings above, the app will start by recording a location at the current\n" -"location, followed by another one at every 5 minutes *or* every time you move 50 m\n" +"*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and" +" 50\n" +"meters in the settings above, the app will start by recording a location at" +" the current\n" +"location, followed by another one at every 5 minutes *or* every time you move" +" 50 m\n" "from previous location, whichever happens first.\n" -"If subsequent locations are within a radius of 50 meters from the previous one,\n" -"a new location is not saved. If the diver is not moving, only one location is\n" +"If subsequent locations are within a radius of 50 meters from the previous" +" one,\n" +"a new location is not saved. If the diver is not moving, only one location" +" is\n" "saved, at least until the _Time-threshold_ period has elapsed.\n" -"If the diver moves, a trace of the route is obtained by saving a location every 50 meters.\n" +"If the diver moves, a trace of the route is obtained by saving a location" +" every 50 meters.\n" msgstr "" #. type: Title ===== @@ -3411,10 +3501,13 @@ msgstr "" #: user-manual.txt:1413 #, no-wrap msgid "" -"*N.B.:* Uploading the GPS locations to the Internet can only take place if the mobile\n" +"*N.B.:* Uploading the GPS locations to the Internet can only take place if" +" the mobile\n" "device has reliable access to the Internet, either via a cellular network or\n" -"via a wifi connection. If the Internet is not accessible from the dive site(s),\n" -"then GPS uploading can only take place after the dive or after the dive trip,\n" +"via a wifi connection. If the Internet is not accessible from the dive" +" site(s),\n" +"then GPS uploading can only take place after the dive or after the dive" +" trip,\n" "when an Internet connection has been re-established.\n" msgstr "" @@ -3446,17 +3539,18 @@ msgstr "" #. type: Plain text #: user-manual.txt:1431 msgid "" -"The " -"https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[user " -"manual for _Subsurface-mobile_] (accessible from within that app) contains " -"detailed instructions for performing the collection of GPS data and for " -"managing, uploading and synchronising this information." +"The https://subsurface-divelog.org/documentation/subsurface-mobile-user-" +"manual[user manual for _Subsurface-mobile_] (accessible from within that " +"app) contains detailed instructions for performing the collection of GPS " +"data and for managing, uploading and synchronising this information." msgstr "" #. type: Title ==== #: user-manual.txt:1434 #, no-wrap -msgid "Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones" +msgid "" +"Importing GPS coordinates with the _Subsurface Companion App_ for mobile" +" phones" msgstr "" #. type: Plain text @@ -3466,8 +3560,10 @@ msgid "" "Using the *Subsurface Companion App* on an _Android device_ or\n" "xref:S_iphone[_iPhone_] with GPS, the coordinates\n" "for the diving\n" -"location can be automatically passed to the _Subsurface_ dive log. The Companion App\n" -"stores dive locations on a dedicated Internet server. _Subsurface_ can collect\n" +"location can be automatically passed to the _Subsurface_ dive log. The" +" Companion App\n" +"stores dive locations on a dedicated Internet server. _Subsurface_ can" +" collect\n" "the locations from the server.\n" "To do this:\n" msgstr "" @@ -3490,10 +3586,9 @@ msgstr "" #. type: Plain text #: user-manual.txt:1454 msgid "" -"Download the app from " -"https://play.google.com/store/apps/details?id=org.subsurface[Google Play " -"Store] or from " -"https://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface[F-Droid]." +"Download the app from https://play.google.com/store/apps/details?id=org." +"subsurface[Google Play Store] or from https://f-droid.org/repository/browse/?" +"fdfilter=subsurface&fdid=org.subsurface[F-Droid]." msgstr "" #. type: Title ===== @@ -3862,7 +3957,8 @@ msgstr "" #. type: Title ===== #: user-manual.txt:1635 #, no-wrap -msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations" +msgid "" +"Using the Subsurface companion app on an _iPhone_ to record dive locations" msgstr "" #. type: Plain text @@ -4019,7 +4115,9 @@ msgstr "" #: user-manual.txt:1716 #, no-wrap msgid "Loading photos and synchronizing between dive computer and camera" -msgstr "Chargement des photos et synchronisation entre l'ordinateur de plongée et l'appareil photo" +msgstr "" +"Chargement des photos et synchronisation entre l'ordinateur de plongée et" +" l'appareil photo" #. type: Plain text #: user-manual.txt:1722 @@ -4070,24 +4168,32 @@ msgstr "" #: user-manual.txt:1742 #, no-wrap msgid "" -"*Pro-actively*: Before the dive, ensure synchronization of the dive computer time settings with\n" -"the time settings of the camera by changing the date-time settings on one or both of these devices.\n" +"*Pro-actively*: Before the dive, ensure synchronization of the dive computer" +" time settings with\n" +"the time settings of the camera by changing the date-time settings on one or" +" both of these devices.\n" msgstr "" #. type: Plain text #: user-manual.txt:1753 #, no-wrap msgid "" -"*Manually*: Writing down the exact camera time at the start of a dive allows using the\n" +"*Manually*: Writing down the exact camera time at the start of a dive allows" +" using the\n" "difference in time between the two devices. As long as the device\n" "settings for time has not been changed in either device, the times of\n" -"both devices after the dive or even at the end of the day allows manually setting the time\n" -"difference in the _Time shift_ dialog (see image below). Towards the top of the dialog is a time\n" -"setting tool immediately under the heading _Shift times of image(s) by_, in the image below.\n" -"If the camera time is 7 minutes later than that of the dive computer, set the time setting\n" +"both devices after the dive or even at the end of the day allows manually" +" setting the time\n" +"difference in the _Time shift_ dialog (see image below). Towards the top of" +" the dialog is a time\n" +"setting tool immediately under the heading _Shift times of image(s) by_, in" +" the image below.\n" +"If the camera time is 7 minutes later than that of the dive computer, set the" +" time setting\n" "tool to a value of 00:07 and select the _Earlier_ radio button.\n" "This is appropriate, since the photos need to be shifted\n" -"7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any \"AM\" or \"PM\" suffix\n" +"7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any" +" \"AM\" or \"PM\" suffix\n" "in that tool. Click the _OK_ button and synchronization is done.\n" msgstr "" @@ -4101,20 +4207,33 @@ msgstr "images/LoadImage3b_f23.jpg" #: user-manual.txt:1772 #, no-wrap msgid "" -"*By photograph*: There is a very slick way of achieving synchronization, requiring a\n" -"photograph of the face of the dive computer showing the time. _Subsurface_ gets\n" -"the exact time the photograph was taken, using the metadata the camera stores within\n" -"each photo and compares this with the time visible on the photo. To do this, use the\n" -"bottom half of the _Time shift_ dialog. In this case the top part of the dialog is ignored. Click on\n" -"the horizontal bar called _Select image of dive computer showing time_. This brings up\n" -"a file browser for selecting the photograph of the dive computer time. Select the\n" -"photograph using the file browser and click on _OK_. This photograph of the dive computer\n" -"appears in the bottom panel of the _Shift times_ dialog. Now _Subsurface_ knows exactly\n" -"when the photograph was taken. Now set the date-time dialog to the left of the photo\n" +"*By photograph*: There is a very slick way of achieving synchronization," +" requiring a\n" +"photograph of the face of the dive computer showing the time. _Subsurface_" +" gets\n" +"the exact time the photograph was taken, using the metadata the camera stores" +" within\n" +"each photo and compares this with the time visible on the photo. To do this," +" use the\n" +"bottom half of the _Time shift_ dialog. In this case the top part of the" +" dialog is ignored. Click on\n" +"the horizontal bar called _Select image of dive computer showing time_. This" +" brings up\n" +"a file browser for selecting the photograph of the dive computer time. Select" +" the\n" +"photograph using the file browser and click on _OK_. This photograph of the" +" dive computer\n" +"appears in the bottom panel of the _Shift times_ dialog. Now _Subsurface_" +" knows exactly\n" +"when the photograph was taken. Now set the date-time dialog to the left of" +" the photo\n" "so it reflects the date and time of the dive computer in the photo. When the\n" -"date-time tool has been set, _Subsurface_ knows exactly what the time difference between\n" -"camera and dive computer is, and it can synchronize the devices. The image below shows\n" -"a photograph of the face of the dive computer and with the date-time tool set to the\n" +"date-time tool has been set, _Subsurface_ knows exactly what the time" +" difference between\n" +"camera and dive computer is, and it can synchronize the devices. The image" +" below shows\n" +"a photograph of the face of the dive computer and with the date-time tool set" +" to the\n" "date-time.\n" msgstr "" @@ -4222,11 +4341,11 @@ msgid "" "accessed in the _Photos_ tab. This tab serves as a tool for individually " "accessing the photos of a dive, while the stubs on the dive profile show " "when during a dive a photo was taken. Single-click a thumbnail in the " -"_Photos_ panel to select a photo. Double-click a thumbnail to view the " -"full-sized image, overlaying the _Subsurface_ window. Deleted a photo from " -"the _Photos_ panel by selecting it (single-click) and then by pressing the " -"_Del_ key on the keyboard. This removes the photo BOTH from the _Photos_ tab " -"as well as the dive profile." +"_Photos_ panel to select a photo. Double-click a thumbnail to view the full-" +"sized image, overlaying the _Subsurface_ window. Deleted a photo from the " +"_Photos_ panel by selecting it (single-click) and then by pressing the _Del_ " +"key on the keyboard. This removes the photo BOTH from the _Photos_ tab as " +"well as the dive profile." msgstr "" #. type: Title ==== @@ -4282,22 +4401,32 @@ msgstr "Déplacer des photos entre dossiers, disques durs ou ordinateurs" #: user-manual.txt:1847 #, no-wrap msgid "" -"After a photograph has been loaded into _Subsurface_ and associated with a specific dive,\n" -"_Subsurface_ saves the directory path where the photo lies as well as the file name of the photo,\n" +"After a photograph has been loaded into _Subsurface_ and associated with a" +" specific dive,\n" +"_Subsurface_ saves the directory path where the photo lies as well as the" +" file name of the photo,\n" "in order to find it when the dive is opened again.\n" -"If the photo or the whole photo collection is moved to another drive or to a different\n" -" machine, the path to the photo changes. Now, _Subsurface_ looks for the photos at their original location before they were moved,\n" -" cannot find them and cannot display them. Because, after moving photos, large numbers of photos\n" -" may need to be deleted and re-imported from the new location, _Subsurface_ has a mechanism to ease this inconvenience: automatic updates using fingerprints.\n" +"If the photo or the whole photo collection is moved to another drive or to a" +" different\n" +" machine, the path to the photo changes. Now, _Subsurface_ looks for the" +" photos at their original location before they were moved,\n" +" cannot find them and cannot display them. Because, after moving photos," +" large numbers of photos\n" +" may need to be deleted and re-imported from the new location, _Subsurface_" +" has a mechanism to ease this inconvenience: automatic updates using" +" fingerprints.\n" msgstr "" #. type: Plain text #: user-manual.txt:1851 #, no-wrap msgid "" -"When a photo is loaded into _Subsurface_, a fingerprint for the image is calculated and stored with the\n" -" other reference information for that photo. After moving a photo collection (that has already been loaded\n" -" into _Subsurface_) to a different directory, disk or computer, _Subsurface_ can:\n" +"When a photo is loaded into _Subsurface_, a fingerprint for the image is" +" calculated and stored with the\n" +" other reference information for that photo. After moving a photo collection" +" (that has already been loaded\n" +" into _Subsurface_) to a different directory, disk or computer, _Subsurface_" +" can:\n" msgstr "" #. type: Plain text @@ -4325,10 +4454,14 @@ msgstr "" #: user-manual.txt:1862 #, no-wrap msgid "" -"This is done by selecting from the Main Menu: _File -> Find moved images_. This brings up a window within\n" -" which the NEW directory of the photos needs to be specified. Select the appropriate directory and click\n" -" the _Scan_ button towards the bottom right of the panel. The process may require several minutes to\n" -" complete, after which _Subsurface_ will show the appropriate photographs when a particular dive is opened.\n" +"This is done by selecting from the Main Menu: _File -> Find moved" +" images_. This brings up a window within\n" +" which the NEW directory of the photos needs to be specified. Select the" +" appropriate directory and click\n" +" the _Scan_ button towards the bottom right of the panel. The process may" +" require several minutes to\n" +" complete, after which _Subsurface_ will show the appropriate photographs" +" when a particular dive is opened.\n" msgstr "" #. type: delimited block * @@ -4388,21 +4521,23 @@ msgstr "" #. type: Plain text #: user-manual.txt:1894 msgid "" -"_Subsurface_ easily handles dives involving more than one cylinder. " -"Multi-cylinder diving usually happens (a) if a diver doesn’t have enough gas " -"for the complete dive in a single cylinder; (b) if a diver needs more than " -"one gas mixture because of the depth or the decompression needs of the dive. " -"For this reason multi-cylinder dives are often used by technical divers who " -"dive deep or long. As far as _Subsurface_ is concerned, there are only two " -"types of information that need to be provided:" +"_Subsurface_ easily handles dives involving more than one cylinder. Multi-" +"cylinder diving usually happens (a) if a diver doesn’t have enough gas for " +"the complete dive in a single cylinder; (b) if a diver needs more than one " +"gas mixture because of the depth or the decompression needs of the dive. For " +"this reason multi-cylinder dives are often used by technical divers who dive " +"deep or long. As far as _Subsurface_ is concerned, there are only two types " +"of information that need to be provided:" msgstr "" #. type: Plain text #: user-manual.txt:1898 #, no-wrap msgid "" -"*Describe the cylinders used during the dive* This is performed in the *Equipment tab* of\n" -"the *Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one,\n" +"*Describe the cylinders used during the dive* This is performed in the" +" *Equipment tab* of\n" +"the *Info* panel, as xref:cylinder_definitions[described above]. Enter the" +" cylinders one by one,\n" "specifying its size and pressure, as well as the gas composition within it.\n" msgstr "" @@ -4410,10 +4545,14 @@ msgstr "" #: user-manual.txt:1904 #, no-wrap msgid "" -"*Record the times at which the switch from one cylinder to another was done:* This is information\n" -"tracked by some dive computers (provided the diver indicated these changes to the dive computer\n" -"by pressing specific buttons). If the dive computer does not provide the information, the diver has to\n" -"record these changes using a different method, e.g. writing it on a slate or by creating a bookmark on the dive\n" +"*Record the times at which the switch from one cylinder to another was done:*" +" This is information\n" +"tracked by some dive computers (provided the diver indicated these changes to" +" the dive computer\n" +"by pressing specific buttons). If the dive computer does not provide the" +" information, the diver has to\n" +"record these changes using a different method, e.g. writing it on a slate or" +" by creating a bookmark on the dive\n" "computer.\n" msgstr "" @@ -4422,11 +4561,15 @@ msgstr "" #, no-wrap msgid "" "*Record the cylinder changes on the dive profile*: If the latter option\n" -"was followed, the diver needs to indicate the gas change event by right-clicking at the appropriate point\n" -"in time on the *Dive Profile* panel and indicating the cylinder to which the change was made. After\n" -"right-clicking, follow the context menu to \"Add gas change\" and select the appropriate cylinder from\n" +"was followed, the diver needs to indicate the gas change event by" +" right-clicking at the appropriate point\n" +"in time on the *Dive Profile* panel and indicating the cylinder to which the" +" change was made. After\n" +"right-clicking, follow the context menu to \"Add gas change\" and select the" +" appropriate cylinder from\n" "those defined during the first step, above (see image below). If the\n" -"*tank bar* button in the toolbar has been activated, the cylinder switches are also indicated in the\n" +"*tank bar* button in the toolbar has been activated, the cylinder switches" +" are also indicated in the\n" "tank bar (image below).\n" msgstr "" @@ -4465,22 +4608,32 @@ msgstr "" #: user-manual.txt:1934 #, no-wrap msgid "" -"*During the dive, record cylinder switch events*. Since sidemount diving normally involves two\n" -"cylinders with air or with the same gas mixture, _Subsurface_ distinguishes between these different\n" -"cylinders. In contrast, many dive computers that allow gas switching only distinguish between different\n" -"_gases_ used, not among different _cylinders_ used. This means when sidemount dives are downloaded\n" -"from these dive computers, the switching event between cylinders with the same gas is not downloaded. This may mean\n" -"that a diver may have to keep a written log of cylinder switch times using a slate, or (if the dive computer\n" -"has the capability) marking each cylinder switch with a bookmark that can be retrieved later. Returning\n" -"from a dive with the times of cylinder changes is the only tedious part of logging sidemount dives.\n" +"*During the dive, record cylinder switch events*. Since sidemount diving" +" normally involves two\n" +"cylinders with air or with the same gas mixture, _Subsurface_ distinguishes" +" between these different\n" +"cylinders. In contrast, many dive computers that allow gas switching only" +" distinguish between different\n" +"_gases_ used, not among different _cylinders_ used. This means when sidemount" +" dives are downloaded\n" +"from these dive computers, the switching event between cylinders with the" +" same gas is not downloaded. This may mean\n" +"that a diver may have to keep a written log of cylinder switch times using a" +" slate, or (if the dive computer\n" +"has the capability) marking each cylinder switch with a bookmark that can be" +" retrieved later. Returning\n" +"from a dive with the times of cylinder changes is the only tedious part of" +" logging sidemount dives.\n" msgstr "" #. type: Plain text #: user-manual.txt:1937 #, no-wrap msgid "" -"*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n" -"specifications of the different cylinders, using the *Equipment* tab of the *Info Panel* (see\n" +"*Within _Subsurface_ describe the cylinders used during the dive*. The diver" +" needs to provide the\n" +"specifications of the different cylinders, using the *Equipment* tab of the" +" *Info Panel* (see\n" "image below where two 12 litre cylinders were used).\n" msgstr "" @@ -4488,15 +4641,24 @@ msgstr "" #: user-manual.txt:1947 #, no-wrap msgid "" -"*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported\n" -"from a dive computer into _Subsurface_, the cylinder switch events need to be shown on the dive profile.\n" -"Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile, then\n" -"selecting _Add gas change_. A list of the appropriate cylinders is shown with the\n" -"currently used cylinder greyed out. In the image below Tank 1 is greyed out, leaving only Tank 2\n" -"to be selected. Select the appropriate cylinder. The cylinder change is then shown on the dive\n" -"profile with a cylinder symbol. If the *Tank Bar* is activated using the toolbar to the left of the\n" -"profile, then the cylinder change is also shown on the Tank Bar (see image below). After all\n" -"the cylinder change events have been recorded on the dive profile, the correct cylinder pressures\n" +"*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the" +" dive log has been imported\n" +"from a dive computer into _Subsurface_, the cylinder switch events need to be" +" shown on the dive profile.\n" +"Cylinder changes are recorded by right-clicking at the appropriate point on" +" the dive profile, then\n" +"selecting _Add gas change_. A list of the appropriate cylinders is shown with" +" the\n" +"currently used cylinder greyed out. In the image below Tank 1 is greyed out," +" leaving only Tank 2\n" +"to be selected. Select the appropriate cylinder. The cylinder change is then" +" shown on the dive\n" +"profile with a cylinder symbol. If the *Tank Bar* is activated using the" +" toolbar to the left of the\n" +"profile, then the cylinder change is also shown on the Tank Bar (see image" +" below). After all\n" +"the cylinder change events have been recorded on the dive profile, the" +" correct cylinder pressures\n" "for both cylinders are shown on the dive profile, as in the image below.\n" msgstr "" @@ -4550,8 +4712,8 @@ msgstr "" msgid "" "pSCR diving often involves gas changes, requiring an additional cylinder. " "Define all the appropriate cylinders as described above and indicate the " -"cylinder/gas changes as described above in the section on " -"xref:S_MulticylinderDives[multicylinder dives]." +"cylinder/gas changes as described above in the section on xref:" +"S_MulticylinderDives[multicylinder dives]." msgstr "" #. type: Plain text @@ -4600,14 +4762,13 @@ msgstr "" msgid "" "regulate the oxygen concentration to remain within safe diving limits. The " "CCR interface of _Subsurface_ is currently experimental and under active " -"development. Subsurface currently supports Poseidon MkVI and APD " -"Discovery/Evolution dive computers. In contrast to a conventional " -"recreational dive computer, a CCR system computer does not allow the " -"download of a log containing multiple dives. Rather, each dive is stored " -"independently. This means that _Subsurface_ cannot download a dive log " -"directly from a CCR dive computer, but that it imports individual CCR dive " -"profiles in the same way it imports dive log data from other digital " -"databases: one dive at a time." +"development. Subsurface currently supports Poseidon MkVI and APD Discovery/" +"Evolution dive computers. In contrast to a conventional recreational dive " +"computer, a CCR system computer does not allow the download of a log " +"containing multiple dives. Rather, each dive is stored independently. This " +"means that _Subsurface_ cannot download a dive log directly from a CCR dive " +"computer, but that it imports individual CCR dive profiles in the same way " +"it imports dive log data from other digital databases: one dive at a time." msgstr "" #. type: Title ===== @@ -4623,7 +4784,8 @@ msgid "" "information from other digital sources]. CCR dive data are currently " "obtained from the proprietary software provided when purchasing CCR dice " "equipment. See " -"<<_appendix_b_dive_computer_specific_information_for_importing_dive_information," +"<<_appendix_b_dive_computer_specific_information_for_importing_dive_informatio" +"n," "Appendix B>> for more complete information. Use that software to download " "the dive data into a known directory. From the main menu of _Subsurface_, " "select _Import -> Import log files_ to bring up the xref:" @@ -4839,7 +5001,8 @@ msgstr "images/CCR_dive_ceilingF22.jpg" msgid "" "More equipment-specific information for downloading CCR dive logs for " "Poseidon MkVI and APD equipment can be found in xref:" -"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix " +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[" +"Appendix " "B]." msgstr "" @@ -4876,8 +5039,8 @@ msgstr "" msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " -"pressures above 200 bar, making them more accurate. Refer to " -"xref:SAC_CALCULATION[Appendix F] for more information." +"pressures above 200 bar, making them more accurate. Refer to xref:" +"SAC_CALCULATION[Appendix F] for more information." msgstr "" "Consommation de gaz et calculs de la SAC (consommation équivalente à l'air): " "_Subsurface_ calcule la SAC et la consommation de gaz et tenant compte de " @@ -5038,7 +5201,8 @@ msgid "" "*Water temperature* is shown as a blue line with temperature values\n" "placed adjacent to significant changes.\n" msgstr "" -"La *température de l'eau* est indiquée par une ligne bleue avec des valeurs de\n" +"La *température de l'eau* est indiquée par une ligne bleue avec des valeurs" +" de\n" "température placées lors de changements significatifs.\n" #. type: Title ==== @@ -5082,11 +5246,11 @@ msgid "" "horizontally lets the Information Box show information for any point along " "the dive profile. It gives extensive statistics about depth, gas and ceiling " "characteristics of the particular dive. These include: Time period into the " -"dive (indicated by a @), depth, cylinder pressure (P), temperature, " -"ascent/descent rate, surface air consumption (SAC), oxygen partial pressure, " +"dive (indicated by a @), depth, cylinder pressure (P), temperature, ascent/" +"descent rate, surface air consumption (SAC), oxygen partial pressure, " "maximum operating depth, equivalent air depth (EAD), equivalent narcotic " -"depth (END), equivalent air density depth (EADD, also as gas density in " -"g/l), decompression requirements at that instant in time (Deco), time to " +"depth (END), equivalent air density depth (EADD, also as gas density in g/" +"l), decompression requirements at that instant in time (Deco), time to " "surface (TTS), the calculated ceiling, as well as of the statistics in the " "Information Box, shown as four buttons on the left of the profile panel. " "These are:" @@ -5147,13 +5311,13 @@ msgstr "images/icons/SAC.jpg" #. type: Plain text #: user-manual.txt:2240 msgid "" -"Show the *Surface Air Consumption (SAC)*, an indication of the " -"surface-normalized respiration rate of a diver. The value of SAC is less " -"than the real respiration rate because a diver at 10m uses breathing gas at " -"a rate roughly double that of the equivalent rate at the surface. SAC gives " -"an indication of breathing gas consumption rate independent of the depth of " -"the dive, so the respiratory rates of different dives can be compared. The " -"units for SAC is liters/min or cubic ft/min." +"Show the *Surface Air Consumption (SAC)*, an indication of the surface-" +"normalized respiration rate of a diver. The value of SAC is less than the " +"real respiration rate because a diver at 10m uses breathing gas at a rate " +"roughly double that of the equivalent rate at the surface. SAC gives an " +"indication of breathing gas consumption rate independent of the depth of the " +"dive, so the respiratory rates of different dives can be compared. The units " +"for SAC is liters/min or cubic ft/min." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' @@ -5530,9 +5694,9 @@ msgid "" "(and other factors taken into consideration at the time of the calculation) " "it’s unlikely that ceilings from dive computers and from _Subsurface_ are " "the same, even if the same algorithm and _gradient factors_ (see below) are " -"used. It’s also quite common that _Subsurface_ calculates a ceiling for " -"non-decompression dives when the dive computer stayed in non-deco mode " -"during the whole dive (represented by the [green]#dark green# section in the " +"used. It’s also quite common that _Subsurface_ calculates a ceiling for non-" +"decompression dives when the dive computer stayed in non-deco mode during " +"the whole dive (represented by the [green]#dark green# section in the " "profile at the beginning of this section). This is because _Subsurface’s_ " "calculations describe the deco obligation at each moment during a dive, " "while dive computers usually take the upcoming ascent into account. During " @@ -5616,10 +5780,10 @@ msgstr "images/Ceilings2.jpg" #: user-manual.txt:2468 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " -"depths. For more information about Gradient factors, see the section on " -"xref:GradientFactors_Ref[Gradient Factor Preference settings]. The currently " -"used gradient factors (e.g. GF 35/75) are shown above the depth profile if " -"the appropriate toolbar buttons are activated. N.B.: The indicated gradient " +"depths. For more information about Gradient factors, see the section on xref:" +"GradientFactors_Ref[Gradient Factor Preference settings]. The currently used " +"gradient factors (e.g. GF 35/75) are shown above the depth profile if the " +"appropriate toolbar buttons are activated. N.B.: The indicated gradient " "factors are NOT the gradient factors in use by the dive computer, but those " "used by Subsurface to calculate deco obligations during the dive. For more " "information external to this manual see:" @@ -5628,14 +5792,24 @@ msgstr "" #. type: Plain text #: user-manual.txt:2470 user-manual.txt:3309 #, no-wrap -msgid " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" -msgstr " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" +msgid "" +" *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding" +" M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" +msgstr "" +" *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding" +" M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" #. type: Plain text #: user-manual.txt:2472 user-manual.txt:3311 #, no-wrap -msgid " *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n" -msgstr " *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n" +msgid "" +" *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-article" +"s/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by" +" Kevin Watts]\n" +msgstr "" +" *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-article" +"s/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by" +" Kevin Watts]\n" #. type: Named 'icon' AttributeList argument for style 'icon' #: user-manual.txt:2476 @@ -5692,9 +5866,9 @@ msgid "" "pressures at a particular point in time during the dive. The inert gas " "pressures of 16 tissue compartments are shown as dark green vertical bars " "with the quick tissue compartments on the left and the slow tissue " -"compartments on the right. Refer to the section on the " -"xref:S_gas_pressure_graph[Gas Pressure Graph] for more details on the " -"different elements of this graph." +"compartments on the right. Refer to the section on the xref:" +"S_gas_pressure_graph[Gas Pressure Graph] for more details on the different " +"elements of this graph." msgstr "" #. type: delimited block = @@ -5747,10 +5921,10 @@ msgid "" "Bühlmann M-value gradient (bottom of red area in *A*). These tissue " "pressures are normally reached while ascending to a shallower depth. Below " "a value of 100%, this range indicates efficient off-gassing of inert gas " -"from the tissue compartment into the environment. Usually, efficient " -"off-gassing is indicated by light green, yellow or orange colours. Above " -"100% (red to white in *B*) the M-value gradient is exceeded and the " -"probability of decompression sickness increases markedly." +"from the tissue compartment into the environment. Usually, efficient off-" +"gassing is indicated by light green, yellow or orange colours. Above 100% " +"(red to white in *B*) the M-value gradient is exceeded and the probability " +"of decompression sickness increases markedly." msgstr "" #. type: delimited block = @@ -5858,10 +6032,10 @@ msgid "" "being switched TO. The list of choices is based on the available gases " "defined in the *Equipment* Tab. Setpoint change events open a dialog letting " "you choose the next setpoint value. As in the planner, a setpoint value of " -"zero shows the diver is breathing from an open circuit system while any " -"non-zero value shows the use of a closed circuit rebreather (CCR). By " -"right-clicking while over an existing marker a menu appears, adding options " -"to allow deletion of the marker, or to allow all markers of that type to be " +"zero shows the diver is breathing from an open circuit system while any non-" +"zero value shows the use of a closed circuit rebreather (CCR). By right-" +"clicking while over an existing marker a menu appears, adding options to " +"allow deletion of the marker, or to allow all markers of that type to be " "hidden. Hidden events can be restored to view by selecting Unhide all events " "from the context menu." msgstr "" @@ -5903,7 +6077,8 @@ msgstr "" #: user-manual.txt:2609 #, no-wrap msgid "Customizing the columns showed in the *Dive List* panel" -msgstr "Personnaliser les colonnes affichées dans le panneau *Liste des plongées*" +msgstr "" +"Personnaliser les colonnes affichées dans le panneau *Liste des plongées*" #. type: Target for macro image #: user-manual.txt:2611 @@ -5918,9 +6093,9 @@ msgid "" "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " "information can be controlled and changed by right-clicking on the header " "bar of the *Dive List*, bringing up a list of columns that can be shown in " -"the dive list (see above). Check an items to be included in the *Dive List*. " -" The list is immediately updated. Preferences for information shown in the " -"*Dive List* are saved and used when _Subsurface_ is re-opened." +"the dive list (see above). Check an items to be included in the *Dive " +"List*. The list is immediately updated. Preferences for information shown " +"in the *Dive List* are saved and used when _Subsurface_ is re-opened." msgstr "" #. type: Plain text @@ -5956,9 +6131,9 @@ msgstr "images/icons/outsidePhoto.png" #: user-manual.txt:2634 msgid "" "This dive has photographs taken immediately before or immediately after the " -"dive. This is useful for finding photos of dive teams or boats just " -"before/after the dive, whales or other surface animals seen just before or " -"after the dive, or of landscapes as seen from the boat." +"dive. This is useful for finding photos of dive teams or boats just before/" +"after the dive, whales or other surface animals seen just before or after " +"the dive, or of landscapes as seen from the boat." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' @@ -6013,9 +6188,9 @@ msgstr "Grouper des plongées en voyages et manipuler les voyages" #: user-manual.txt:2667 msgid "" "For regular divers, the dive list can rapidly become very long. _Subsurface_ " -"can group dives into _trips_. It does this by grouping dives that have " -"date/times not separated by more than two days and creating a single heading " -"for each diving trip represented in the dive log. Below is an ungrouped dive " +"can group dives into _trips_. It does this by grouping dives that have date/" +"times not separated by more than two days and creating a single heading for " +"each diving trip represented in the dive log. Below is an ungrouped dive " "list (*A*, on the left) as well as the corresponding grouped dive list of " "five dive trips (*B*, on the right):" msgstr "" @@ -6122,11 +6297,10 @@ msgstr "Effacer une plongée du carnet de plongée" #. type: Plain text #: user-manual.txt:2722 msgid "" -"Dives can be permanently deleted from the dive log by selecting and " -"right-clicking them to bring up the context menu, then selecting *Delete " -"dive(s)*. 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." +"Dives can be permanently deleted from the dive log by selecting and right-" +"clicking them to bring up the context menu, then selecting *Delete dive(s)*. " +"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." msgstr "" #. type: Title ==== @@ -6299,9 +6473,9 @@ msgid "" "by a check list with check boxes. Above each check list is a second-level " "filter tool, allowing the listing of only some attributes within that check " "list. For instance, typing \"_ca_\" in the filter text box above the tags " -"check list, results in the list being reduced to \"_cave_\" and " -"\"_cavern_\". Filtering the check list helps to rapidly find search terms " -"for filtering the dive list." +"check list, results in the list being reduced to \"_cave_\" and \"_cavern_" +"\". Filtering the check list helps to rapidly find search terms for " +"filtering the dive list." msgstr "" #. type: Plain text @@ -6352,8 +6526,8 @@ msgstr "Export des informations de plongée vers _Facebook_" msgid "" "Export of dives to _Facebook_ is handled differently from other types of " "export because a connection to _Facebook_ is required, needing a _Facebook_ " -"userID and password. From the *Main Menu*, select _Share on -> Connect to " -"-> Facebook_ (image *A* below) A _Facebook_ login screen appears (image *B* " +"userID and password. From the *Main Menu*, select _Share on -> Connect to -" +"> Facebook_ (image *A* below) A _Facebook_ login screen appears (image *B* " "below). Provide a _Facebook_ userID and password. From the _Subsurface_ " "window it’s easy to determine whether _Subsurface_ has a valid connection to " "_Facebook_: from the *Main Menu*, select _Share on_ (image *A*, below). " @@ -6450,7 +6624,8 @@ msgstr "" #: user-manual.txt:2866 #, no-wrap msgid "Export dive information to other destinations or formats" -msgstr "Exporter des informations de plongée vers d'autres destinations ou formats" +msgstr "" +"Exporter des informations de plongée vers d'autres destinations ou formats" #. type: Plain text #: user-manual.txt:2871 @@ -6558,15 +6733,13 @@ msgstr "images/mapview_f20.jpg" #. type: Plain text #: user-manual.txt:2925 -#, qt-format msgid "" "_TeX_ format, a file for printing using the TeX typesetting software. Choose " "a filename with a '.tex' extension. You will also need a template file, that " -"can be obtained from " -"link:http://www.atdotde.de/%7erobert/subsurfacetemplate/[http://www.atdotde.de/~robert/subsurfacetemplate/] " -"in the same directory as the '.tex' file. The file can then be processed " -"with plain TeX (not LaTeX), for example by running 'pdftex filename.tex' on " -"the command line." +"can be obtained from link:http://www.atdotde.de/%7erobert/subsurfacetemplate/" +"[http://www.atdotde.de/~robert/subsurfacetemplate/] in the same directory as " +"the '.tex' file. The file can then be processed with plain TeX (not LaTeX), " +"for example by running 'pdftex filename.tex' on the command line." msgstr "" #. type: Target for macro image @@ -6593,13 +6766,18 @@ msgstr "" #: user-manual.txt:2943 #, no-wrap msgid "" -"** Subsurface Numbers: if this option is checked, the dive(s) are exported with the\n" -" numbers associated with them in Subsurface, Otherwise the dive(s) will be numbered\n" +"** Subsurface Numbers: if this option is checked, the dive(s) are exported" +" with the\n" +" numbers associated with them in Subsurface, Otherwise the dive(s) will be" +" numbered\n" " starting from 1.\n" -"** Export Yearly Statistics: if this option is checked, a yearly statistics table will\n" +"** Export Yearly Statistics: if this option is checked, a yearly statistics" +" table will\n" " be attached to the HTML exports.\n" -"** Export List only: a list of dives only (date, time, depth, duration) will be exported\n" -" and the detailed dive information, e.g. dive profile, will not be available.\n" +"** Export List only: a list of dives only (date, time, depth, duration) will" +" be exported\n" +" and the detailed dive information, e.g. dive profile, will not be" +" available.\n" msgstr "" #. type: Plain text @@ -6656,21 +6834,28 @@ msgstr "" #: user-manual.txt:2985 #, no-wrap msgid "" -"** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> _Network_.\n" -"** In the section headed _Subsurface cloud storage_, enter an email address that\n" +"** Open the *Network Preferences* by selecting _File_ -> _Preferences_ ->" +" _Network_.\n" +"** In the section headed _Subsurface cloud storage_, enter an email address" +" that\n" " _Subsurface_ can use for user registration.\n" "** Enter a novel password that _Subsurface_ will use to store the\n" " dive log in the cloud.\n" "** Click _Apply_ to send the above email address and password to the\n" -" (remote) cloud server. The server responds by sending a verification PIN to\n" -" the above email address (This is the *only* occasion that _Subsurface_ uses the\n" -" email address provided above). The *Network Preferences* dialog now has a new PIN text\n" +" (remote) cloud server. The server responds by sending a verification PIN" +" to\n" +" the above email address (This is the *only* occasion that _Subsurface_ uses" +" the\n" +" email address provided above). The *Network Preferences* dialog now has a" +" new PIN text\n" " box, not visible previously.\n" -"** Enter the PIN in the corresponding text box in the *Network Preferences* dialog\n" +"** Enter the PIN in the corresponding text box in the *Network Preferences*" +" dialog\n" "(this field is only visible while the server is waiting for email\n" "address confirmation)\n" "** Click _Apply_ again. The _Subsurface cloud storage_ account\n" -"will be marked as verified and the _Subsurface cloud storage_ service is initialised for use.\n" +"will be marked as verified and the _Subsurface cloud storage_ service is" +" initialised for use.\n" msgstr "" #. type: Title === @@ -6684,22 +6869,29 @@ msgstr "" #, no-wrap msgid "" "** Once the cloud storage has been initialized, two new items appear in the\n" -" _File_ menu of the main menu system: _Open cloud storage_ and _Save to cloud storage_.\n" +" _File_ menu of the main menu system: _Open cloud storage_ and _Save to" +" cloud storage_.\n" "These options let you load and save data to the _Subsurface\n" "cloud storage_ server.\n" -"** In the _Defaults Preferences_ tab, you can select to use the _Subsurface cloud\n" -"storage_ data as the default data file by checking the box marked _Cloud storage default file_.\n" +"** In the _Defaults Preferences_ tab, you can select to use the _Subsurface" +" cloud\n" +"storage_ data as the default data file by checking the box marked _Cloud" +" storage default file_.\n" " This means the data from\n" -"the _Subsurface cloud storage_ is loaded when _Subsurface_ starts and saved there when _Subsurface_ closes.\n" +"the _Subsurface cloud storage_ is loaded when _Subsurface_ starts and saved" +" there when _Subsurface_ closes.\n" msgstr "" #. type: Plain text #: user-manual.txt:3001 #, no-wrap msgid "" -"** _Subsurface_ keeps a local copy of the data and the cloud facility remains fully\n" -"functional even if used while disconnected to the Internet. _Subsurface_ simply synchronizes the\n" -"data with the cloud server the next time the program is used while the computer is\n" +"** _Subsurface_ keeps a local copy of the data and the cloud facility remains" +" fully\n" +"functional even if used while disconnected to the Internet. _Subsurface_" +" simply synchronizes the\n" +"data with the cloud server the next time the program is used while the" +" computer is\n" "connected to the Internet.\n" msgstr "" @@ -6713,10 +6905,10 @@ msgstr "" #: user-manual.txt:3013 msgid "" "One of the nice side benefits of using _Subsurface cloud storage_ is that " -"you can also access your dive data from any web browser. Simply open " -"https://cloud.subsurface-divelog.org[_https://cloud.subsurface-divelog.org_], " -"log in with the same email and password, and you can see an HTML export of " -"the last dive data that was synced to _Subsurface cloud storage_. The dive " +"you can also access your dive data from any web browser. Simply open https://" +"cloud.subsurface-divelog.org[_https://cloud.subsurface-divelog.org_], log in " +"with the same email and password, and you can see an HTML export of the last " +"dive data that was synced to _Subsurface cloud storage_. The dive " "information shown is only the contents of the recorded dive logs, NOT the " "calculated values shown in the *Profile* panel, including some cylinder " "pressures, deco ceilings and O~2~/He/N~2~ partial pressures." @@ -6777,16 +6969,26 @@ msgstr "" #: user-manual.txt:3053 #, no-wrap msgid "" -"*A)* If the different users of a desktop computer do not log onto the desktop/laptop under different user names\n" -" then the simplest way is for each person to use her/his own divelog file within Subsurface. In this case John\n" -" would work with the _Subsurface_ file _johns-divelog_ and Joan would use _joans-divelog_. Select\n" -" the appropriate dive log by selecting, from the *Main Menu*, _File -> Open logbook_ and then select your own\n" -" dive log file from the list of files lower down in the menu. However, a problem arises if the users\n" -" prefer different settings for _Subsurface_. For instance, one diver may prefer to see the dive ceiling in the\n" -" *Profile Panel* and photos icons in the *Dive List*, while the other may not have these preferences. In addition,\n" -" the cloud connection is normally unique for each _Subsurface_ installation and if more than one user wishes to save\n" -" dive data on the cloud, it is inconvenient to open the *Preferences* and change the user-ID data every time\n" -" the cloud is accessed. To solve these problems, launch _Subsurface_ with a _--user=<user name>_ command-line option.\n" +"*A)* If the different users of a desktop computer do not log onto the" +" desktop/laptop under different user names\n" +" then the simplest way is for each person to use her/his own divelog file" +" within Subsurface. In this case John\n" +" would work with the _Subsurface_ file _johns-divelog_ and Joan would use" +" _joans-divelog_. Select\n" +" the appropriate dive log by selecting, from the *Main Menu*, _File -> Open" +" logbook_ and then select your own\n" +" dive log file from the list of files lower down in the menu. However, a" +" problem arises if the users\n" +" prefer different settings for _Subsurface_. For instance, one diver may" +" prefer to see the dive ceiling in the\n" +" *Profile Panel* and photos icons in the *Dive List*, while the other may" +" not have these preferences. In addition,\n" +" the cloud connection is normally unique for each _Subsurface_ installation" +" and if more than one user wishes to save\n" +" dive data on the cloud, it is inconvenient to open the *Preferences* and" +" change the user-ID data every time\n" +" the cloud is accessed. To solve these problems, launch _Subsurface_ with a" +" _--user=<user name>_ command-line option.\n" " John can then activate _Subsurface_ with this command-line instruction:\n" msgstr "" @@ -6811,22 +7013,33 @@ msgstr "" #: user-manual.txt:3067 #, no-wrap msgid "" -"In this case, each user's preferences, settings and cloud access information are stored separately, allowing\n" -" each diver to interact with _Subsurface_ in her/his preferred way and with individual cloud access. The above\n" -" process can be made user-friendly by creating a link/shortcut with a desktop icon that executes the above\n" -" command-line instruction. Use of the _--user=_ option therefore enables each user to create, maintain and\n" -" backup a separate dive log within a personalised user interface. This way, when each diver launches _Subsurface_,\n" -" it opens with the correct dive log as well as the appropriate display and backup preferences, and each diver\n" -" can access their own divelog on a mobile device using https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[_Subsurface-Mobile_].\n" +"In this case, each user's preferences, settings and cloud access information" +" are stored separately, allowing\n" +" each diver to interact with _Subsurface_ in her/his preferred way and with" +" individual cloud access. The above\n" +" process can be made user-friendly by creating a link/shortcut with a" +" desktop icon that executes the above\n" +" command-line instruction. Use of the _--user=_ option therefore enables" +" each user to create, maintain and\n" +" backup a separate dive log within a personalised user interface. This way," +" when each diver launches _Subsurface_,\n" +" it opens with the correct dive log as well as the appropriate display and" +" backup preferences, and each diver\n" +" can access their own divelog on a mobile device using" +" https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[_S" +"ubsurface-Mobile_].\n" msgstr "" #. type: Plain text #: user-manual.txt:3071 #, no-wrap msgid "" -"*B)* On the other hand, if the users log onto the same computer using different userIDs and passwords (i.e. users each\n" -"have a separate user space), _Subsurface_ is available independently to each user and every diver automatically has a separate\n" -"user profile and settings, including unique cloud and _Subsurface-Mobile_ access.\n" +"*B)* On the other hand, if the users log onto the same computer using" +" different userIDs and passwords (i.e. users each\n" +"have a separate user space), _Subsurface_ is available independently to each" +" user and every diver automatically has a separate\n" +"user profile and settings, including unique cloud and _Subsurface-Mobile_" +" access.\n" msgstr "" #. type: Title == @@ -6839,8 +7052,10 @@ msgstr "Imprimer un carnet de plongée" #: user-manual.txt:3077 #, no-wrap msgid "" -"_Subsurface_ provides a simple and flexible way to print a whole dive log or only a few selected dives.\n" -" Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.\n" +"_Subsurface_ provides a simple and flexible way to print a whole dive log or" +" only a few selected dives.\n" +" Pre-installed templates or a custom written template can be used to choose" +" where the data are fitted into the page.\n" msgstr "" #. type: Plain text @@ -6872,7 +7087,7 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3088 user-manual.txt:4605 +#: user-manual.txt:3088 user-manual.txt:4616 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "images/Print1_f22.jpg" @@ -7045,7 +7260,8 @@ msgid "" "and changed to different values. To begin, be sure the appropriate hardware " "driver is installed for the dive computer (also required for downloading " "dives) and the device name of the dive computer is known. See " -"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer," +"<<_appendix_a_operating_system_specific_information_for_importing_dive_informa" +"tion_from_a_dive_computer," "APPENDIX A>> for information on how to do this." msgstr "" "_Subsurface_ vous permet de configurer un ordinateur de plongée. " @@ -7056,7 +7272,8 @@ msgstr "" "pilotes pour votre ordinateur de plongée sont installés (également " "nécessaire pour télécharger les plongées) et que le nom de périphérique de " "l'ordinateur de plongée est connu. Voir " -"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer, " +"<<_appendix_a_operating_system_specific_information_for_importing_dive_informa" +"tion_from_a_dive_computer, " "ANNEXE A>> pour plus d'informations sur la manière de procéder." #. type: Plain text @@ -7094,10 +7311,12 @@ msgstr "" #: user-manual.txt:3169 #, no-wrap msgid "" -"*Retrieve available details*. This loads the existing configuration from the dive computer\n" +"*Retrieve available details*. This loads the existing configuration from the" +" dive computer\n" "to _Subsurface_, showing it in the configuration panel.\n" msgstr "" -"*Récupérer les détails disponibles*. Cela charge la configuration existante à partir de l'ordinateur de plongée\n" +"*Récupérer les détails disponibles*. Cela charge la configuration existante à" +" partir de l'ordinateur de plongée\n" "dans _Subsurface_, en l'affichant dans le panneau de configuration.\n" #. type: Plain text @@ -7105,10 +7324,13 @@ msgstr "" #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" -"dive computer to correspond to the information shown in the configuration panel.\n" +"dive computer to correspond to the information shown in the configuration" +" panel.\n" msgstr "" -"*Enregistrer les modifications sur le périphérique*. Cela change la configuration de l'ordinateur\n" -"de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n" +"*Enregistrer les modifications sur le périphérique*. Cela change la" +" configuration de l'ordinateur\n" +"de plongée pour correspondre aux informations affichées dans le panneau de" +" configuration.\n" #. type: Plain text #: user-manual.txt:3173 @@ -7117,27 +7339,32 @@ msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n" "a file location and file name for the saved information.\n" msgstr "" -"*Sauvegarder*. Cela enregistre la configuration dans un fichier. _Subsurface_ demande\n" +"*Sauvegarder*. Cela enregistre la configuration dans un fichier. _Subsurface_" +" demande\n" "l'emplacement et le nom du fichier pour enregistrer les informations.\n" #. type: Plain text #: user-manual.txt:3175 #, no-wrap msgid "" -"*Restore backup*. This loads the information from a backup file and displays it\n" +"*Restore backup*. This loads the information from a backup file and displays" +" it\n" "in the configuration panel.\n" msgstr "" -"*Restaurer une sauvegarde*. Cela charge les informations à partir d'un fichier de sauvegarde et l'affiche\n" +"*Restaurer une sauvegarde*. Cela charge les informations à partir d'un" +" fichier de sauvegarde et l'affiche\n" "dans le panneau de configuration.\n" #. type: Plain text #: user-manual.txt:3177 #, no-wrap msgid "" -"*Update firmware*. If new firmware is available for the dive computer, this is\n" +"*Update firmware*. If new firmware is available for the dive computer, this" +" is\n" "loaded into the dive computer.\n" msgstr "" -"*Mettre à jour le firmware*. Si un nouveau firmware est disponible pour l'ordinateur de plongée,\n" +"*Mettre à jour le firmware*. Si un nouveau firmware est disponible pour" +" l'ordinateur de plongée,\n" "il sera chargé dans l'ordinateur de plongée.\n" #. type: Title == @@ -7182,7 +7409,8 @@ msgstr "images/Pref1_f23.jpg" #, no-wrap msgid "" " ** *Lists and tables*: Specify the font type and font size of the\n" -" *Dive Table* panel: decreasing the font size allows one to see more dives on a screen.\n" +" *Dive Table* panel: decreasing the font size allows one to see more" +" dives on a screen.\n" msgstr "" #. type: Plain text @@ -7191,49 +7419,63 @@ msgstr "" msgid "" " ** *Dives*: For the _Default Dive Log File_ specify the directory and\n" " file name of your\n" -" electronic dive log book. This is a file with filename extension of either _.xml_ or _.ssrf_. When\n" -" launched, _Subsurface_ will automatically load the specified dive log book. There are three options:\n" +" electronic dive log book. This is a file with filename extension of" +" either _.xml_ or _.ssrf_. When\n" +" launched, _Subsurface_ will automatically load the specified dive log" +" book. There are three options:\n" msgstr "" #. type: Plain text #: user-manual.txt:3206 #, no-wrap -msgid "_No default file_: When checked, _Subsurface_ does not automatically load a dive log at startup.\n" +msgid "" +"_No default file_: When checked, _Subsurface_ does not automatically load a" +" dive log at startup.\n" msgstr "" #. type: Plain text #: user-manual.txt:3207 #, no-wrap -msgid "_Local default file_: When checked, _Subsurface_ automatically loads a dive log from the local hard disk.\n" +msgid "" +"_Local default file_: When checked, _Subsurface_ automatically loads a dive" +" log from the local hard disk.\n" msgstr "" #. type: Plain text #: user-manual.txt:3209 #, no-wrap msgid "" -"_Cloud storage default file_: When checked, _Subsurface automatically loads the dive log from the cloud\n" -"device that was initialized using the *Preferences* _Network_ tab (see below).\n" +"_Cloud storage default file_: When checked, _Subsurface automatically loads" +" the dive log from the cloud\n" +"device that was initialized using the *Preferences* _Network_ tab (see" +" below).\n" msgstr "" #. type: Plain text #: user-manual.txt:3211 #, no-wrap -msgid "** *Display invalid*: Dives can be marked as invalid (when a user wishes to hide\n" +msgid "" +"** *Display invalid*: Dives can be marked as invalid (when a user wishes to" +" hide\n" msgstr "" #. type: Plain text #: user-manual.txt:3214 #, no-wrap msgid "" -"dives that he/she doesn't consider valid dives, e.g. pool dives, but still want to\n" -"keep them in the dive log). This controls whether those dives are displayed in\n" +"dives that he/she doesn't consider valid dives, e.g. pool dives, but still" +" want to\n" +"keep them in the dive log). This controls whether those dives are displayed" +" in\n" "the dive list.\n" msgstr "" #. type: Plain text #: user-manual.txt:3216 #, no-wrap -msgid "** *Default cylinder*: From the dropdown list, select the default cylinder to be used in\n" +msgid "" +"** *Default cylinder*: From the dropdown list, select the default cylinder to" +" be used in\n" msgstr "" #. type: Plain text @@ -7245,25 +7487,33 @@ msgstr "" #. type: Plain text #: user-manual.txt:3219 #, no-wrap -msgid "** *Animations*: Some actions in showing the dive profile are performed using\n" +msgid "" +"** *Animations*: Some actions in showing the dive profile are performed" +" using\n" msgstr "" #. type: Plain text #: user-manual.txt:3225 #, no-wrap msgid "" -"animations. For instance, the axis values for depth and time change from dive to\n" -"dive. When viewing a different dive, these changes in axis characteristics do not\n" -"happen instantaneously, but are animated. The _Speed_ of animations can be controlled\n" +"animations. For instance, the axis values for depth and time change from dive" +" to\n" +"dive. When viewing a different dive, these changes in axis characteristics do" +" not\n" +"happen instantaneously, but are animated. The _Speed_ of animations can be" +" controlled\n" "by setting this slider\n" -"with faster animation speed to the left, and a 0 value representing no animation\n" +"with faster animation speed to the left, and a 0 value representing no" +" animation\n" "at all.\n" msgstr "" #. type: Plain text #: user-manual.txt:3227 #, no-wrap -msgid "** *Clear all settings*: As indicated in the button below this heading, all settings are\n" +msgid "" +"** *Clear all settings*: As indicated in the button below this heading, all" +" settings are\n" msgstr "" #. type: Plain text @@ -7325,22 +7575,29 @@ msgstr "images/Pref4_f23.jpg" #: user-manual.txt:3261 #, no-wrap msgid "" -"*Gas pressure display setup*. Even though nitrogen and helium pressures are also included here, these items mainly pertain to oxygen management:\n" -"** _Thresholds_: _Subsurface_ can display graphs of the nitrogen, oxygen and the helium\n" +"*Gas pressure display setup*. Even though nitrogen and helium pressures are" +" also included here, these items mainly pertain to oxygen management:\n" +"** _Thresholds_: _Subsurface_ can display graphs of the nitrogen, oxygen and" +" the helium\n" " partial pressures during\n" " the dive, activated using the toolbar on the left of the *Dive Profile*\n" -" panel. For each of these graphs, specify a threshold value. If any of the graphs go\n" +" panel. For each of these graphs, specify a threshold value. If any of the" +" graphs go\n" " above the specified threshold, the graph is\n" -" highlighted in red, indicating the particular partial pressure threshold has been exceeded.\n" -" The pO~2~ threshold is probably the most important one and a value of 1.6 is commonly used.\n" -"** _pO~2~ in calculating MOD_ is used for calculating the maximum operative depth for a particular\n" +" highlighted in red, indicating the particular partial pressure threshold" +" has been exceeded.\n" +" The pO~2~ threshold is probably the most important one and a value of 1.6" +" is commonly used.\n" +"** _pO~2~ in calculating MOD_ is used for calculating the maximum operative" +" depth for a particular\n" " nitrox or trimix gas mixture. A value of 1.4 is commonly used.\n" msgstr "" #. type: Plain text #: user-manual.txt:3263 #, no-wrap -msgid "** CCR Options: These options determine oxygen management for CCR dives:\n" +msgid "" +"** CCR Options: These options determine oxygen management for CCR dives:\n" msgstr "" #. type: Plain text @@ -7349,7 +7606,8 @@ msgstr "" msgid "" "*** _Dive planner default setpoint_: Specify the O~2~ setpoint for a\n" " CCR dive plan. This determines the pO~2~ maintained\n" -" during a particular dive. Setpoint changes during the dive can be added via the\n" +" during a particular dive. Setpoint changes during the dive can be added" +" via the\n" " profile context menu.\n" msgstr "" @@ -7357,40 +7615,52 @@ msgstr "" #: user-manual.txt:3272 #, no-wrap msgid "" -"*** _CCR: Show setpoints when viewing pO~2~:_ With this checkbox activated, the pO~2~\n" -" graph on the dive profile has an overlay in red which indicates the CCR setpoint\n" -" values. See the section on xref:S_CCR_dives[Closed Circuit Rebreather dives].\n" +"*** _CCR: Show setpoints when viewing pO~2~:_ With this checkbox activated," +" the pO~2~\n" +" graph on the dive profile has an overlay in red which indicates the CCR" +" setpoint\n" +" values. See the section on xref:S_CCR_dives[Closed Circuit Rebreather" +" dives].\n" msgstr "" #. type: Plain text #: user-manual.txt:3276 #, no-wrap msgid "" -"*** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n" -" values associated with each of the individual oxygen sensors of a CCR system.\n" +"*** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the" +" pO~2~\n" +" values associated with each of the individual oxygen sensors of a CCR" +" system.\n" " See the section on xref:S_CCR_dives[Closed Circuit Rebreather dives].\n" msgstr "" #. type: Plain text #: user-manual.txt:3278 #, no-wrap -msgid "*Ceiling display setup*. These settings mostly deal with nitrogen and helium management\n" +msgid "" +"*Ceiling display setup*. These settings mostly deal with nitrogen and helium" +" management\n" msgstr "" #. type: Plain text #: user-manual.txt:3279 #, no-wrap -msgid "by determining how the decompression ceiling (ascent ceiling) is calculated and displayed:\n" +msgid "" +"by determining how the decompression ceiling (ascent ceiling) is calculated" +" and displayed:\n" msgstr "" #. type: Plain text #: user-manual.txt:3286 #, no-wrap msgid "" -"** _Draw dive computer reported ceiling red_: This checkbox does exactly what it says. By default\n" +"** _Draw dive computer reported ceiling red_: This checkbox does exactly what" +" it says. By default\n" " the computer reported ceiling is shown in white.\n" -" Not all dive computers report ceiling values. If the dive computer does report it, it may differ\n" -" from the ceilings calculated by _Subsurface_ because of the different algorithms and\n" +" Not all dive computers report ceiling values. If the dive computer does" +" report it, it may differ\n" +" from the ceilings calculated by _Subsurface_ because of the different" +" algorithms and\n" " gradient factors, as well as the dynamic way a\n" " dive computer calculates ceilings during a dive.\n" msgstr "" @@ -7401,7 +7671,8 @@ msgstr "" msgid "" "** _Algorithm for calculating ceiling_. Choose between the Bühlmann Z1H-L16\n" " decompression model and the VPM-B model:\n" -"*** _VPM-B_: Provide a conservatism level for calculating the VPM-B ceiling. Values between 0\n" +"*** _VPM-B_: Provide a conservatism level for calculating the VPM-B ceiling." +" Values between 0\n" " (least conservative) and 4 (most conservative) are valid.\n" msgstr "" @@ -7409,26 +7680,38 @@ msgstr "" #: user-manual.txt:3307 #, no-wrap msgid "" -"*** Bühlmann: Set the _gradient factors_ (GFLow and GFHigh) for calculcating the deco ceiling following\n" -" the ZH-L16 algorithm. GF_Low is the gradient factor at depth and GF_High is used at the surface.\n" -" At intermediate depths gradient factors between GF_Low and GF_High are used.\n" -" Gradient factors add conservatism to nitrogen and helium exposure during a dive, in a\n" -" similar way that many dive computers have a conservatism setting. The lower\n" -" the value of a gradient factor, the more conservative the calculations are with\n" +"*** Bühlmann: Set the _gradient factors_ (GFLow and GFHigh) for calculcating" +" the deco ceiling following\n" +" the ZH-L16 algorithm. GF_Low is the gradient factor at depth and GF_High" +" is used at the surface.\n" +" At intermediate depths gradient factors between GF_Low and GF_High are" +" used.\n" +" Gradient factors add conservatism to nitrogen and helium exposure during a" +" dive, in a\n" +" similar way that many dive computers have a conservatism setting. The" +" lower\n" +" the value of a gradient factor, the more conservative the calculations are" +" with\n" " respect to inert gas loading and the deeper the ceilings are. Gradient\n" -" factors of 20/60 are considered conservative and values of 70/90 are considered\n" +" factors of 20/60 are considered conservative and values of 70/90 are" +" considered\n" " harsh.\n" -" In addition decide whether to check the _GFLow at max. depth_ box. If checked, GF_Low is used for the\n" -" deepest dive depth and linearly increased up to the GF_High value at the surface. If unchecked,\n" -" GF_Low is used between the deepest dive depth and the first deco stop, after which the\n" -" gradient factor linearly increases up to the GF_High value at the surface. For more information see:\n" +" In addition decide whether to check the _GFLow at max. depth_ box. If" +" checked, GF_Low is used for the\n" +" deepest dive depth and linearly increased up to the GF_High value at the" +" surface. If unchecked,\n" +" GF_Low is used between the deepest dive depth and the first deco stop," +" after which the\n" +" gradient factor linearly increases up to the GF_High value at the surface." +" For more information see:\n" msgstr "" #. type: Plain text #: user-manual.txt:3314 #, no-wrap msgid "" -" ** _pSCR options_. These preferences determine how passive semi-closed circuit (pSCR) dives\n" +" ** _pSCR options_. These preferences determine how passive semi-closed" +" circuit (pSCR) dives\n" " are planned and how the pSCR deco ceiling is calculated:\n" msgstr "" @@ -7437,7 +7720,8 @@ msgstr "" #, no-wrap msgid "" " *** _Metabolic rate:_ this is the\n" -" volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning\n" +" volume of oxygen used by a diver during a minute. Set this value for pSCR" +" dive planning\n" " and decompression calculations.\n" msgstr "" @@ -7445,8 +7729,10 @@ msgstr "" #: user-manual.txt:3321 #, no-wrap msgid "" -" *** _pSCR ratio:_ The dilution ratio (or dump ratio) is the ratio of gas released to the\n" -" environment to that of the gas recirculated to the diver. A 1:10 ratio is commonly used.\n" +" *** _pSCR ratio:_ The dilution ratio (or dump ratio) is the ratio of gas" +" released to the\n" +" environment to that of the gas recirculated to the diver. A 1:10 ratio is" +" commonly used.\n" msgstr "" #. type: Plain text @@ -7459,11 +7745,17 @@ msgstr "" #: user-manual.txt:3330 #, no-wrap msgid "" -"** _Show unused cylinders in Equipment Tab_: This checkbox allows display of information about unused cylinders when viewing the\n" -"*Equipment Tab*. If this box is not checked, and if any cylinders entered using the *Equipment Tab* are not used (e.g. there\n" -"was no gas switch to such a cylinder), then these cylinders are omitted from that list.\n" -"** _Show mean depth_: If this box is checked, the *Dive Profile* panel contains a grey line that shows\n" -" the mean depth of the dive, up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before\n" +"** _Show unused cylinders in Equipment Tab_: This checkbox allows display of" +" information about unused cylinders when viewing the\n" +"*Equipment Tab*. If this box is not checked, and if any cylinders entered" +" using the *Equipment Tab* are not used (e.g. there\n" +"was no gas switch to such a cylinder), then these cylinders are omitted from" +" that list.\n" +"** _Show mean depth_: If this box is checked, the *Dive Profile* panel" +" contains a grey line that shows\n" +" the mean depth of the dive, up to any time instant during the dive." +" Normally this is a u-shaped line indicating the deepest mean depth just" +" before\n" " ascent.\n" msgstr "" @@ -7516,9 +7808,8 @@ msgstr "Réseau" msgid "" "This panel facilitates communication between _Subsurface_ and data sources " "on the Internet. This is important, for instance, when _Subsurface_ needs " -"to communicate with web services such as Cloud storage, the " -"<<S_Companion,_Subsurface Companion app_>> or when you want to communicate " -"through a proxy." +"to communicate with web services such as Cloud storage, the <<S_Companion," +"_Subsurface Companion app_>> or when you want to communicate through a proxy." msgstr "" #. type: Target for macro image @@ -7537,11 +7828,15 @@ msgstr "" #, no-wrap msgid "" "** _Proxy_:\n" -"If a proxy server is used for Internet access, the type of proxy needs to be selected from the dropdown list,\n" -"after which the IP address of the host and the appropriate port number should\n" -"be provided. If the proxy server uses authentication, the appropriate userID and\n" +"If a proxy server is used for Internet access, the type of proxy needs to be" +" selected from the dropdown list,\n" +"after which the IP address of the host and the appropriate port number" +" should\n" +"be provided. If the proxy server uses authentication, the appropriate userID" +" and\n" "password are required so that _Subsurface_ can automatically pass\n" -"through the proxy server to access the Internet. This information is usually obtained\n" +"through the proxy server to access the Internet. This information is usually" +" obtained\n" "from your ISP.\n" msgstr "" @@ -7549,16 +7844,21 @@ msgstr "" #: user-manual.txt:3370 #, no-wrap msgid "" -"** _Subsurface cloud storage_: To store your dive log in the cloud, a valid email address\n" -" and password are required. This lets _Subsurface_ email security information\n" -" regarding cloud storage to you, and to set up cloud storage appropriately.\n" +"** _Subsurface cloud storage_: To store your dive log in the cloud, a valid" +" email address\n" +" and password are required. This lets _Subsurface_ email security" +" information\n" +" regarding cloud storage to you, and to set up cloud storage" +" appropriately.\n" " Two additional options are given:\n" msgstr "" #. type: Plain text #: user-manual.txt:3371 #, no-wrap -msgid "_Sync to cloud in the background_: This option allows saving of dive information to the cloud storage\n" +msgid "" +"_Sync to cloud in the background_: This option allows saving of dive" +" information to the cloud storage\n" msgstr "" #. type: Plain text @@ -7570,7 +7870,9 @@ msgstr "" #. type: Plain text #: user-manual.txt:3373 #, no-wrap -msgid "_Save password locally_: This allows local storage of the cloud storage password. Note that this\n" +msgid "" +"_Save password locally_: This allows local storage of the cloud storage" +" password. Note that this\n" msgstr "" #. type: Plain text @@ -7583,9 +7885,12 @@ msgstr "" #: user-manual.txt:3378 #, no-wrap msgid "" -"** _Subsurface web service_: When you subscribe to the <<S_Companion,Subsurface web service>>, a very\n" -" long and hard-to-remember userID is issued. This is the place to save that userID. By\n" -" checking the option _Save User ID locally?_, you ensure a local copy of that userID is saved.\n" +"** _Subsurface web service_: When you subscribe to the <" +"<S_Companion,Subsurface web service>>, a very\n" +" long and hard-to-remember userID is issued. This is the place to save" +" that userID. By\n" +" checking the option _Save User ID locally?_, you ensure a local copy of" +" that userID is saved.\n" msgstr "" #. type: Title === @@ -7793,40 +8098,51 @@ msgstr "" #. type: Plain text #: user-manual.txt:3458 #, no-wrap -msgid "** Deco switch at: the switch depth for deco gases. Unless overridden by the user, this will be\n" +msgid "" +"** Deco switch at: the switch depth for deco gases. Unless overridden by the" +" user, this will be\n" msgstr "" #. type: Plain text #: user-manual.txt:3459 #, no-wrap -msgid "automatically calculated based on the Deco pO~2~ preference (default 1.6 bar)\n" +msgid "" +"automatically calculated based on the Deco pO~2~ preference (default 1.6" +" bar)\n" msgstr "" #. type: Plain text #: user-manual.txt:3460 #, no-wrap -msgid "** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom mix. Automatically\n" +msgid "" +"** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom" +" mix. Automatically\n" msgstr "" #. type: Plain text #: user-manual.txt:3462 #, no-wrap msgid "" -"calculated based on the Bottom pO~2~ preference (default 1.4 bar). Editing this field will modify the\n" -"O~2~% according to the depth set. Set to ''*'' to calculate the best O~2~% for the dive maximum depth.\n" +"calculated based on the Bottom pO~2~ preference (default 1.4 bar). Editing" +" this field will modify the\n" +"O~2~% according to the depth set. Set to ''*'' to calculate the best O~2~%" +" for the dive maximum depth.\n" msgstr "" #. type: Plain text #: user-manual.txt:3463 #, no-wrap -msgid "** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based on the Best Mix END\n" +msgid "" +"** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based" +" on the Best Mix END\n" msgstr "" #. type: Plain text #: user-manual.txt:3465 #, no-wrap msgid "" -"preference (default 30m / 98 ft). Editing this field will modify the He% according to the depth set.\n" +"preference (default 30m / 98 ft). Editing this field will modify the He%" +" according to the depth set.\n" "Set to ''*'' to calculate the best He% for the dive maximum depth.\n" msgstr "" @@ -7869,16 +8185,26 @@ msgstr "Plongées loisir" #: user-manual.txt:3498 #, no-wrap msgid "" -"Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL).\n" -"It computes the maximum time a diver can stay at the current depth without needing mandatory decompression\n" -"stops and without using more than the existing gas (minus a reserve). The planner automatically takes\n" -"into account the nitrogen load incurred in previous dives. But conventional dive tables are also used in a\n" -"way that can take into account previous dives. Why use a dive planner for recreational dives? Using\n" -"recreational dive tables, the maximum depth of a dive is taken into account. But few dives are\n" -"done at a constant depth corresponding to the maximum depth (i.e. a \"square\" dive profile). This means\n" -"dive tables overestimate the nitrogen load incurred during previous dives. The _Subsurface_\n" -"dive planner calculates nitrogen load according to the real dive profiles of all uploaded previous dives,\n" -"in a similar way as dive computers calculate nitrogen load during a dive. This means that the diver gets 'credit,'\n" +"Recreational mode is what comes closest to planning a dive based on the" +" non-decompression limit (NDL).\n" +"It computes the maximum time a diver can stay at the current depth without" +" needing mandatory decompression\n" +"stops and without using more than the existing gas (minus a reserve). The" +" planner automatically takes\n" +"into account the nitrogen load incurred in previous dives. But conventional" +" dive tables are also used in a\n" +"way that can take into account previous dives. Why use a dive planner for" +" recreational dives? Using\n" +"recreational dive tables, the maximum depth of a dive is taken into account." +" But few dives are\n" +"done at a constant depth corresponding to the maximum depth (i.e. a" +" \"square\" dive profile). This means\n" +"dive tables overestimate the nitrogen load incurred during previous dives." +" The _Subsurface_\n" +"dive planner calculates nitrogen load according to the real dive profiles of" +" all uploaded previous dives,\n" +"in a similar way as dive computers calculate nitrogen load during a dive." +" This means that the diver gets 'credit,'\n" "in terms of nitrogen load, for not remaining at maximum depth during\n" "previous dives, so a longer subsequent dive can be planned.\n" " For the planner to work it's crucial to upload all previous dives\n" @@ -7911,11 +8237,11 @@ msgstr "" #. type: Plain text #: user-manual.txt:3513 msgid "" -"The planner calculates whether the specified cylinder contains enough " -"air/gas to complete the planned dive. In order for this to be accurate, " -"under _Gas options_, specify an appropriate surface air consumption (SAC) " -"rate for _Bottom SAC_. Suitable values are between 15 l/min and 30 l/min, " -"with novice divers or difficult dives requiring SAC rates closer to 30l/min." +"The planner calculates whether the specified cylinder contains enough air/" +"gas to complete the planned dive. In order for this to be accurate, under " +"_Gas options_, specify an appropriate surface air consumption (SAC) rate for " +"_Bottom SAC_. Suitable values are between 15 l/min and 30 l/min, with novice " +"divers or difficult dives requiring SAC rates closer to 30l/min." msgstr "" #. type: Plain text @@ -8007,17 +8333,25 @@ msgstr "" #: user-manual.txt:3564 #, no-wrap msgid "" -"*a) Nitrogen management*: This is done by specifying the rates for descent and ascent,\n" -"as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings _Rates_ and _Planning_\n" -"to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B\n" -"model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GFHigh and GFLow\n" -"need to be specified. Initially, the GFHigh and GFLow values in the _Preferences_\n" -"panel of _Subsurface_ is used. If these are changed within the planner (see _Gas Options_ within\n" +"*a) Nitrogen management*: This is done by specifying the rates for descent" +" and ascent,\n" +"as well as the deco model (GFLow, GFHigh or Conservatism level) under the" +" headings _Rates_ and _Planning_\n" +"to the bottom left of the planning screen. Two deco models are supported the" +" Bühlmann model and the VPM-B\n" +"model. Select one of the two models. When selecting the Bühlmann model, the" +" gradient factors (GFHigh and GFLow\n" +"need to be specified. Initially, the GFHigh and GFLow values in the" +" _Preferences_\n" +"panel of _Subsurface_ is used. If these are changed within the planner (see" +" _Gas Options_ within\n" "the planner), the new values are\n" "used without changing the original values in the _Preferences_.\n" -"Gradient Factor settings strongly affect the calculated ceilings and their depths.\n" +"Gradient Factor settings strongly affect the calculated ceilings and their" +" depths.\n" "A very low GFLow value brings on decompression stops early during the dive.\n" -" ** For more information about Gradient factors, see the section on xref:S_GradientFactors[Gradient Factor Preference settings].\n" +" ** For more information about Gradient factors, see the section on" +" xref:S_GradientFactors[Gradient Factor Preference settings].\n" msgstr "" #. type: Plain text @@ -8034,30 +8368,47 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3572 +#: user-manual.txt:3581 +msgid "" +"Please note as well that there is an intrinsic assumption of the VPM-B model " +"that off-gassing only happens during the ascent phase of the dive (which is " +"the part controlled by the planner). Thus it is possible to get misleading " +"results if you manually enter waypoints well in the decompression phase of " +"your dive. This is particularly relevant when editing a dive read from disk " +"in the planner since that will have waypoints up to the surface. Thus for " +"those dives, first delete all waypoints during the ascent phase. This is " +"most easily done by holding the Ctrl- or Command-key while clicking on the " +"trash can icon next to the first ascent waypoint in the table on the left " +"hand side." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3583 msgid "For more information external to this manual see:" msgstr "Pour plus d'information en dehors de ce manuel, voir:" #. type: Plain text -#: user-manual.txt:3574 +#: user-manual.txt:3585 msgid "" -"link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " -"M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" +"link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-" +"values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" msgstr "" -"link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " -"M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" +"link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-" +"values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" #. type: Plain text -#: user-manual.txt:3575 +#: user-manual.txt:3586 msgid "" -"link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient " -"factors for dummies, by Kevin Watts]" +"link:http://www.rebreatherworld.com/general-and-new-to-rebreather-" +"articles/5037-gradient-factors-for-dummies.html[Gradient factors for " +"dummies, by Kevin Watts]" msgstr "" -"link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient " -"factors for dummies, by Kevin Watts]" +"link:http://www.rebreatherworld.com/general-and-new-to-rebreather-" +"articles/5037-gradient-factors-for-dummies.html[Gradient factors for " +"dummies, by Kevin Watts]" #. type: Plain text -#: user-manual.txt:3577 +#: user-manual.txt:3588 msgid "" "link:https://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/" "dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco" @@ -8072,7 +8423,7 @@ msgstr "" "traite à la fois des modèles de décompression Bühlmann et VPM-B." #. type: Plain text -#: user-manual.txt:3585 +#: user-manual.txt:3596 msgid "" "The ascent rate is critical for nitrogen off-gassing at the end of the dive " "and is specified for several depth ranges, using the mean depth as a " @@ -8085,57 +8436,83 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3594 +#: user-manual.txt:3605 #, no-wrap msgid "" -"*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n" +"*b) Oxygen management*: In the *Gas Options* part of the dive specification," +" the maximum partial\n" "pressure for oxygen needs to be specified for the\n" -"bottom part of the dive (_bottom po2_) as well as for the decompression part of the dive (_deco po2_).\n" -"Commonly used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression\n" -"stages. Normally, a partial pressure of 1.6 bar is not exceeded. The depth at which switching to a gas\n" +"bottom part of the dive (_bottom po2_) as well as for the decompression part" +" of the dive (_deco po2_).\n" +"Commonly used values are 1.4 bar for the bottom part of the dive and 1.6 bar" +" for any decompression\n" +"stages. Normally, a partial pressure of 1.6 bar is not exceeded. The depth at" +" which switching to a gas\n" "takes place can be edited in the\n" -"_Available Gases_ dialog. Normally, the planner decides on switching to a new gas when, during\n" +"_Available Gases_ dialog. Normally, the planner decides on switching to a new" +" gas when, during\n" "ascent, the partial pressure of the new gas has decreased to 1.6 bar.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3625 +#: user-manual.txt:3636 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary\n" "consideration. Divers need to keep within the limits of the amount of\n" "gas within the dive\n" -"cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly\n" -"sharing with a buddy. Under the _Gas Options_ heading, specify the best (but conservative) estimate\n" +"cylinder(s), allowing for an appropriate margin for a safe return to the" +" surface, possibly\n" +"sharing with a buddy. Under the _Gas Options_ heading, specify the best (but" +" conservative) estimate\n" "of your surface-equivalent air consumption (SAC, also termed RMV) in\n" -"liters/min (for the time being, only SI units are supported). Specify the SAC during the\n" -"bottom part of the dive (_bottom SAC_) as well as during the decompression or safety stops of the\n" -"dive (_deco SAC_). Values of 15-30 l/min are common. For good gas management, a guess\n" +"liters/min (for the time being, only SI units are supported). Specify the SAC" +" during the\n" +"bottom part of the dive (_bottom SAC_) as well as during the decompression or" +" safety stops of the\n" +"dive (_deco SAC_). Values of 15-30 l/min are common. For good gas management," +" a guess\n" "is not sufficient and you needs to\n" -"monitor gas consumption on a regular basis, dependent on different dive conditions and/or equipment.\n" -"The planner calculates the total volume of gas used during the dive and issues a warning\n" -"if you exceeds the total amount of gas available. Good practice demands that divers not dive to\n" +"monitor gas consumption on a regular basis, dependent on different dive" +" conditions and/or equipment.\n" +"The planner calculates the total volume of gas used during the dive and" +" issues a warning\n" +"if you exceeds the total amount of gas available. Good practice demands that" +" divers not dive to\n" "the limit of the gas supply but that an appropriate reserve is kept\n" "for unforeseen circumstances.\n" -"For technical diving, this reserve can be up to 66% of the total available gas.\n" -"In addition to calculating the total gas consumption for every cylinder the planner provides one way\n" -"of calculating the recommended volume of bottom gas which is needed for safe asscent to the\n" -"first deco gas change depth or the surface. This procedure is called the \"minimum gas\" or \"rock bottom\"\n" +"For technical diving, this reserve can be up to 66% of the total available" +" gas.\n" +"In addition to calculating the total gas consumption for every cylinder the" +" planner provides one way\n" +"of calculating the recommended volume of bottom gas which is needed for safe" +" asscent to the\n" +"first deco gas change depth or the surface. This procedure is called the" +" \"minimum gas\" or \"rock bottom\"\n" "consideration and it is used by various (but not all)\n" -"technical diving organisations. The calculation assumes that in worst case an out of gas (OoG)\n" -"situation could occur at the end of the planned bottom time at maximum depth. This OoG event forces\n" -"the buddy team the share the gas of one diver and to stay at maximum depth for an additional\n" +"technical diving organisations. The calculation assumes that in worst case an" +" out of gas (OoG)\n" +"situation could occur at the end of the planned bottom time at maximum depth." +" This OoG event forces\n" +"the buddy team the share the gas of one diver and to stay at maximum depth" +" for an additional\n" "time of n minutes (preferences option \"problem solving time\").\n" -"At the same moment the combined SAC of both divers is increased by a estimated factor (preferences option\n" -"\"SAC factor\") compared to the SAC factor of a single diver under normal conditions.\n" -"The result of the minimum gas calculation for the bottom gas is printed to the planner output as an\n" -"additional information. No automatic checks are performed based on this result.\n" -"Please take care that the feature only gives valid results for simple, rectengular shaped single\n" -"level dive profiles. For multi level dives one would need to check every leg of the profile independently.\n" +"At the same moment the combined SAC of both divers is increased by a" +" estimated factor (preferences option\n" +"\"SAC factor\") compared to the SAC factor of a single diver under normal" +" conditions.\n" +"The result of the minimum gas calculation for the bottom gas is printed to" +" the planner output as an\n" +"additional information. No automatic checks are performed based on this" +" result.\n" +"Please take care that the feature only gives valid results for simple," +" rectengular shaped single\n" +"level dive profiles. For multi level dives one would need to check every leg" +" of the profile independently.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3638 +#: user-manual.txt:3649 msgid "" "Now you can start the detailed time-depth planning of the dive. _Subsurface_ " "offers an unique graphical interface for doing planning. The mechanics are " @@ -8153,7 +8530,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3649 +#: user-manual.txt:3660 msgid "" "Each waypoint on the dive profile creates a _Dive Planner Point_ in the " "table on the left of the dive planner panel. Ensure the _Used Gas_ value in " @@ -8170,7 +8547,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3655 +#: user-manual.txt:3666 msgid "" "Show any changes in gas cylinder used by indicating gas changes as explained " "in the section <<S_CreateProfile,hand-creating a dive profile>>. These " @@ -8180,20 +8557,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3664 +#: user-manual.txt:3675 msgid "" "A non-zero value in the \"CC setpoint\" column of the table of dive planner " "points indicates a valid setpoint for oxygen partial pressure and that the " "segment is dived using a closed circuit rebreather (CCR). If the last " "manually entered segment is a CCR segment, the decompression phase is " "computed assuming the diver uses a CCR with the specified set-point. If the " -"last segment (however short) is on open circuit (OC, indicated by a zero " -"set-point) the decompression is computed in OC mode and the planner only " +"last segment (however short) is on open circuit (OC, indicated by a zero set-" +"point) the decompression is computed in OC mode and the planner only " "considers gas changes in OC mode." msgstr "" #. type: Plain text -#: user-manual.txt:3667 +#: user-manual.txt:3678 msgid "" "Below is an example of a dive plan to 45m using Tx21/35, followed by an " "ascent using EAN50 and oxygen and using the settings as described above." @@ -8203,13 +8580,13 @@ msgstr "" "l'oxygène, et utilisant les réglages décrits ci-dessous." #. type: Target for macro image -#: user-manual.txt:3668 +#: user-manual.txt:3679 #, no-wrap msgid "images/Planner_OC_deco_VPM.jpg" msgstr "images/Planner_OC_deco_VPM.jpg" #. type: Plain text -#: user-manual.txt:3673 +#: user-manual.txt:3684 msgid "" "Once the above steps have been completed, save by clicking the _Save_ button " "towards the top middle of the planner. The saved dive plan will appear in " @@ -8217,13 +8594,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3675 +#: user-manual.txt:3686 #, no-wrap msgid "*The dive plan details*\n" msgstr "*Les détails du plan de plongée*\n" #. type: Plain text -#: user-manual.txt:3683 +#: user-manual.txt:3694 msgid "" "On the bottom right of the dive planner, under _Dive Plan Details_, the " "exact details of the dive plan are provided. These details may be modified " @@ -8236,7 +8613,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3688 +#: user-manual.txt:3699 msgid "" "If the option _Display segment duration_ is checked, then the duration of " "each depth level is indicated in the _Dive Plan Details_. This duration " @@ -8246,102 +8623,122 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3689 +#: user-manual.txt:3700 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3706 +#: user-manual.txt:3717 #, no-wrap msgid "" -"To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than\n" +"To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_" +" rather than\n" "_Open circuit_ in the dropdown list.\n" -"The parameters of the pSCR dive can be set by selecting _File -> Preferences -> Profile_\n" -"from the main menu, where the gas consumption calculation takes into account the pSCR dump\n" -"ratio (default 1:10) as well as the metabolic rate. The calculation also takes the oxygen drop\n" +"The parameters of the pSCR dive can be set by selecting _File -> " +" Preferences -> Profile_\n" +"from the main menu, where the gas consumption calculation takes into account" +" the pSCR dump\n" +"ratio (default 1:10) as well as the metabolic rate. The calculation also" +" takes the oxygen drop\n" "accross the mouthpiece of the rebreather into account. If the\n" -"pO~2~ drops below what is considered safe, a warning appears in the _Dive plan\n" -"details_. A typical pSCR cylinder setup is very similar to an open circuit dive;\n" -"one or more drive cilinders, possibly with different bottom and decompression\n" +"pO~2~ drops below what is considered safe, a warning appears in the _Dive" +" plan\n" +"details_. A typical pSCR cylinder setup is very similar to an open circuit" +" dive;\n" +"one or more drive cilinders, possibly with different bottom and" +" decompression\n" "gasses, including gas switches during the dive like in open circuit diving.\n" -"Therefore, the setup of the _Available gases_ and the _Dive planner points_ tables\n" -"are very similar to that of a open circuit dive plan, described above. However, no oxygen setpoints\n" -"are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable\n" -"to that of the CCR dive below, but note the longer ascent duration due to the lower oxygen\n" -"in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.\n" +"Therefore, the setup of the _Available gases_ and the _Dive planner points_" +" tables\n" +"are very similar to that of a open circuit dive plan, described above." +" However, no oxygen setpoints\n" +"are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive" +" is comparable\n" +"to that of the CCR dive below, but note the longer ascent duration due to the" +" lower oxygen\n" +"in the loop due to the oxygen drop across the mouthpiece of the pSCR" +" equipment.\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:3707 +#: user-manual.txt:3718 #, no-wrap msgid "images/Planner_pSCR1_f20.jpg" msgstr "images/Planner_pSCR1_f20.jpg" #. type: Title === -#: user-manual.txt:3710 +#: user-manual.txt:3721 #, no-wrap msgid "Planning CCR dives" msgstr "Planifier des plongées CCR (recycleur)" #. type: Plain text -#: user-manual.txt:3714 +#: user-manual.txt:3725 msgid "" "To plan a dive using a closed circuit rebreather, select the _CCR_ option in " "the dropdown list, circled in blue in the image below." msgstr "" #. type: Plain text -#: user-manual.txt:3718 +#: user-manual.txt:3729 #, no-wrap msgid "" -"*Available gases*: In the _Available gases_ table, enter the cylinder information for the\n" -"diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen\n" +"*Available gases*: In the _Available gases_ table, enter the cylinder" +" information for the\n" +"diluent cylinder and for any bail-out cylinders. Do NOT enter the information" +" for the oxygen\n" "cylinder since it is implied when the _CCR_ dropdown selection is made.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3728 +#: user-manual.txt:3739 #, no-wrap msgid "" -"*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File -> Preferences -> Profile_ from\n" +"*Entering setpoints*: Specify a default setpoint in the Preferences tab, by" +" selecting _File -> Preferences -> Profile_ from\n" "the main menu. All user-entered segments in the _Dive planner points_ table\n" -"use the default setpoint value. Then, different setpoints can be specified for dive segments\n" +"use the default setpoint value. Then, different setpoints can be specified" +" for dive segments\n" "in the _Dive planner points_ table. A zero setpoint\n" -"means the diver bails out to open circuit mode for that segment. Decompression is always calculated\n" -"using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a\n" -"CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression\n" -"algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but\n" +"means the diver bails out to open circuit mode for that segment." +" Decompression is always calculated\n" +"using the setpoint of the last manually entered segment. So, to plan a bail" +" out ascent for a\n" +"CCR dive, add a one-minute dive segment to the end with a setpoint value of" +" 0. The decompression\n" +"algorithm does not switch deco-gases automatically while in CCR mode (i.e." +" when a positive setpoint is specified) but\n" "this is calculated for bail out ascents.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3730 +#: user-manual.txt:3741 msgid "" "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:3731 +#: user-manual.txt:3742 #, no-wrap msgid "images/Planner_CCR1_f20.jpg" msgstr "images/Planner_CCR1_f20.jpg" #. type: Plain text -#: user-manual.txt:3735 +#: user-manual.txt:3746 msgid "" "Note that, in the _Dive plan details_, the gas consumption for a CCR segment " "is not calculated, so gas consumptions of 0 liters are the norm." msgstr "" #. type: Title === -#: user-manual.txt:3737 +#: user-manual.txt:3748 #, no-wrap msgid "Modifying an existing dive plan" msgstr "Modifier une planification existante" #. type: Plain text -#: user-manual.txt:3744 +#: user-manual.txt:3755 msgid "" "Normally, when a dive plan has been saved, it is accessible from the *Dive " "List*, like any other dive log. Within the *Dive List* there is no way to " @@ -8352,7 +8749,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3750 +#: user-manual.txt:3761 msgid "" "In addition, there is the option \"Save new\". This keeps the original " "planned dive and adds a (possibly modified, - earlier dives are now taken " @@ -8363,13 +8760,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3751 +#: user-manual.txt:3762 #, no-wrap msgid "Planning for repetitive dives" msgstr "Planifier des plongées successives" #. type: Plain text -#: user-manual.txt:3758 +#: user-manual.txt:3769 msgid "" "Repetitive dives can easily be planned if the dates and start times of the " "repetitive dive set are specified appropriately in the top left-hand _Start " @@ -8378,7 +8775,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3764 +#: user-manual.txt:3775 msgid "" "If you have just completed a long/deep dive and are planning another dive, " "then highlight, in the *Dive List*, the dive that has just been logged then " @@ -8388,7 +8785,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3769 +#: user-manual.txt:3780 msgid "" "If only a few standard configurations are used (e.g. in GUE), then a " "template dive can be created conforming to one of the configurations. If you " @@ -8398,13 +8795,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3770 +#: user-manual.txt:3781 #, no-wrap msgid "Printing the dive plan" msgstr "Imprimer un plan de plongée" #. type: Plain text -#: user-manual.txt:3775 +#: user-manual.txt:3786 msgid "" "Selecting the _Print_ button in the planner allows printing of the _Dive " "Plan Details_ for wet notes. You can also cut and paste the _Dive Plan " @@ -8412,7 +8809,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3781 +#: user-manual.txt:3792 msgid "" "However, after the plan has been saved, it is represented in a way very " "similar to a dive log and the gas calculations cannot be accessed in the " @@ -8422,13 +8819,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3783 +#: user-manual.txt:3794 #, no-wrap msgid "Saving a dive with its dive plan" msgstr "Enregistrer une plongée avec sa planification" #. type: Plain text -#: user-manual.txt:3790 +#: user-manual.txt:3801 msgid "" "In the section dealing with <<S_MultipleDiveComputers, dives using more than " "one dive computer>> we discussed the way in which multiple profiles for a " @@ -8439,25 +8836,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3792 +#: user-manual.txt:3803 msgid "Do the dive planning and save the final plan in the _Dive List_." msgstr "" #. type: Plain text -#: user-manual.txt:3793 +#: user-manual.txt:3804 msgid "After diving, upload the dive data from the dive computer." msgstr "" "Après la plongée, télécharger les données depuis l'ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3795 +#: user-manual.txt:3806 msgid "" "Change the date and time of the _dive plan_ to coincide with that of the " "real-life dive from the _dive computer_." msgstr "" #. type: Plain text -#: user-manual.txt:3798 +#: user-manual.txt:3809 msgid "" "In the _Dive List_, highlight the dive plan as well as the data for the real " "dive and merge the two dives, making use of the Dive List Context Menu " @@ -8465,22 +8862,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3802 +#: user-manual.txt:3813 msgid "" "The text version of the dive plan is appended to the Notes in the _Notes " "Tab_. With this merged dive highlighted in the _Dive List_, switch between " -"the planned profile and the real-life profile using the " -"righ-arrow/left-arrow keyboard keys." +"the planned profile and the real-life profile using the righ-arrow/left-" +"arrow keyboard keys." msgstr "" #. type: Title == -#: user-manual.txt:3803 +#: user-manual.txt:3814 #, no-wrap msgid "Running _Subsurface_ from the command-line" msgstr "Lancer _Subsurface_ depuis la ligne de commande" #. type: Plain text -#: user-manual.txt:3807 +#: user-manual.txt:3818 msgid "" "_Subsurface_ can be launched from the command-line to set some specialised " "settings or as part of an script-based automated process for manipulating a " @@ -8488,43 +8885,49 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3809 +#: user-manual.txt:3820 #, no-wrap msgid "\tsubsurface [options] [logfile ...] [--import logfile ...]\n" msgstr "" #. type: Plain text -#: user-manual.txt:3811 +#: user-manual.txt:3822 msgid "The options include:" msgstr "Ces options incluent:" #. type: delimited block | -#: user-manual.txt:3825 +#: user-manual.txt:3836 #, no-wrap msgid "" "|*Command-line option*|*Description*\n" "|--help|Print a summary of the command-line options\n" "| -h|Print a summary of the command-line options\n" -"|--import logfile ...|A file name before this option is treated as an existing dive log, everything after is imported into the existing dive log\n" +"|--import logfile ...|A file name before this option is treated as an" +" existing dive log, everything after is imported into the existing dive log\n" "|--verbose|Print debug information while running _Subsurface_\n" "| -v|Print debug information while running _Subsurface_\n" "| -v -v| Print even more debug information while running _Subsurface_\n" "|--version|Prints the current version of _Subsurface_\n" -"|--survey|Opens the xref:S_UserSurvey[user survey] immediately after starting _Subsurface_\n" -"|--user=<username>|Choose the xref:S_user_space[configuration space] of user <username>\n" -"|--cloud-timeout=<duration>|Set the timeout for cloud connection (0 < duration < 60). This enables longer timeouts for slow Internet connections\n" -"|--win32console|Create a dedicated console if needed (Windows only). Add this option before everything else\n" -"|--win32log|Write the program output to subsurface.log (Windows only). Add option before everything else\n" +"|--survey|Opens the xref:S_UserSurvey[user survey] immediately after starting" +" _Subsurface_\n" +"|--user=<username>|Choose the xref:S_user_space[configuration space] of user" +" <username>\n" +"|--cloud-timeout=<duration>|Set the timeout for cloud connection (0 <" +" duration < 60). This enables longer timeouts for slow Internet connections\n" +"|--win32console|Create a dedicated console if needed (Windows only). Add this" +" option before everything else\n" +"|--win32log|Write the program output to subsurface.log (Windows only). Add" +" option before everything else\n" msgstr "" #. type: Title == -#: user-manual.txt:3827 +#: user-manual.txt:3838 #, no-wrap msgid "Description of the Subsurface Main Menu items" msgstr "Description des éléments du menu principal de Subsurface" #. type: Plain text -#: user-manual.txt:3832 +#: user-manual.txt:3843 msgid "" "This section describes the functions and operation of the items in the Main " "Menu of Subsurface. Several of the items below are links to sections of this " @@ -8535,13 +8938,13 @@ msgstr "" "des sections de ce manuel traitant des opérations relatives." #. type: Title === -#: user-manual.txt:3833 +#: user-manual.txt:3844 #, no-wrap msgid "File" msgstr "Fichier" #. type: Plain text -#: user-manual.txt:3836 +#: user-manual.txt:3847 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." @@ -8550,7 +8953,7 @@ msgstr "" "actuellement ouvert et supprime toutes les informations de plongées." #. type: Plain text -#: user-manual.txt:3838 +#: user-manual.txt:3849 msgid "" "_Open logbook_ - Open the file manager to select a dive logbook to open." msgstr "" @@ -8558,44 +8961,44 @@ msgstr "" "carnet de plongée à ouvrir." #. type: Plain text -#: user-manual.txt:3839 +#: user-manual.txt:3850 msgid "_Save_ - Save the dive logbook currently open." msgstr "_Sauvegarder_ - Enregistrer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:3840 +#: user-manual.txt:3851 msgid "_Save as_ - Save the current logbook under a different file name." msgstr "" "_Enregsitrer sous_ - Enregistrer le carnet actuel sous un nom différent." #. type: Plain text -#: user-manual.txt:3841 +#: user-manual.txt:3852 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3842 +#: user-manual.txt:3853 msgid "" -"_Save to cloud storage_ - Save the current dive log to " -"<<S_Cloud_storage,_Cloud storage_>>." +"_Save to cloud storage_ - Save the current dive log to <<S_Cloud_storage," +"_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3843 +#: user-manual.txt:3854 msgid "" "_Take cloud storage online_ - " "******************************************************" msgstr "" #. type: Plain text -#: user-manual.txt:3844 +#: user-manual.txt:3855 msgid "_Close_ - Close the dive logbook currently open." msgstr "_Fermer_ - Fermer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:3846 +#: user-manual.txt:3857 msgid "" "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the " "selected dives in the logbook) to one of several formats." @@ -8605,34 +9008,34 @@ msgstr "" "formats." #. type: Plain text -#: user-manual.txt:3847 +#: user-manual.txt:3858 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook." msgstr "" "<<S_PrintDivelog,_Imprimer_>> - Imprimer le carnet de plongée actuellement " "ouvert." #. type: Plain text -#: user-manual.txt:3848 +#: user-manual.txt:3859 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:3849 +#: user-manual.txt:3860 msgid "" "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:3850 +#: user-manual.txt:3861 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:3851 +#: user-manual.txt:3862 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." @@ -8641,30 +9044,30 @@ msgstr "" "configuration d'un ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3852 +#: user-manual.txt:3863 msgid "_Quit_ - Quit _Subsurface_." msgstr "_Quitter_ - Quitter _Subsurface_." #. type: Title === -#: user-manual.txt:3854 +#: user-manual.txt:3865 #, no-wrap msgid "Edit" msgstr "Édition" #. type: Plain text -#: user-manual.txt:3856 +#: user-manual.txt:3867 msgid "" "The Edit option allows one to undo or redo an action, e.g. deleting dives." msgstr "" #. type: Title === -#: user-manual.txt:3857 +#: user-manual.txt:3868 #, no-wrap msgid "Import" msgstr "Importer" #. type: Plain text -#: user-manual.txt:3860 +#: user-manual.txt:3871 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." @@ -8673,7 +9076,7 @@ msgstr "" "Importer des informations de plongées à partir de l'ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3862 +#: user-manual.txt:3873 msgid "" "<<Unified_import,_Import Log Files_>> - Import dive information from a file " "in in a _Subsurface_-compatible format." @@ -8683,7 +9086,7 @@ msgstr "" "_Subsurface_." #. type: Plain text -#: user-manual.txt:3864 +#: user-manual.txt:3875 msgid "" "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS " "coordinates from the _Subsurface_ mobile phone app." @@ -8693,7 +9096,7 @@ msgstr "" "(téléphones et tablettes)." #. type: Plain text -#: user-manual.txt:3866 +#: user-manual.txt:3877 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." @@ -8702,13 +9105,13 @@ msgstr "" "informations de plongées à partir de _www.Divelogs.de_." #. type: Title === -#: user-manual.txt:3867 +#: user-manual.txt:3878 #, no-wrap msgid "Log" msgstr "Journal (log)" #. type: Plain text -#: user-manual.txt:3869 +#: user-manual.txt:3880 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." @@ -8717,19 +9120,19 @@ msgstr "" "plongée au panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3870 +#: user-manual.txt:3881 msgid "" "_Edit dive_ - Edit a dive where the profile was entered by hand and not from " "a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3871 +#: user-manual.txt:3882 msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives." msgstr "<<S_DivePlanner,_Planifier une plongée_>> - Planifier des plongées." #. type: Plain text -#: user-manual.txt:3872 +#: user-manual.txt:3883 msgid "" "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved " "into the *Dive List*." @@ -8738,17 +9141,17 @@ msgstr "" "plongée planifiée qui a été enregistrée dans la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3874 +#: user-manual.txt:3885 msgid "" "<<S_CopyComponents,_Copy dive components_>> - Copy information from several " "fields of a dive log onto the clipboard." msgstr "" "<<S_CopyComponents,_Copier les composants de la plongée_>> - Copier les " -"informations de plusieurs champs d'un journal de plongée vers le " -"presse-papier." +"informations de plusieurs champs d'un journal de plongée vers le presse-" +"papier." #. type: Plain text -#: user-manual.txt:3876 +#: user-manual.txt:3887 msgid "" "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, " "the information copied using the _Copy dive components_ option." @@ -8758,7 +9161,7 @@ msgstr "" "préalable avec l'option _Copier les composants de la plongée_." #. type: Plain text -#: user-manual.txt:3878 +#: user-manual.txt:3889 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." @@ -8767,7 +9170,7 @@ msgstr "" "le panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3880 +#: user-manual.txt:3891 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." @@ -8776,7 +9179,7 @@ msgstr "" "*liste des plongées* dans des voyages de plongées." #. type: Plain text -#: user-manual.txt:3881 +#: user-manual.txt:3892 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "coordinate your logs." @@ -8785,7 +9188,7 @@ msgstr "" "les noms des ordinateurs de plongée pour coordonner vos journaux (logs)." #. type: Plain text -#: user-manual.txt:3882 +#: user-manual.txt:3893 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." @@ -8794,13 +9197,13 @@ msgstr "" "certaines plongées, à partir de tags ou de critères de plongées." #. type: Title === -#: user-manual.txt:3883 +#: user-manual.txt:3894 #, no-wrap msgid "View" msgstr "Vue" #. type: Plain text -#: user-manual.txt:3886 +#: user-manual.txt:3897 msgid "" "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once." msgstr "" @@ -8808,33 +9211,33 @@ msgstr "" "_Subsurface_ simultanément." #. type: Plain text -#: user-manual.txt:3887 +#: user-manual.txt:3898 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:3888 +#: user-manual.txt:3899 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:3889 +#: user-manual.txt:3900 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:3890 +#: user-manual.txt:3901 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:3892 +#: user-manual.txt:3903 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." @@ -8843,32 +9246,32 @@ msgstr "" "plongées effectuées." #. type: Plain text -#: user-manual.txt:3895 +#: user-manual.txt:3906 msgid "" "_Prev DC_ - Switch to data from previous dive computer, if a single dive was " -"logged from more than one. See the sections on " -"<<S_MultipleDiveComputers,using multiple dive computers for the same dive>> " -"and <<S_MergeDivePlan, Saving an uploaded dive with its dive plan>>." +"logged from more than one. See the sections on <<S_MultipleDiveComputers," +"using multiple dive computers for the same dive>> and <<S_MergeDivePlan, " +"Saving an uploaded dive with its dive plan>>." msgstr "" #. type: Plain text -#: user-manual.txt:3896 +#: user-manual.txt:3907 msgid "_Next DC_ - Switch to next dive computer." msgstr "_Ordinateur suivant_ - Passer à l'ordinateur de plongée suivant." #. type: Plain text -#: user-manual.txt:3897 +#: user-manual.txt:3908 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "_Plein écran_ - Passer en mode plein écran." #. type: Title === -#: user-manual.txt:3898 +#: user-manual.txt:3909 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:3900 +#: user-manual.txt:3911 msgid "" "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your " "Facebook timeline." @@ -8877,13 +9280,13 @@ msgstr "" "Facebook." #. type: Title === -#: user-manual.txt:3901 +#: user-manual.txt:3912 #, no-wrap msgid "Help" msgstr "Aide" #. type: Plain text -#: user-manual.txt:3904 +#: user-manual.txt:3915 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." @@ -8892,7 +9295,7 @@ msgstr "" "_Subsurface_ ainsi que les informations de licence." #. type: Plain text -#: user-manual.txt:3906 +#: user-manual.txt:3917 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the https://subsurface-divelog.org/[_Subsurface_ web site]." @@ -8902,7 +9305,7 @@ msgstr "" "_Subsurface_ ]." #. type: Plain text -#: user-manual.txt:3908 +#: user-manual.txt:3919 msgid "" "<<S_UserSurvey,_User survey_>> - Help to make _Subsurface_ even better by " "taking part in our user survey or by completing another survey if your " @@ -8913,31 +9316,35 @@ msgstr "" "sondage, si vos habitudes de plongées ont changées." #. type: Plain text -#: user-manual.txt:3909 +#: user-manual.txt:3920 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:3912 +#: user-manual.txt:3923 #, 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." +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:3914 +#: user-manual.txt:3925 #, 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:3915 +#: user-manual.txt:3926 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "images/icons/drivers.jpg" #. type: Plain text -#: user-manual.txt:3920 +#: user-manual.txt:3931 msgid "" "The operating system of the desktop computer needs the appropriate drivers " "in order to communicate with the dive computer, the way the dive computer " @@ -8948,7 +9355,7 @@ msgstr "" "l'ordinateur de plongée (Bluetooth, USB, infra-rouge)." #. type: Plain text -#: user-manual.txt:3926 +#: user-manual.txt:3937 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 " @@ -8962,7 +9369,7 @@ msgstr "" "particulièrement pour certaines technologies telles que l'infra-rouge." #. type: Plain text -#: user-manual.txt:3930 +#: user-manual.txt:3941 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 " @@ -8973,37 +9380,40 @@ msgstr "" "port USB de son ordinateur de bureau." #. type: Plain text -#: user-manual.txt:3937 +#: user-manual.txt:3948 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 " "computer using a USB-to-serial interface based on the Silicon Labs CP2101 or " -"similar chip can be found as _Mac_OSX_VCP_Driver.zip_ at the " -"https://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101[Silicon " -"Labs document and software repository]." +"similar chip can be found as _Mac_OSX_VCP_Driver.zip_ at the https://www." +"silabs.com/support/pages/document-library.aspx?p=Interface&f=USB" +"%20Bridges&pn=CP2101[Silicon Labs document and software repository]." msgstr "" "Sous Mac, les utilisateurs peuvent parfois avoir besoin d'installer " "manuellement le bon pilote. Par exemple, pour le Mares Puck ou n'importe " "quel autre ordinateur de plongée utilisant une interface USB-série basé sur " "le composant Silicon Labs CP2101 ou similaire, le bon pilote est disponible " -"sous _Mac_OSX_VCP_Driver.zip_ sur le " -"https://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101[dépôt " -"de documents et logiciels Silicon Labs]." +"sous _Mac_OSX_VCP_Driver.zip_ sur le https://www.silabs.com/support/pages/" +"document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101[dépôt de " +"documents et logiciels Silicon Labs]." #. type: Title === -#: user-manual.txt:3939 +#: user-manual.txt:3950 #, 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" +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:3940 +#: user-manual.txt:3951 #, no-wrap msgid "images/icons/usb.jpg" msgstr "images/icons/usb.jpg" #. type: Plain text -#: user-manual.txt:3948 +#: user-manual.txt:3959 msgid "" "When connecting a dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list with the correct device " @@ -9019,7 +9429,7 @@ msgstr "" "de votre périphérique ;" #. type: Plain text -#: user-manual.txt:3953 +#: user-manual.txt:3964 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." @@ -9028,56 +9438,56 @@ msgstr "" "tous les périphériques COM connectés." #. type: Title ==== -#: user-manual.txt:3954 user-manual.txt:4052 +#: user-manual.txt:3965 user-manual.txt:4063 #, no-wrap msgid "On MacOS:" msgstr "Sur MacOS :" #. type: Plain text -#: user-manual.txt:3957 +#: user-manual.txt:3968 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:3958 +#: user-manual.txt:3969 #, no-wrap msgid "On Linux:" msgstr "Sur Linux :" #. type: Plain text -#: user-manual.txt:3961 +#: user-manual.txt:3972 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:3963 +#: user-manual.txt:3974 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:3964 +#: user-manual.txt:3975 msgid "Open a terminal" msgstr "Ouvrir un terminal" #. type: Plain text -#: user-manual.txt:3965 user-manual.txt:3967 +#: user-manual.txt:3976 user-manual.txt:3978 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:3966 +#: user-manual.txt:3977 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:3969 +#: user-manual.txt:3980 msgid "A message similar to this one should appear:" msgstr "Un message similaire à celui-ci devrait apparaitre :" #. type: Plain text -#: user-manual.txt:3985 +#: user-manual.txt:3996 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -9113,7 +9523,7 @@ msgstr "" "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n" #. type: Plain text -#: user-manual.txt:3990 +#: user-manual.txt:4001 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 " @@ -9125,22 +9535,22 @@ msgstr "" "que Subsurface utilise le bon port USB." #. type: Plain text -#: user-manual.txt:3992 +#: user-manual.txt:4003 msgid "Ensuring 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:4002 +#: user-manual.txt:4013 msgid "" "On Unix-like operating systems the USB ports can only be accessed by users " "who are members special group that can be e.g. +dialout+ or +uucp+. This " -"can be verified by listing the appropriate device permissions e.g. by +ls -l " -"/dev/ttyUSB0+. Note that the number in the file name depends on how many USB " -"devices you have connected, and must be adjusted appropriately. If you are " -"not root, you may not be a member of that group and won't be able to use the " -"USB port. Let us assume your username is 'johnB'." +"can be verified by listing the appropriate device permissions e.g. by +ls -" +"l /dev/ttyUSB0+. Note that the number in the file name depends on how many " +"USB devices you have connected, and must be adjusted appropriately. If you " +"are not root, you may not be a member of that group and won't be able to use " +"the USB port. Let us assume your username is 'johnB'." msgstr "" "Sur les systèmes similaires à Unix, les ports USB ne peuvent être accédés " "que par des utilisateurs membres d'un groupe spécial qui peut être +dialout+ " @@ -9152,7 +9562,7 @@ msgstr "" "USB. Admettons que votre nom d'utilisateur soit 'johnB'." #. type: Plain text -#: user-manual.txt:4006 +#: user-manual.txt:4017 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." @@ -9162,33 +9572,36 @@ msgstr "" "+dialout+." #. type: Plain text -#: user-manual.txt:4011 +#: user-manual.txt:4022 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" "verifies that\n" -"the appropriate group membership has been created. The +dialout+ group should\n" +"the appropriate group membership has been created. The +dialout+ group" +" should\n" "be listed\n" "among the different IDs.\n" msgstr "" -"Tapez : +id johnB+ Cela liste tous les groupes auquel johnB appartient et\n" +"Tapez : +id johnB+ Cela liste tous les groupes auquel johnB appartient" +" et\n" "vérifiez que \n" "l'appartenance au groupe est bien effectif. Le groupe +dialout+ devrait \n" "être listé\n" "parmi les différents IDs.\n" #. type: Plain text -#: user-manual.txt:4013 +#: user-manual.txt:4024 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n" "you log out and then log in again.\n" msgstr "" -"Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexion\n" +"Sous certaines circonstances, les modifications ne prennent effet qu'après" +" une déconnexion\n" "puis reconnexion sur l'ordinateur (sous Ubuntu, par exemple).\n" #. type: Plain text -#: user-manual.txt:4018 +#: user-manual.txt:4029 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 you " @@ -9199,13 +9612,13 @@ msgstr "" "vous devriez pouvoir importer vos plongées." #. type: Title === -#: user-manual.txt:4021 +#: user-manual.txt:4032 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:4028 +#: user-manual.txt:4039 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a " @@ -9214,13 +9627,15 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4030 +#: user-manual.txt:4041 #, no-wrap -msgid "*For the dive computer, after enabling Bluetooth, be sure it is in Upload mode.*\n" +msgid "" +"*For the dive computer, after enabling Bluetooth, be sure it is in Upload" +" mode.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4034 +#: user-manual.txt:4045 msgid "" "For Bluetooth pairing of the dive computer, refer to the manufacturer's user " "guide. When using a Shearwater Predator/Petrel/Nerd, select _Dive Log -> " @@ -9228,13 +9643,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4036 +#: user-manual.txt:4047 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" -msgstr "*Jumeler l'ordinateur utilisant _Subsurface_ avec l'ordinateur de plongée.*\n" +msgstr "" +"*Jumeler l'ordinateur utilisant _Subsurface_ avec l'ordinateur de plongée.*\n" #. type: Plain text -#: user-manual.txt:4045 +#: user-manual.txt:4056 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -9246,21 +9662,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4048 +#: user-manual.txt:4059 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:4051 +#: user-manual.txt:4062 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:4058 +#: user-manual.txt:4069 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. " @@ -9269,20 +9685,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4061 +#: user-manual.txt:4072 msgid "" "Once the pairing is complete, the correct device is shown in the 'Device or " "Mount Point' drop-down in the _Subsurface_ *Import* dialog." msgstr "" #. type: Title ==== -#: user-manual.txt:4062 +#: user-manual.txt:4073 #, no-wrap msgid "On Linux" msgstr "Sur Linux" #. type: Plain text -#: user-manual.txt:4070 +#: user-manual.txt:4081 msgid "" "Be sure Bluetooth is enabled on the _Subsurface_ computer. On most common " "distributions this should be true out of the box and pairing should be " @@ -9294,7 +9710,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4074 +#: user-manual.txt:4085 msgid "" "Setting up a connection to download dives from your Bluetooth-enabled " "device, such as the _Shearwater Petrel_, is not yet an automated process and " @@ -9303,23 +9719,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4076 +#: user-manual.txt:4087 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "Activez le contrôleur Bluetooth et jumelez votre ordinateur de plongée" #. type: Plain text -#: user-manual.txt:4077 +#: user-manual.txt:4088 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:4078 user-manual.txt:4218 +#: user-manual.txt:4089 user-manual.txt:4229 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:4084 +#: user-manual.txt:4095 msgid "" "Ensure the dive computer is in upload mode. On the _Shearwater Petrel_, " "_Petrel 2_ and _Nerd_ cycle through the menu, select 'Dive Log', then " @@ -9330,7 +9746,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4089 +#: user-manual.txt:4100 msgid "" "To establish the connection, establish root access through +sudo+ or +su+. " "The correct permission is required to download the dives in the computer. On " @@ -9340,23 +9756,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4091 +#: user-manual.txt:4102 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:4093 +#: user-manual.txt:4104 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:4094 +#: user-manual.txt:4105 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4100 +#: user-manual.txt:4111 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 " @@ -9367,14 +9783,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4103 +#: user-manual.txt:4114 msgid "" "If the graphical method doesn'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:4110 +#: user-manual.txt:4121 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -9386,7 +9802,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4115 +#: user-manual.txt:4126 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 " @@ -9396,7 +9812,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4123 +#: user-manual.txt:4134 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -9409,25 +9825,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4125 +#: user-manual.txt:4136 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: user-manual.txt:4127 +#: user-manual.txt:4138 msgid "" "If there are multiple controllers running, it's easiest to turn off the " "unused controller(s). For example, for +hci1+:" msgstr "" #. type: Plain text -#: user-manual.txt:4129 +#: user-manual.txt:4140 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:4132 +#: user-manual.txt:4143 msgid "" "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez " "5, such as Fedora 22, you can use a tool called +blutootctl+, which will " @@ -9435,7 +9851,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4153 +#: user-manual.txt:4164 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -9444,11 +9860,13 @@ msgid "" "\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" +"\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[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" @@ -9461,22 +9879,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4156 +#: user-manual.txt:4167 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:4159 +#: user-manual.txt:4170 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+." +"there is probably not a +bluetoothctl+, but a script called +bluez-simple-" +"agent+ or just +simple-agent+." msgstr "" #. type: Plain text -#: user-manual.txt:4164 +#: user-manual.txt:4175 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -9486,94 +9904,96 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4166 +#: user-manual.txt:4177 msgid "Once the dive computer is paired, set up the RFCOMM connection." msgstr "" #. type: Title ===== -#: user-manual.txt:4167 +#: user-manual.txt:4178 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:4170 +#: user-manual.txt:4181 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:4172 +#: user-manual.txt:4183 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:4174 +#: user-manual.txt:4185 msgid "+<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:4175 +#: user-manual.txt:4186 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:4176 +#: user-manual.txt:4187 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:4177 +#: user-manual.txt:4188 msgid "" "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:4180 +#: user-manual.txt:4191 msgid "" "If you omit 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:4182 +#: user-manual.txt:4193 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4183 +#: user-manual.txt:4194 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4184 +#: user-manual.txt:4195 msgid "_Shearwater Nerd_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4185 +#: user-manual.txt:4196 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4187 +#: user-manual.txt:4198 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:4189 +#: user-manual.txt:4200 #, no-wrap -msgid "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)\n" +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:4191 +#: user-manual.txt:4202 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:4194 +#: user-manual.txt:4205 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -9581,23 +10001,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4196 +#: user-manual.txt:4207 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:4200 +#: user-manual.txt:4211 #, no-wrap msgid "" -"\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, probably 0000, when prompted)\n" +"\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:4204 +#: user-manual.txt:4215 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 " @@ -9606,7 +10027,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4214 +#: user-manual.txt:4225 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -9621,7 +10042,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4217 +#: user-manual.txt:4228 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 " @@ -9629,35 +10050,35 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4220 +#: user-manual.txt:4231 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_." +"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:4226 +#: user-manual.txt:4237 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:4229 +#: user-manual.txt:4240 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4231 +#: user-manual.txt:4242 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "images/icons/iumis.jpg" #. type: Plain text -#: user-manual.txt:4247 +#: user-manual.txt:4258 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and equipment. " @@ -9673,7 +10094,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4262 +#: user-manual.txt:4273 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -9690,19 +10111,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4264 +#: user-manual.txt:4275 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4266 +#: user-manual.txt:4277 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "images/icons/Galileo.jpg" #. type: Plain text -#: user-manual.txt:4281 +#: user-manual.txt:4292 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -9711,32 +10132,31 @@ msgid "" "companies. Under Linux, the kernel already provides for communication using " "the IrDA protocol. However, the user additionally needs to load a driver for " "the IrDA interface with the dive computer. The easiest way is to load the " -"*irda-tools* package from the " -"http://irda.sourceforge.net/docs/startirda.html[Linux IrDA Project]. After " -"the installation of the irda-tools, the *root user* can specify a device " -"name from the console as follows: +irattach irda0+" +"*irda-tools* package from the http://irda.sourceforge.net/docs/startirda." +"html[Linux IrDA Project]. After the installation of the irda-tools, the " +"*root user* can specify a device name from the console as follows: +irattach " +"irda0+" msgstr "" #. type: Plain text -#: user-manual.txt:4284 +#: user-manual.txt:4295 msgid "" "After executing this command, Subsurface will recognize the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:4290 +#: user-manual.txt:4301 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]. " -"Windows-based IrDA drivers for the Uwatec can also be downloaded from the " -"ScubaPro web site, with drivers located on the download page for the " -"ScubaPro SmartTrak software." +"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, with " +"drivers located on the download page for the ScubaPro SmartTrak software." msgstr "" #. type: Plain text -#: user-manual.txt:4293 +#: user-manual.txt:4304 msgid "" "For the Apple Mac, IrDA communication via the MCS7780 link is not available " "for OSX 10.6 or higher." @@ -9745,19 +10165,19 @@ msgstr "" "n'est plus disponible depuis OSX 10.6 ou supérieur." #. type: Title === -#: user-manual.txt:4295 +#: user-manual.txt:4306 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4297 +#: user-manual.txt:4308 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "images/icons/HW_DR5.jpg" #. type: Plain text -#: user-manual.txt:4307 +#: user-manual.txt:4318 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. " @@ -9770,19 +10190,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4310 +#: user-manual.txt:4321 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4312 +#: user-manual.txt:4323 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "images/icons/HW_xdeepblack.jpg" #. type: Plain text -#: user-manual.txt:4321 +#: user-manual.txt:4332 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 " @@ -9796,19 +10216,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4323 +#: user-manual.txt:4334 #, no-wrap msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4325 +#: user-manual.txt:4336 #, no-wrap msgid "images/icons/predator.jpg" msgstr "images/icons/predator.jpg" #. type: Plain text -#: user-manual.txt:4328 +#: user-manual.txt:4339 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled " @@ -9816,19 +10236,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4330 +#: user-manual.txt:4341 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4332 +#: user-manual.txt:4343 #, no-wrap msgid "images/MkVI.jpeg" msgstr "images/MkVI.jpeg" #. type: Plain text -#: user-manual.txt:4340 +#: user-manual.txt:4351 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -9840,45 +10260,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4343 +#: user-manual.txt:4354 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4344 +#: user-manual.txt:4355 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4346 +#: user-manual.txt:4357 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:4348 +#: user-manual.txt:4359 msgid "" "_Subsurface_ accesses the .txt and the .csv files to get dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:4350 +#: user-manual.txt:4361 #, no-wrap msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4352 +#: user-manual.txt:4363 #, no-wrap msgid "images/APDComputer.jpg" msgstr "images/APDComputer.jpg" #. type: Plain text -#: user-manual.txt:4360 +#: user-manual.txt:4371 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -9890,55 +10310,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4362 +#: user-manual.txt:4373 msgid "Download the dive using _AP Communicator_." msgstr "" #. type: Plain text -#: user-manual.txt:4363 +#: user-manual.txt:4374 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:4364 +#: user-manual.txt:4375 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4365 +#: user-manual.txt:4376 msgid "" -"With the raw dive log data show on the screen, click on \"_Copy to " -"Clipboard_\"." +"With the raw dive log data show on the screen, click on \"_Copy to Clipboard_" +"\"." msgstr "" #. type: Plain text -#: user-manual.txt:4366 +#: user-manual.txt:4377 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:4368 +#: user-manual.txt:4379 msgid "" "Copy the contents of the clipboard into the text editor and save the text " "file with a filename extension of _.apd_." msgstr "" #. type: Plain text -#: user-manual.txt:4369 +#: user-manual.txt:4380 msgid "" -"Within _Subsurface_, select _Import -> Import log files_ to open the " -"xref:Unified_import[universal import dialogue]." +"Within _Subsurface_, select _Import -> Import log files_ to open the xref:" +"Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:4370 +#: user-manual.txt:4381 msgid "" "In the dropdown list towards the bottom right of the dialogue (labeled " "'Filter:'), select \"APD log viewer\"." msgstr "" #. type: Plain text -#: user-manual.txt:4374 +#: user-manual.txt:4385 #, no-wrap msgid "" "On the list of file names select the _.apd_ file created. An import\n" @@ -9948,13 +10368,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4375 +#: user-manual.txt:4386 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "images/APD_CSVimportF22.jpg" #. type: Plain text -#: user-manual.txt:4383 +#: user-manual.txt:4394 msgid "" "The top left hand dropdown box in the import panel lets you select the APD " "dive computer for which the dive log needs to be imported. The default it is " @@ -9966,12 +10386,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4384 +#: user-manual.txt:4395 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:4389 +#: user-manual.txt:4400 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer- " "generated ceiling provided by the Inspiration can be viewed by selecting the " @@ -9981,13 +10401,14 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4390 +#: user-manual.txt:4401 #, no-wrap -msgid "APPENDIX C: Exporting Dive log information from external dive log software." +msgid "" +"APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:4399 +#: user-manual.txt:4410 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, " @@ -9997,22 +10418,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4401 +#: user-manual.txt:4412 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:4402 +#: user-manual.txt:4413 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4403 +#: user-manual.txt:4414 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4407 +#: user-manual.txt:4418 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -10020,19 +10441,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4409 +#: user-manual.txt:4420 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4410 +#: user-manual.txt:4421 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "images/icons/suuntologo.jpg" #. type: Plain text -#: user-manual.txt:4417 +#: user-manual.txt:4428 msgid "" "DiveManager is a Windows application for Suunto dive computers. Divemanager " "3 (DM3) is an older version of the Suunto software. More recent Suunto dive " @@ -10042,66 +10463,66 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4419 +#: user-manual.txt:4430 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4421 +#: user-manual.txt:4432 msgid "" "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:4422 +#: user-manual.txt:4433 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4424 +#: user-manual.txt:4435 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:4425 +#: user-manual.txt:4436 msgid "" "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:4426 +#: user-manual.txt:4437 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:4428 +#: user-manual.txt:4439 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:4429 +#: user-manual.txt:4440 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:4430 +#: user-manual.txt:4441 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:4431 +#: user-manual.txt:4442 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:4433 +#: user-manual.txt:4444 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -10109,13 +10530,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4434 +#: user-manual.txt:4445 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:4436 +#: user-manual.txt:4447 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -10123,25 +10544,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4437 +#: user-manual.txt:4448 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:4438 +#: user-manual.txt:4449 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:4440 +#: user-manual.txt:4451 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4445 +#: user-manual.txt:4456 msgid "" "DM4 and DM5 use identical mechanisms for exporting dive logs. To export a " "divelog from Divemanager you need to locate the DM4/DM5 database where the " @@ -10150,103 +10571,102 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4447 +#: user-manual.txt:4458 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:4449 user-manual.txt:4458 +#: user-manual.txt:4460 user-manual.txt:4469 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:4450 +#: user-manual.txt:4461 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:4451 +#: user-manual.txt:4462 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:4452 +#: user-manual.txt:4463 msgid "Open Windows Explorer" msgstr "Ouvrir l'explorateur Windows" #. type: Plain text -#: user-manual.txt:4453 +#: user-manual.txt:4464 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4454 +#: user-manual.txt:4465 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:4456 +#: user-manual.txt:4467 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:4459 +#: user-manual.txt:4470 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:4461 +#: user-manual.txt:4472 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:4462 +#: user-manual.txt:4473 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:4463 +#: user-manual.txt:4474 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:4465 +#: user-manual.txt:4476 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4468 +#: user-manual.txt:4479 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "images/icons/atomiclogo.jpg" #. type: Plain text -#: user-manual.txt:4475 +#: user-manual.txt:4486 msgid "" "Atomic Logbook is Windows software by Atomic Aquatics. It allows downloading " "of dive information from Cobalt and Cobalt 2 dive computers. The divelog is " -"kept in a SQLite database at " -"C:\\ProgramData\\AtomicsAquatics\\Cobalt-Logbook\\Cobalt.db. This file can " -"be directly imported to Subsurface." +"kept in a SQLite database at C:\\ProgramData\\AtomicsAquatics\\Cobalt-Logbook" +"\\Cobalt.db. This file can be directly imported to Subsurface." msgstr "" #. type: Title === -#: user-manual.txt:4477 +#: user-manual.txt:4488 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4480 +#: user-manual.txt:4491 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "images/icons/mareslogo.jpg" #. type: Plain text -#: user-manual.txt:4488 +#: user-manual.txt:4499 msgid "" "Mares Dive Organizer is a Windows application. The dive log is kept as a " "Microsoft SQL Compact Edition database with a '.sdf' filename extension. The " @@ -10257,7 +10677,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4493 +#: user-manual.txt:4504 msgid "" "Within Dive Organizer, select _Database -> Backup_ from the main menu and " "back up the database to the desk top. This creates a zipped file " @@ -10265,36 +10685,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4496 +#: user-manual.txt:4507 msgid "" "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganizer.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4497 +#: user-manual.txt:4508 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4498 +#: user-manual.txt:4509 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4500 +#: user-manual.txt:4511 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4502 +#: user-manual.txt:4513 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "images/icons/divingloglogo.jpg" #. type: Plain text -#: user-manual.txt:4509 +#: user-manual.txt:4520 msgid "" "The best way to bring your logs from DivingLog to Subsurface is to convert " "the whole database. This is because other export formats do not include all " @@ -10304,37 +10724,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4511 +#: user-manual.txt:4522 msgid "To transfer all files from DivingLog to Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:4513 +#: user-manual.txt:4524 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4514 +#: user-manual.txt:4525 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4515 +#: user-manual.txt:4526 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4516 +#: user-manual.txt:4527 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4517 +#: user-manual.txt:4528 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4521 +#: user-manual.txt:4532 msgid "" "Once this is done, open the saved database file with Subsurface and the " "dives are automatically converted to Subsurface’s own format. Last step to " @@ -10342,13 +10762,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4522 +#: user-manual.txt:4533 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "ANNEXE D : Exporter un tableur vers le format CSV" #. type: Plain text -#: user-manual.txt:4532 +#: user-manual.txt:4543 msgid "" "Many divers keep a dive log in some form of digital file, commonly a " "spreadsheet with various fields of information. These logs can be easily " @@ -10368,7 +10788,7 @@ msgstr "" "tableur utilisé." #. type: Plain text -#: user-manual.txt:4538 +#: user-manual.txt:4549 msgid "" "Organize the diving data in the spreadsheet, so the first row contains the " "names (or titles) of each column and the information for each dive is stored " @@ -10384,19 +10804,19 @@ msgstr "" "plongées selon quelques règles simples :" #. type: Plain text -#: user-manual.txt:4540 +#: user-manual.txt:4551 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:4541 +#: user-manual.txt:4552 msgid "Duration: the format should be minutes:seconds." msgstr "Durée : le format est minutes:secondes." #. type: Plain text -#: user-manual.txt:4542 +#: user-manual.txt:4553 msgid "" "Unit system: only one unit system should be used (no mix of imperial and " "metric units)" @@ -10405,25 +10825,25 @@ msgstr "" "entre les unités impériales et métriques)" #. type: Plain text -#: user-manual.txt:4543 +#: user-manual.txt:4554 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:4544 +#: user-manual.txt:4555 msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798" msgstr "" "Position GPS : utilisez les degrés décimaux, par exemple : 30.22496 30.821798" #. type: Title === -#: user-manual.txt:4544 +#: user-manual.txt:4555 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "_LibreOffice Calc_ et _OpenOffice Calc_" #. type: Plain text -#: user-manual.txt:4548 +#: user-manual.txt:4559 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -10434,13 +10854,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4549 +#: user-manual.txt:4560 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "images/LOffice_spreadsheetdata.jpg" #. type: Plain text -#: user-manual.txt:4552 +#: user-manual.txt:4563 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 " @@ -10448,13 +10868,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4553 +#: user-manual.txt:4564 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "images/LOffice_save_as_options.jpg" #. type: Plain text -#: user-manual.txt:4556 +#: user-manual.txt:4567 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -10462,13 +10882,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4557 +#: user-manual.txt:4568 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "images/LOffice_field_options.jpg" #. type: Plain text -#: user-manual.txt:4560 +#: user-manual.txt:4571 msgid "" "Double check the .CSV file by opening it with a text editor, and then import " "the dive data as explained on the section xref:S_ImportingCSVDives[Importing " @@ -10476,13 +10896,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4561 +#: user-manual.txt:4572 #, no-wrap msgid "Microsoft _Excel_" msgstr "Microsoft _Excel_" #. type: Plain text -#: user-manual.txt:4567 +#: user-manual.txt:4578 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -10493,67 +10913,67 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4569 +#: user-manual.txt:4580 msgid "" "In Microsoft Windows, click the *Start* button, then select _Control Panel_ " "from the list on the right-hand side." msgstr "" #. type: Plain text -#: user-manual.txt:4570 +#: user-manual.txt:4581 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4572 +#: user-manual.txt:4583 msgid "" "Do the following: ** In Windows 7, click the _Formats_ tab, and then click " "_Customize this format_." msgstr "" #. type: Plain text -#: user-manual.txt:4573 +#: user-manual.txt:4584 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:4574 +#: user-manual.txt:4585 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4576 +#: user-manual.txt:4587 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4577 +#: user-manual.txt:4588 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "images/Win_SaveCSV2.jpg" #. type: Plain text -#: user-manual.txt:4580 +#: user-manual.txt:4591 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4582 +#: user-manual.txt:4593 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:4583 +#: user-manual.txt:4594 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "images/Win_SaveCSV1.jpg" #. type: Plain text -#: user-manual.txt:4589 +#: user-manual.txt:4600 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 " @@ -10563,28 +10983,28 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4590 +#: user-manual.txt:4601 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "images/Win_SaveCSV3.jpg" #. type: Plain text -#: user-manual.txt:4596 +#: user-manual.txt:4607 msgid "" "Select the _Save_ button. The CSV-formatted file is saved into the folder " "that was selected. You can double check the .CSV file by opening it with a " -"text editor, then import the dive data as explained on the section " -"xref:S_ImportingCSVDives[Importing CSV dives]." +"text editor, then import the dive data as explained on the section xref:" +"S_ImportingCSVDives[Importing CSV dives]." msgstr "" #. type: Title == -#: user-manual.txt:4597 +#: user-manual.txt:4608 #, no-wrap msgid "APPENDIX E: Writing a custom print template" msgstr "ANNEXE E : Créer un modèle d'impression personnalisé" #. type: Plain text -#: user-manual.txt:4602 +#: user-manual.txt:4613 msgid "" "_Subsurface_ has a way to create or modify templates for printing dive logs " "to produce customized printouts of them. Templates written in HTML, as well " @@ -10593,12 +11013,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4604 +#: user-manual.txt:4615 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4612 +#: user-manual.txt:4623 msgid "" "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, " "_Import_ and _Export_ templates (see image *A* above). New or modified " @@ -10610,18 +11030,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4614 +#: user-manual.txt:4625 msgid "The Edit Panel has three tabs:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4615 +#: user-manual.txt:4626 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "images/Template1_f22.jpg" #. type: Plain text -#: user-manual.txt:4619 +#: user-manual.txt:4630 msgid "" "The _Style_ tab (image *A* above) controls the font, line spacing and color " "template used for printing the dive log. The style attributes are editable. " @@ -10629,7 +11049,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4623 +#: user-manual.txt:4634 msgid "" "The _Colors_ tab (image *B* above) allows editing the colors used for " "printing the dive log. The colors are highly customizable: the _Edit_ " @@ -10638,7 +11058,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4632 +#: user-manual.txt:4643 msgid "" "The _Template_ tab of the Edit Panel (see image below) allows creating a " "template using HTML as well as a few Grantlee programming primitives. " @@ -10654,13 +11074,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4633 +#: user-manual.txt:4644 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "images/Template2_f22.jpg" #. type: Plain text -#: user-manual.txt:4638 +#: user-manual.txt:4649 msgid "" "You can adapt any of the existing templates and save it to the dive log " "directory. The standard templates (e.g. One dive, Six dives, Table) can be " @@ -10669,33 +11089,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4640 +#: user-manual.txt:4651 msgid "" "To write a custom template, the following elements must exist so the " "template will be correctly handled and rendered." msgstr "" #. type: Title === -#: user-manual.txt:4641 +#: user-manual.txt:4652 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4643 +#: user-manual.txt:4654 msgid "" "_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ back " "end. It is possible to iterate over the list as follows:" msgstr "" #. type: Block title -#: user-manual.txt:4643 user-manual.txt:4708 user-manual.txt:4725 +#: user-manual.txt:4654 user-manual.txt:4719 user-manual.txt:4736 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4648 +#: user-manual.txt:4659 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -10704,13 +11124,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4650 user-manual.txt:4713 user-manual.txt:4732 +#: user-manual.txt:4661 user-manual.txt:4724 user-manual.txt:4743 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4655 +#: user-manual.txt:4666 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -10719,25 +11139,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4658 +#: user-manual.txt:4669 msgid "" -"Additional information about _Grantlee_ can be found " -"http://www.grantlee.org/apidox/for_themers.html[here]" +"Additional information about _Grantlee_ can be found http://www.grantlee.org/" +"apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:4659 +#: user-manual.txt:4670 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:4661 +#: user-manual.txt:4672 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:4690 +#: user-manual.txt:4701 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -10771,7 +11191,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4694 +#: user-manual.txt:4705 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -10779,14 +11199,16 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4706 +#: user-manual.txt:4717 #, no-wrap msgid "" "|*Name*|*Description*\n" "|font| (*string*) font family\n" -"|borderwidth| (*int*) border-width value dynamically calculated as 0.1% of the page width with minimum value of 1px\n" +"|borderwidth| (*int*) border-width value dynamically calculated as 0.1% of" +" the page width with minimum value of 1px\n" "|font_size| (*double*) size of fonts in vw, ranges between 1.0 and 2.0\n" -"|line_spacing| (*double*) distance between text lines, ranges between 1.0 and 3.0\n" +"|line_spacing| (*double*) distance between text lines, ranges between 1.0 and" +" 3.0\n" "|color1| (*string*) background color\n" "|color2| (*string*) primary table cell color\n" "|color3| (*string*) secondary table cell color\n" @@ -10796,34 +11218,35 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4711 +#: user-manual.txt:4722 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4716 +#: user-manual.txt:4727 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:4719 +#: user-manual.txt:4730 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:4722 +#: user-manual.txt:4733 #, no-wrap msgid "" "|*Name*|*Description*\n" -"|grayscale | Use _CSS_ filters to convert the page into grayscale (should be added to body style to enable printing grayscale prints)\n" +"|grayscale | Use _CSS_ filters to convert the page into grayscale (should be" +" added to body style to enable printing grayscale prints)\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4730 +#: user-manual.txt:4741 #, no-wrap msgid "" "\tbody {\n" @@ -10832,7 +11255,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4737 +#: user-manual.txt:4748 #, no-wrap msgid "" "\tbody {\n" @@ -10841,13 +11264,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4739 +#: user-manual.txt:4750 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:4742 +#: user-manual.txt:4753 msgid "" "As the dive profile is placed after rendering, _Subsurface_ uses special " "_CSS_ selectors to search in the HTML output. The _CSS_ selectors in the " @@ -10855,31 +11278,33 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4749 +#: user-manual.txt:4760 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" "|dive_{{ dive.id }} | id | is used to fetch the relevant dive profile\n" -"|diveProfile | class | each dive that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector\n" -"|dontbreak | class | prevents the dive with this class from being divided into two pages. This can be used\n" +"|diveProfile | class | each dive that will contain a dive profile should have" +" this class selector in addition to the dive_{{ dive.id }} id selector\n" +"|dontbreak | class | prevents the dive with this class from being divided" +" into two pages. This can be used\n" "in flow layout templates only (when data-numberofdives = 0)\n" msgstr "" #. type: Plain text -#: user-manual.txt:4752 +#: user-manual.txt:4763 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:4753 +#: user-manual.txt:4764 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:4757 +#: user-manual.txt:4768 msgid "" "There are two ways of rendering- either rendering a specific number of dives " "in each page or make _Subsurface_ try to fit as many dives as possible into " @@ -10887,36 +11312,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4759 +#: user-manual.txt:4770 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode." msgstr "" #. type: Plain text -#: user-manual.txt:4761 +#: user-manual.txt:4772 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:4764 +#: user-manual.txt:4775 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4767 +#: user-manual.txt:4778 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:4770 +#: user-manual.txt:4781 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4773 +#: user-manual.txt:4784 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." @@ -10924,19 +11349,19 @@ msgstr "" # ANNEXE F: FAQs. #. type: Title == -#: user-manual.txt:4774 +#: user-manual.txt:4785 #, no-wrap msgid "APPENDIX F: FAQs." msgstr "ANNEXE F: FAQs." #. type: Title === -#: user-manual.txt:4776 +#: user-manual.txt:4787 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:4780 +#: user-manual.txt:4791 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_ " @@ -10944,7 +11369,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4786 +#: user-manual.txt:4797 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -10954,7 +11379,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4792 +#: user-manual.txt:4803 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 " @@ -10964,12 +11389,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4794 +#: user-manual.txt:4805 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:4800 +#: user-manual.txt:4811 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 " @@ -10980,12 +11405,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4802 +#: user-manual.txt:4813 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:4807 +#: user-manual.txt:4818 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 " @@ -10995,7 +11420,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4813 +#: user-manual.txt:4824 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 " @@ -11006,13 +11431,15 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4814 +#: user-manual.txt:4825 #, no-wrap -msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..." +msgid "" +"Some dive profiles have time discrepancies with the recorded samples from my" +" dive computer..." msgstr "" #. type: Plain text -#: user-manual.txt:4818 +#: user-manual.txt:4829 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -11020,7 +11447,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4826 +#: user-manual.txt:4837 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 " @@ -11034,13 +11461,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4827 +#: user-manual.txt:4838 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:4841 +#: user-manual.txt:4852 msgid "" "'Question': I cannot download all my dives, only the most recent ones, even " "though my dive computer's manual states that it records history of e.g. 999 " @@ -11055,7 +11482,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4845 +#: user-manual.txt:4856 msgid "" "If you have downloaded your dives to different dive logging software before " "they were overwritten, there is a good chance that Subsurface can import " @@ -11084,13 +11511,13 @@ msgstr "" #~ msgstr "images/LoadImage1_f20.jpg" #~ msgid "" -#~ " ** " -#~ "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient " -#~ "factors for dummies, by Kevin Watts]\n" +#~ " ** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-" +#~ "articles/5037-gradient-factors-for-dummies.html[Gradient factors for " +#~ "dummies, by Kevin Watts]\n" #~ msgstr "" -#~ " ** " -#~ "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient " -#~ "factors for dummies, by Kevin Watts]\n" +#~ " ** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-" +#~ "articles/5037-gradient-factors-for-dummies.html[Gradient factors for " +#~ "dummies, by Kevin Watts]\n" #~ msgid "Facebook Access" #~ msgstr "Accès Facebook" @@ -11109,8 +11536,8 @@ msgstr "" #~ "If you provide a valid Facebook userID and password, a connection to " #~ "Facebook is created. That connection is closed when one closing down " #~ "Subsurface. Currently the checkbox labelled \"Keep me logged in to " -#~ "Subsurface\", on the login screen has no effect. See the section " -#~ "xref:S_facebook[Exporting dive profiles to Facebook] for more information." +#~ "Subsurface\", on the login screen has no effect. See the section xref:" +#~ "S_facebook[Exporting dive profiles to Facebook] for more information." #~ msgstr "" #~ "Si un identifiant Facebook et un mot de passe valides ont été fournis, " #~ "une connexion vers Facebook est créée. Cette connexion est fermée lorsque " @@ -11150,8 +11577,8 @@ msgstr "" #~ "image::images/ContextMenu.jpg[\"Figure: Context Menu\",align=\"center\"] " #~ "# NEEDS REPLACEMENT" #~ msgstr "" -#~ "image::images/ContextMenu.jpg[\"Figure : Menu " -#~ "contextuel\",align=\"center\"] # NEEDS REPLACEMENT" +#~ "image::images/ContextMenu.jpg[\"Figure : Menu contextuel\",align=\"center" +#~ "\"] # NEEDS REPLACEMENT" #~ msgid "images/AddDive2_f20.jpg" #~ msgstr "images/AddDive2_f20.jpg" diff --git a/Documentation/mobile-manual_fr.html.git b/Documentation/mobile-manual_fr.html.git index 222f1a42d..9805f58f8 100644 --- a/Documentation/mobile-manual_fr.html.git +++ b/Documentation/mobile-manual_fr.html.git @@ -408,12 +408,12 @@ asciidoc.install(3); </div> </div> <div class="paragraph"><p><span class="big">MANUEL UTILISATEUR de Subsurface-mobile</span></p></div> -<div class="paragraph"><p><strong>Auteur du manuel</strong> : Willem Ferguson</p></div> +<div class="paragraph"><p><strong>Auteurs du manuel</strong> : Willem Ferguson, Dirk Hohndel</p></div> <div id="toc"> <div id="toctitle">Table of Contents</div> <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript> </div> -<div class="paragraph"><p><span class="blue"><em>Version 1.1, Septembre 2016</em></span></p></div> +<div class="paragraph"><p><span class="blue"><em>Version 2, juillet 2017</em></span></p></div> <div class="paragraph"><p>Welcome as a user of <em>Subsurface</em>, advanced dive logging software with extensive infrastructure to describe, organize, interpret and print scuba and free dives. <em>Subsurface</em> offers many advantages over other similar @@ -425,22 +425,22 @@ computers.</p></div> <h2 id="_présentation_de_subsurface_mobile">1. Présentation de Subsurface-mobile</h2> <div class="sectionbody"> <div class="paragraph"><p><em>Subsurface-mobile</em> est une extension de <em>Subsurface</em> qui fonctionne sur les -smartphones et les tablettes Android et c’est un outil pour visualiser et -partager des informations de plongées sur des sites de plongées où un -ordinateur n’est pas utile. <em>Subsurface-mobile</em> permet également de -collecter des positions GPS où sont effectuées les -plongées. (Subsurface-mobile pour iOS ne supporte pas les fonctions GPS pour -le moment).</p></div> +smartphones Android et iOS et sur les tablettes. C’est un outil pour +visualiser et partager des informations de plongées sur des sites de +plongées où un ordinateur n’est pas utile. <em>Subsurface-mobile</em> permet +également de collecter des positions GPS où sont effectuées les +plongées. (Subsurface-mobile pour iOS ne supporte pas toutes les fonctions +pour le moment).</p></div> <div class="paragraph"><p><em>Subsurface-mobile</em> allows you to enter and save dive information using a -mobile device. Most users of <em>Subsurface-mobile</em> typically use the mobile -app as an extension to the laptop/desktop version of <em>Subsurface</em>. This -allows the storage of dive logs on the Internet sharing them between the -mobile and the desktop versions. But <em>Subsurface-mobile</em> can be used -independently of <em>Subsurface</em> and does not require the use of cloud -storage. While the desktop version of <em>Subsurface</em> shows much more detailed -information for each dive, the mobile version allows a more accessible dive -log on a dive trip, useful for proving dive experience to dive shops or to -review previous dives.</p></div> +mobile device. Users of <em>Subsurface-mobile</em> typically use the mobile app as +an extension to the laptop/desktop version of <em>Subsurface</em> that allows the +storage of dive logs on the Internet and sharing them between the mobile and +the desktop versions. But <em>Subsurface-mobile</em> can also be used independently +of <em>Subsurface</em> and does not require the use of cloud storage. While the +desktop version of <em>Subsurface</em> shows much more detailed information for +each dive, the mobile version allows a more accessible dive log on a dive +trip, useful for proving dive experience to dive shops or to review previous +dives.</p></div> <div class="paragraph"><p><em>Subsurface-mobile</em> allows you to:</p></div> <div class="ulist"><ul> <li> @@ -466,6 +466,11 @@ Manually create and add new dive records to your dive log. </li> <li> <p> +Download dive data directly from many dive computers. +</p> +</li> +<li> +<p> Store the updated dive log in the <em>Subsurface</em> cloud storage. </p> </li> @@ -480,12 +485,12 @@ View the localities of recorded GPS positions and of dives on a map. </p> </li> </ul></div> -<div class="paragraph"><p>These items are discussed in greater detail in the following text. What -<em>Subsurface-mobile</em> does not support (at this time) is downloading dive data -directly from a dive computer. That still needs to be done using -<em>Subsurface</em> on a desktop or laptop computer. We are investigating ways to -support downloading from a subset of the supported dive computers on Android -devices, but this is not yet ready for testing.</p></div> +<div class="paragraph"><p>These items are discussed in greater detail in the following text. +<em>Subsurface-mobile</em> does not yet support download of dive data from all the +dive computers that the desktop/laptop version can: that still needs to be +done using <em>Subsurface</em> on a desktop or laptop computer. Only a subset of +dive computers that use a FTDI USB interface or a Bluetooth/BTLE interface +are accessible by <em>Subsurface-mobile</em>.</p></div> </div> </div> <div class="sect1"> @@ -503,19 +508,19 @@ screen is shown while the program loads. On some devices this may take several seconds. After loading, the <em>Cloud Credentials screen</em> appears (see image below on left).</p></div> <div class="paragraph"><p>Select whether <em>Subsurface-mobile</em> should access the Internet for dive log -information.</p></div> +information as follows:</p></div> <div class="sect2"> <h3 id="_when_not_using_cloud_storage">3.1. When NOT Using Cloud Storage</h3> <div class="paragraph"><p>Tap the striked-out cloud icon. The app will not access the <em>Subsurface</em> cloud storage server to obtain dive log information. This means that dive -log information is manually entered and stored on the mobile device only.</p></div> +log information is stored on the mobile device only.</p></div> </div> <div class="sect2"> <h3 id="_using_cloud_storage">3.2. Using Cloud Storage</h3> <div class="paragraph"><p>In order to use the <em>Subsurface</em> cloud storage, an account on the cloud server is required. If you have already set up an account from the <em>Subsurface</em> desktop application, enter the credentials here.</p></div> -<div class="paragraph"><p>You can also create a new account from your mobile device.</p></div> +<div class="paragraph"><p>You can also create a new cloud storage account from your mobile device.</p></div> <div class="sect3"> <h4 id="_using_the_desktop_version_of_em_subsurface_em">3.2.1. Using the desktop version of <em>Subsurface</em>:</h4> <div class="paragraph"><p>Open the desktop version of <em>Subsurface</em> and @@ -555,15 +560,15 @@ e-mail address provided.</p></div> <div class="paragraph"><p>Enter the PIN into the field indicated and tap the <em>Save</em> icon again. The user information is stored on the cloud server and access to the cloud is enabled.</p></div> -<div class="paragraph"><p>The dive list is initially empty. You can now start entering dives in the -dive log or you can download existing dives from your <em>Subsurface</em> cloud -storage account.</p></div> +<div class="paragraph"><p>The dive list is initially empty. Start entering dives in the dive log or +download dive information from either a <em>Subsurface</em> cloud storage account +or from a dive computer.</p></div> </div> </div> </div> </div> <div class="sect1"> -<h2 id="_a_few_remarks_about_the_user_interface">4. A Few Remarks About The User Interface</h2> +<h2 id="_menu_structure_and_user_interface">4. Menu Structure and User Interface</h2> <div class="sectionbody"> <div class="paragraph"><p>At the bottom of many Subsurface-mobile screens is a round button that provides for several actions and which allows the selection of the main @@ -605,14 +610,14 @@ Drag the action button visible on most screens to the right </ul></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="mobile-images/menu.jpg" alt="FIGURE: Dive management subpanel" /> +<img src="mobile-images/MainMenu2.jpg" alt="FIGURE: Dive management subpanel" /> </div> </div> <div class="paragraph"><p>The images above indicate some of the important features of the menu -system. On the left is the main menu that is activated as described -above. In the middle is the menu that opens if you tap the <em>GPS</em> option on -the main menu. On the right is the menu that opens if you tap the <em>Manage -Dives</em> option on the main menu.</p></div> +system. On the left is the main menu, activated as described above. On the +right, above, is a representation of the menu items of all the submenus +accessible from the main menu: the main menu items are shown on the left +while the submenu contents are shown on a blue background on the right.</p></div> <div class="paragraph"><p>All screenshots in this user manual are currently from the Android version. As indicated earlier, the iOS version currently doesn’t support <em>GPS</em> features.</p></div> @@ -623,11 +628,11 @@ version. As indicated earlier, the iOS version currently doesn’t support <div class="sectionbody"> <div class="paragraph"><p>Most of the actions of <em>Subsurface-mobile</em> center around the dives on the dive list. While the dive list is loading from the cloud, a message appears -at the bottom of the screen, indicating that the cloud is being accessed -(see image on left, below). Once the list is loaded you can scroll up and -down. Tapping a dive on the list brings up a display of <em>Details View</em> for -that dive (see image on right below). This includes the dive profile as -well as additional information and notes.</p></div> +at the bottom of the screen, indicating that the cloud is being +accessed. Once the list is loaded you can scroll up and down. Tapping a +dive on the list brings up a display of <em>Details View</em> for that dive (see +image on right below). This includes the dive profile as well as additional +information and notes.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="mobile-images/DiveList.jpg" alt="FIGURE: Dive list screen" /> @@ -641,7 +646,7 @@ Maps web site on iOS; tap the GPS icon on the Action Bar.).</p></div> </div> </div> <div class="sect1"> -<h2 id="_editing_dive_details">6. Editing dive details</h2> +<h2 id="S_Edit_Dive">6. Editing dive details</h2> <div class="sectionbody"> <div class="paragraph"><p>At the bottom of the dive details screen the <em>Action Button</em> contains a pencil (image on right, above). Tapping the pencil button brings up a panel @@ -660,7 +665,7 @@ the Android Back Button or swipe the edit screen up (fling it away).</p></div> </div> </div> <div class="sect1"> -<h2 id="_adding_a_new_dive_to_the_dive_list">7. Adding a new dive to the dive list</h2> +<h2 id="S_Add_Dive">7. Adding a new dive to the dive list</h2> <div class="sectionbody"> <div class="paragraph"><p>You can manually add a dive to the existing dive list. On the dive list tap the "plus" sign in the <em>Action Button</em>, or use the main menu and tap <em>Manage @@ -706,30 +711,103 @@ to delete the dive.</p></div> </div> </div> <div class="sect1"> -<h2 id="_dive_log_management">9. Dive log management</h2> +<h2 id="_download_dives_from_a_dive_computer">9. Download dives from a dive computer</h2> +<div class="sectionbody"> +<div class="paragraph"><p>Download of dives is possible from dive computers with a FTDI USB interface, +or with a Bluetooth interface.</p></div> +<div class="paragraph"><p>First, establish a link between the dive computer and the mobile device.</p></div> +<div class="paragraph"><p>For USB dive computers, USB cables "normally" used for uploading dives to a +desktop/laptop computer do NOT work: these cables often have a full-sized +male USB plug on one end which plugs into the USB port of a desktop/laptop +computer. For downloads to a mobile device one needs a USB OTG (USB +On-The-Go) cable. In most cases it is required to plug the USB cable +"normally" used with the dive computer into a USB OTG cable which, in turn, +plugs into the mini-USB receptacle of the mobile device. The OTG cable often +has a full-size female receptacle at one end which accommodates the +full-sized male plug of the USB cable "normally" used (see image +below). This means that two cables are used to connect the dive computer to +the mobile device.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="mobile-images/USB-OTG.jpg" alt="FIGURE: USB-OTG cable" /> +</div> +</div> +<div class="paragraph"><p>For Bluetooth-equipped dive computers, establish a Bluetooth connection +between the dive computer and the mobile device. Use the tools on the mobile +device to achieve this. For of Android mobile devices, the Settings → +Bluetooth tool is probably appropriate. Ensure pairing of the dive computer +and mobile device. <em>Subsurface-mobile</em> performs communication using both +Bluetooth and Bluetooth-low-energy (BTLE). The appropriate choice of +Bluetooth communication is made by the software and the user need not be +concerned with this.</p></div> +<div class="paragraph"><p>With propper communication between dive computer and <em>Subsurface-mobile</em> +having been set up, dive download is simple. From the main menu, tap +<em>Manage dives → Download from DC</em>. A screen is shown requiring that the +user specify the names of the vendor and model of the dive computer. For +instance, when using a Shearwater Petrel 2 dive computer, the vendor is +<em>Shearwater</em> and the Dive computer name is <em>Petrel 2</em>. From the two dropdown +lists at the top of the screen, select the correct vendor and dive computer +names (see image on the left, below). If using a dive computer using a +Bluetooth connection, then tap the check box labelled <em>Bluetooth download</em>.</p></div> +<div class="paragraph"><p>Now tap the button labled <em>DOWNLOAD</em>. The downloaded dives appear in the +bottom part of the screen, the most recent dive at the top (see image on +right, below). Be patient because the download can sometimes take a few +mimnutes. Each dive has a check-box on the left hand side, used for +selecting which dives need to be added to the <em>Subsurface-mobile</em> dive list: +dives that are not checked are ignored. With the appropriate downloaded +dives having been checked, tap the button at the bottom left labled +<em>ACCEPT</em>. All the selected dives appear on the <em>Subsurface-mobile</em> dive +list. The downloaded dive information can now be edited as described in the +section above <a href="#S_Edit_Dive">Edit a dive</a>.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="mobile-images/DC-Download.jpg" alt="FIGURE: DC download screen" /> +</div> +</div> +</div> +</div> +<div class="sect1"> +<h2 id="_viewing_the_dive_location_on_google_maps">10. Viewing the dive location on Google Maps</h2> +<div class="sectionbody"> +<div class="paragraph"><p>The site of a specific dive can be viewed in two ways using the <em>Details +View</em>. The Action Bar at the bottom has a GPS pin on the left hand +side. Tap that pin and the dive site is shown in Google Maps. Close Google +Maps by using the Android <em>Back</em> button.</p></div> +<div class="paragraph"><p>Alternatively, the <em>Details View</em> has a button at the top right hand marked +<em>Map it</em>. Tap this button to open Google Maps showing the dive site.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="mobile-images/Map.jpg" alt="FIGURE: Map of dive site" /> +</div> +</div> +</div> +</div> +<div class="sect1"> +<h2 id="_dive_log_management">11. Dive log management</h2> <div class="sectionbody"> <div class="paragraph"><p>A central part of <em>Subsurface-mobile</em> is the ability to store the dive log using the <em>Subsurface</em> cloud storage. This provides security against loss or damage to the dive information contained in a local copy of the dive log and allows the desktop version of <em>Subsurface</em> to access changes made using the mobile device. This ability is accessed through the main menu (by -dragging the Action Button to the right, or alternatively tappping the +dragging the Action Button to the right, or alternatively tapping the "Hamburger" icon at the bottom left of the screen). Tap the option <em>Manage dives</em>, enabling a number of options:</p></div> <div class="sect2"> -<h3 id="_add_new_dive_manually">9.1. Add new dive manually</h3> -<div class="paragraph"><p>This is described above under the section dealing with the dive list.</p></div> +<h3 id="_add_new_dive_manually">11.1. Add new dive manually</h3> +<div class="paragraph"><p>This is described above under the section dealing with +<a href="#S_Add_Dive">Adding a new dive to the dive list</a>.</p></div> </div> <div class="sect2"> -<h3 id="_sync_the_dive_log_with_the_em_subsurface_em_cloud_storage">9.2. Sync the dive log with the <em>Subsurface</em> cloud storage</h3> -<div class="paragraph"><p>You can upload the dives contained on the mobile device to the <em>Subsurface</em> -cloud storage by tapping the option <em>Manual sync with coud</em>. This -synchronizes the local changes to the dive log with the cloud storage. It -also downloads changes made on another device or computer and stored in +<h3 id="_sync_the_dive_log_with_the_em_subsurface_em_cloud_storage">11.2. Sync the dive log with the <em>Subsurface</em> cloud storage</h3> +<div class="paragraph"><p>Upload the dives contained on the mobile device to the <em>Subsurface</em> cloud +storage by tapping the option <em>Manual sync with cloud</em>. This synchronizes +the local changes to the dive log with the cloud storage. It also downloads +changes made to the dive log using another device or computer and stored in cloud storage.</p></div> </div> <div class="sect2"> -<h3 id="_working_offline_or_online">9.3. Working offline or online</h3> +<h3 id="_working_offline_or_online">11.3. Working offline or online</h3> <div class="paragraph"><p>By default <em>Subsurface-mobile</em> runs offline and only syncs the dive list with cloud storage when explicily told to do so (see above). You can choose to always sync with the cloud servers after every modification of the dive @@ -738,15 +816,28 @@ reliable internet connection, as otherwise <em>Subsurface-mobile</em> might appe to hang between operations as it tries to connect to the cloud server.</p></div> </div> <div class="sect2"> -<h3 id="_changing_the_login_credentials_on_the_em_subsurface_em_cloud">9.4. Changing the login credentials on the <em>Subsurface</em> cloud</h3> -<div class="paragraph"><p>If you need to change your login credentials (for example to work with -multiple accounts) you can open the main menu and tap <em>Cloud -credentials</em>. This opens the setup screen for specifying new credentials.</p></div> +<h3 id="_changing_the_login_credentials_on_the_em_subsurface_em_cloud">11.4. Changing the login credentials on the <em>Subsurface</em> cloud</h3> +<div class="paragraph"><p>The login credentials (for example to work with multiple accounts) can be +changed by opening the main menu and by tapping <em>Settings → Cloud +credentials</em>. This opens the screen for specifying new credentials.</p></div> +</div> +<div class="sect2"> +<h3 id="_changing_the_colour_scheme_of_em_subsurface_mobile_em">11.5. Changing the colour scheme of <em>Subsurface-mobile</em></h3> +<div class="paragraph"><p><em>Subsurface-mobile</em> has three colour schemes to please users with different +tastes. This user manual shows the default colour scheme, comprising blue +colours. Change to a pink or a dark colour scheme by opening the main menu +and tap Settings → Preferences. This opens the Preferences screen that +includes the three colour schemes (see image below).</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="mobile-images/ColourSchemes.jpg" alt="FIGURE: Colour scheme setup screen" /> +</div> +</div> </div> </div> </div> <div class="sect1"> -<h2 id="_recording_dive_locations_using_gps_android_only">10. Recording dive locations using GPS (Android only).</h2> +<h2 id="_recording_dive_locations_using_gps_android_only">12. Recording dive locations using GPS (Android only).</h2> <div class="sectionbody"> <div class="paragraph"><p>The fact that most smartphones have GPS facilities allows <em>Subsurface-mobile</em> on Android to record the locations of dives. You can @@ -754,55 +845,53 @@ take the smartphone on the dive boat during a dive and locations will be automatically recorded at regular intervals. These locations can then be applied to dives in the dive list. Here is how it’s done:</p></div> <div class="sect2"> -<h3 id="_setting_up_the_gps">10.1. Setting up the GPS</h3> +<h3 id="_setting_up_the_gps">12.1. Setting up the GPS</h3> <div class="paragraph"><p>Open the main menu and tap <em>GPS → Preferences</em>. Now specify the way in -which GPS data need to be automatically collected (image on right, -below). You can specify that data are collected at regular intervals, e.g. -every 10 minutes, or at regular distances, e.g. after the boat has moved -more than 200m, or a combination of both of the above approaches. Provide -the appropriate information and tap the <em>Save</em> action button. The program is -now ready to collect GPS positions.</p></div> +which GPS data need to be automatically collected (image above). Data are +collected at regular intervals, e.g. every 5 minutes, or at regular +distances, e.g. after the boat has moved more than 200m, or a combination of +both of these approaches. Provide the appropriate information and tap the +<em>Save</em> action button. The program is now ready to collect GPS positions.</p></div> +</div> +<div class="sect2"> +<h3 id="_collecting_gps_positions">12.2. Collecting GPS positions</h3> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="mobile-images/gpssetup.jpg" alt="FIGURE: GPS setup screen" /> +<img src="mobile-images/Mainmenu.jpg" alt="FIGURE: Main menu" /> </div> </div> -</div> -<div class="sect2"> -<h3 id="_collecting_gps_positions">10.2. Collecting GPS positions</h3> <div class="paragraph"><p>Ensure that the GPS on the Android device has been activated. At the bottom -of the GPS submenu is a check box <em>Run location service</em> (image on left, -above). Check this box and <em>Subsurface-mobile</em> starts to collect GPS -locations automatically, following the preferences specified as described -above. After return from the dive trip you can deactivate the collection of -GPS data by de-activating the same check box at the bottom of the main menu.</p></div> +of the GPS submenu is a check box <em>Run location service</em> (image above). +Check this box and <em>Subsurface-mobile</em> starts to collect GPS locations +automatically, following the preferences specified as described above. After +return from the dive trip you can deactivate the collection of GPS data by +de-activating the same check box at the bottom of the main menu.</p></div> </div> <div class="sect2"> -<h3 id="_storing_the_gps_data_on_the_em_subsurface_em_cloud">10.3. Storing the GPS data on the <em>Subsurface</em> cloud</h3> +<h3 id="_storing_the_gps_data_on_the_em_subsurface_em_cloud">12.3. Storing the GPS data on the <em>Subsurface</em> cloud</h3> <div class="paragraph"><p>Activate the main menu and select the <em>GPS</em> option that brings up the -submenu of GPS-related actions (image on left, above). Tap <em>Upload GPS data</em> -that saves the GPS data on the <em>Subsurface</em> cloud server. These GPS data are -saved <strong>separately</strong> from the other dive log data. All collected GPS data are -kept on the Android device, independent of whether they have been uploaded -or not.</p></div> +submenu of GPS-related actions. Tap <em>Upload GPS data</em> that saves the GPS +data on the <em>Subsurface</em> cloud server. These GPS data are saved <strong>separately</strong> +from the other dive log data. All collected GPS data are kept on the Android +device, independent of whether they have been uploaded or not.</p></div> </div> <div class="sect2"> -<h3 id="_downloading_gps_data_from_the_em_subsurface_em_cloud">10.4. Downloading GPS data from the <em>Subsurface</em> cloud</h3> +<h3 id="_downloading_gps_data_from_the_em_subsurface_em_cloud">12.4. Downloading GPS data from the <em>Subsurface</em> cloud</h3> <div class="paragraph"><p>Download the GPS data that have been saved on the cloud (possibly by a different device) by selecting <em>Download GPS Data</em> from the GPS subpanel.</p></div> </div> <div class="sect2"> -<h3 id="_viewing_gps_data">10.5. Viewing GPS data</h3> -<div class="paragraph"><p>From the GPS submenu (image on left, above) select <em>Show GPS fixes</em>. This -brings up a list of GPS positions obtained using the location service (image -on left, below). Two actions are possible for each of the locations, enabled -if you tap the handle (the three horisontal stripes on the right, see image -on left, below) and then drags the specific item to the left (image on -right, below). This exposes two options. Tapping the dustbin deletes this -particular GPS location. Tapping the teardrop-shaped icon (actually a Google -Maps pin) opens up Google Maps with a pin indicating the exact map position -of the GPS record being viewed. The two above options can be hidden by -drawing the GPS record to the right, again using the handle.</p></div> +<h3 id="_viewing_gps_data">12.5. Viewing GPS data</h3> +<div class="paragraph"><p>From the GPS submenu select <em>Show GPS fixes</em>. This brings up a list of GPS +positions obtained using the location service (image on left, below). Two +actions are possible for each of the locations, enabled if you tap the +handle (the three horisontal stripes on the right, see image on left, below) +and then drags the specific item to the left (image on right, below). This +exposes two options. Tapping the dustbin deletes this particular GPS +location. Tapping the teardrop-shaped icon (actually a Google Maps pin) +opens up Google Maps with a pin indicating the exact map position of the GPS +record being viewed. The two above options can be hidden by drawing the GPS +record to the right, again using the handle.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="mobile-images/gpsmanagement.jpg" alt="FIGURE: GPS management" /> @@ -810,7 +899,7 @@ drawing the GPS record to the right, again using the handle.</p></div> </div> </div> <div class="sect2"> -<h3 id="_applying_gps_data_to_dives_in_the_dive_log">10.6. Applying GPS data to dives in the dive log</h3> +<h3 id="_applying_gps_data_to_dives_in_the_dive_log">12.6. Applying GPS data to dives in the dive log</h3> <div class="paragraph"><p>Assuming that all the dives have been entered into the dive log or have been downloaded from the <em>Subsurface</em> cloud, you can apply the GPS positions to these dives. GPS positions can therefore only be applied to dives in the @@ -827,7 +916,7 @@ the dive log.</p></div> <div id="footer"> <div id="footer-text"> Last updated - 2017-07-04 13:38:54 CEST + 2017-10-11 10:34:38 CEST </div> </div> </body> diff --git a/Documentation/mobile-manual_fr.txt b/Documentation/mobile-manual_fr.txt index d0addca6e..e5b55c564 100644 --- a/Documentation/mobile-manual_fr.txt +++ b/Documentation/mobile-manual_fr.txt @@ -1,3 +1,4 @@ + :icons: :toc: :toc-placement: manual @@ -7,11 +8,11 @@ image::mobile-images/banner.jpg["Banner", align="center"] [big]#MANUEL UTILISATEUR de Subsurface-mobile# -*Auteur du manuel* : Willem Ferguson +*Auteurs du manuel* : Willem Ferguson, Dirk Hohndel toc::[] -[blue]#_Version 1.1, Septembre 2016_# +[blue]#_Version 2, juillet 2017_# Welcome as a user of _Subsurface_, advanced dive logging software with extensive infrastructure to describe, organize, interpret and print scuba @@ -25,23 +26,23 @@ Présentation de Subsurface-mobile --------------------------------- _Subsurface-mobile_ est une extension de _Subsurface_ qui fonctionne sur les -smartphones et les tablettes Android et c'est un outil pour visualiser et -partager des informations de plongées sur des sites de plongées où un -ordinateur n'est pas utile. _Subsurface-mobile_ permet également de -collecter des positions GPS où sont effectuées les -plongées. (Subsurface-mobile pour iOS ne supporte pas les fonctions GPS pour -le moment). +smartphones Android et iOS et sur les tablettes. C'est un outil pour +visualiser et partager des informations de plongées sur des sites de +plongées où un ordinateur n'est pas utile. _Subsurface-mobile_ permet +également de collecter des positions GPS où sont effectuées les +plongées. (Subsurface-mobile pour iOS ne supporte pas toutes les fonctions +pour le moment). _Subsurface-mobile_ allows you to enter and save dive information using a -mobile device. Most users of _Subsurface-mobile_ typically use the mobile -app as an extension to the laptop/desktop version of _Subsurface_. This -allows the storage of dive logs on the Internet sharing them between the -mobile and the desktop versions. But _Subsurface-mobile_ can be used -independently of _Subsurface_ and does not require the use of cloud -storage. While the desktop version of _Subsurface_ shows much more detailed -information for each dive, the mobile version allows a more accessible dive -log on a dive trip, useful for proving dive experience to dive shops or to -review previous dives. +mobile device. Users of _Subsurface-mobile_ typically use the mobile app as +an extension to the laptop/desktop version of _Subsurface_ that allows the +storage of dive logs on the Internet and sharing them between the mobile and +the desktop versions. But _Subsurface-mobile_ can also be used independently +of _Subsurface_ and does not require the use of cloud storage. While the +desktop version of _Subsurface_ shows much more detailed information for +each dive, the mobile version allows a more accessible dive log on a dive +trip, useful for proving dive experience to dive shops or to review previous +dives. _Subsurface-mobile_ allows you to: @@ -50,16 +51,17 @@ _Subsurface-mobile_ allows you to: - Edit many of the dive log data fields, e.g. divemaster, buddy, equipment or notes about a dive. - Manually create and add new dive records to your dive log. +- Download dive data directly from many dive computers. - Store the updated dive log in the _Subsurface_ cloud storage. - Record, store and apply GPS positions of dives (Android only). - View the localities of recorded GPS positions and of dives on a map. -These items are discussed in greater detail in the following text. What -_Subsurface-mobile_ does not support (at this time) is downloading dive data -directly from a dive computer. That still needs to be done using -_Subsurface_ on a desktop or laptop computer. We are investigating ways to -support downloading from a subset of the supported dive computers on Android -devices, but this is not yet ready for testing. +These items are discussed in greater detail in the following text. +_Subsurface-mobile_ does not yet support download of dive data from all the +dive computers that the desktop/laptop version can: that still needs to be +done using _Subsurface_ on a desktop or laptop computer. Only a subset of +dive computers that use a FTDI USB interface or a Bluetooth/BTLE interface +are accessible by _Subsurface-mobile_. == Installing _Subsurface-mobile_ on your mobile device @@ -74,19 +76,19 @@ several seconds. After loading, the _Cloud Credentials screen_ appears (see image below on left). Select whether _Subsurface-mobile_ should access the Internet for dive log -information. +information as follows: === When NOT Using Cloud Storage Tap the striked-out cloud icon. The app will not access the _Subsurface_ cloud storage server to obtain dive log information. This means that dive -log information is manually entered and stored on the mobile device only. +log information is stored on the mobile device only. === Using Cloud Storage In order to use the _Subsurface_ cloud storage, an account on the cloud server is required. If you have already set up an account from the _Subsurface_ desktop application, enter the credentials here. -You can also create a new account from your mobile device. +You can also create a new cloud storage account from your mobile device. ==== Using the desktop version of _Subsurface_: @@ -130,12 +132,12 @@ Enter the PIN into the field indicated and tap the _Save_ icon again. The user information is stored on the cloud server and access to the cloud is enabled. -The dive list is initially empty. You can now start entering dives in the -dive log or you can download existing dives from your _Subsurface_ cloud -storage account. +The dive list is initially empty. Start entering dives in the dive log or +download dive information from either a _Subsurface_ cloud storage account +or from a dive computer. -== A Few Remarks About The User Interface +== Menu Structure and User Interface At the bottom of many Subsurface-mobile screens is a round button that provides for several actions and which allows the selection of the main @@ -162,13 +164,13 @@ are three ways to open the main menu: - Swipe towards the right across the left edge of the screen - Drag the action button visible on most screens to the right -image::mobile-images/menu.jpg["FIGURE: Dive management subpanel", align="center"] +image::mobile-images/MainMenu2.jpg["FIGURE: Dive management subpanel", align="center"] The images above indicate some of the important features of the menu -system. On the left is the main menu that is activated as described -above. In the middle is the menu that opens if you tap the _GPS_ option on -the main menu. On the right is the menu that opens if you tap the _Manage -Dives_ option on the main menu. +system. On the left is the main menu, activated as described above. On the +right, above, is a representation of the menu items of all the submenus +accessible from the main menu: the main menu items are shown on the left +while the submenu contents are shown on a blue background on the right. All screenshots in this user manual are currently from the Android version. As indicated earlier, the iOS version currently doesn't support @@ -178,11 +180,11 @@ _GPS_ features. Most of the actions of _Subsurface-mobile_ center around the dives on the dive list. While the dive list is loading from the cloud, a message appears -at the bottom of the screen, indicating that the cloud is being accessed -(see image on left, below). Once the list is loaded you can scroll up and -down. Tapping a dive on the list brings up a display of _Details View_ for -that dive (see image on right below). This includes the dive profile as -well as additional information and notes. +at the bottom of the screen, indicating that the cloud is being +accessed. Once the list is loaded you can scroll up and down. Tapping a +dive on the list brings up a display of _Details View_ for that dive (see +image on right below). This includes the dive profile as well as additional +information and notes. image::mobile-images/DiveList.jpg["FIGURE: Dive list screen", align="center"] @@ -192,6 +194,7 @@ also possible to delete the dive (tap the dustbin on the Action Bar) or to view the dive location on a map viewer (Google Maps on Android, the Google Maps web site on iOS; tap the GPS icon on the Action Bar.). +[[S_Edit_Dive]] == Editing dive details At the bottom of the dive details screen the _Action Button_ contains a @@ -206,6 +209,7 @@ the Android Back Button or swipe the edit screen up (fling it away). image::mobile-images/EditDive.jpg["FIGURE: Dive edit screen", align="center"] +[[S_Add_Dive]] == Adding a new dive to the dive list You can manually add a dive to the existing dive list. On the dive list tap @@ -240,6 +244,71 @@ to delete the dive. image::mobile-images/RedDustbin.jpg["FIGURE: delete dive from list", align="center"] +== Download dives from a dive computer + +Download of dives is possible from dive computers with a FTDI USB interface, +or with a Bluetooth interface. + +First, establish a link between the dive computer and the mobile device. + +For USB dive computers, USB cables "normally" used for uploading dives to a +desktop/laptop computer do NOT work: these cables often have a full-sized +male USB plug on one end which plugs into the USB port of a desktop/laptop +computer. For downloads to a mobile device one needs a USB OTG (USB +On-The-Go) cable. In most cases it is required to plug the USB cable +"normally" used with the dive computer into a USB OTG cable which, in turn, +plugs into the mini-USB receptacle of the mobile device. The OTG cable often +has a full-size female receptacle at one end which accommodates the +full-sized male plug of the USB cable "normally" used (see image +below). This means that two cables are used to connect the dive computer to +the mobile device. + +image::mobile-images/USB-OTG.jpg["FIGURE: USB-OTG cable", align="center"] + +For Bluetooth-equipped dive computers, establish a Bluetooth connection +between the dive computer and the mobile device. Use the tools on the mobile +device to achieve this. For of Android mobile devices, the Settings -> +Bluetooth tool is probably appropriate. Ensure pairing of the dive computer +and mobile device. _Subsurface-mobile_ performs communication using both +Bluetooth and Bluetooth-low-energy (BTLE). The appropriate choice of +Bluetooth communication is made by the software and the user need not be +concerned with this. + +With propper communication between dive computer and _Subsurface-mobile_ +having been set up, dive download is simple. From the main menu, tap +_Manage dives -> Download from DC_. A screen is shown requiring that the +user specify the names of the vendor and model of the dive computer. For +instance, when using a Shearwater Petrel 2 dive computer, the vendor is +_Shearwater_ and the Dive computer name is _Petrel 2_. From the two dropdown +lists at the top of the screen, select the correct vendor and dive computer +names (see image on the left, below). If using a dive computer using a +Bluetooth connection, then tap the check box labelled _Bluetooth download_. + +Now tap the button labled _DOWNLOAD_. The downloaded dives appear in the +bottom part of the screen, the most recent dive at the top (see image on +right, below). Be patient because the download can sometimes take a few +mimnutes. Each dive has a check-box on the left hand side, used for +selecting which dives need to be added to the _Subsurface-mobile_ dive list: +dives that are not checked are ignored. With the appropriate downloaded +dives having been checked, tap the button at the bottom left labled +_ACCEPT_. All the selected dives appear on the _Subsurface-mobile_ dive +list. The downloaded dive information can now be edited as described in the +section above xref:S_Edit_Dive[Edit a dive]. + +image::mobile-images/DC-Download.jpg["FIGURE: DC download screen", align="center"] + +== Viewing the dive location on Google Maps + +The site of a specific dive can be viewed in two ways using the _Details +View_. The Action Bar at the bottom has a GPS pin on the left hand +side. Tap that pin and the dive site is shown in Google Maps. Close Google +Maps by using the Android _Back_ button. + +Alternatively, the _Details View_ has a button at the top right hand marked +_Map it_. Tap this button to open Google Maps showing the dive site. + +image::mobile-images/Map.jpg["FIGURE: Map of dive site", align="center"] + == Dive log management A central part of _Subsurface-mobile_ is the ability to store the dive log @@ -247,20 +316,21 @@ using the _Subsurface_ cloud storage. This provides security against loss or damage to the dive information contained in a local copy of the dive log and allows the desktop version of _Subsurface_ to access changes made using the mobile device. This ability is accessed through the main menu (by -dragging the Action Button to the right, or alternatively tappping the +dragging the Action Button to the right, or alternatively tapping the "Hamburger" icon at the bottom left of the screen). Tap the option _Manage dives_, enabling a number of options: === Add new dive manually -This is described above under the section dealing with the dive list. +This is described above under the section dealing with +xref:S_Add_Dive[Adding a new dive to the dive list]. === Sync the dive log with the _Subsurface_ cloud storage -You can upload the dives contained on the mobile device to the _Subsurface_ -cloud storage by tapping the option _Manual sync with coud_. This -synchronizes the local changes to the dive log with the cloud storage. It -also downloads changes made on another device or computer and stored in +Upload the dives contained on the mobile device to the _Subsurface_ cloud +storage by tapping the option _Manual sync with cloud_. This synchronizes +the local changes to the dive log with the cloud storage. It also downloads +changes made to the dive log using another device or computer and stored in cloud storage. === Working offline or online @@ -274,10 +344,19 @@ to hang between operations as it tries to connect to the cloud server. === Changing the login credentials on the _Subsurface_ cloud -If you need to change your login credentials (for example to work with -multiple accounts) you can open the main menu and tap _Cloud -credentials_. This opens the setup screen for specifying new credentials. +The login credentials (for example to work with multiple accounts) can be +changed by opening the main menu and by tapping _Settings -> Cloud +credentials_. This opens the screen for specifying new credentials. + +=== Changing the colour scheme of _Subsurface-mobile_ +_Subsurface-mobile_ has three colour schemes to please users with different +tastes. This user manual shows the default colour scheme, comprising blue +colours. Change to a pink or a dark colour scheme by opening the main menu +and tap Settings -> Preferences. This opens the Preferences screen that +includes the three colour schemes (see image below). + +image::mobile-images/ColourSchemes.jpg["FIGURE: Colour scheme setup screen", align="center"] == Recording dive locations using GPS (Android only). @@ -290,32 +369,30 @@ applied to dives in the dive list. Here is how it's done: === Setting up the GPS Open the main menu and tap _GPS -> Preferences_. Now specify the way in -which GPS data need to be automatically collected (image on right, -below). You can specify that data are collected at regular intervals, e.g. -every 10 minutes, or at regular distances, e.g. after the boat has moved -more than 200m, or a combination of both of the above approaches. Provide -the appropriate information and tap the _Save_ action button. The program is -now ready to collect GPS positions. - -image::mobile-images/gpssetup.jpg["FIGURE: GPS setup screen", align="center"] +which GPS data need to be automatically collected (image above). Data are +collected at regular intervals, e.g. every 5 minutes, or at regular +distances, e.g. after the boat has moved more than 200m, or a combination of +both of these approaches. Provide the appropriate information and tap the +_Save_ action button. The program is now ready to collect GPS positions. === Collecting GPS positions +image::mobile-images/Mainmenu.jpg["FIGURE: Main menu", align="center"] + Ensure that the GPS on the Android device has been activated. At the bottom -of the GPS submenu is a check box _Run location service_ (image on left, -above). Check this box and _Subsurface-mobile_ starts to collect GPS -locations automatically, following the preferences specified as described -above. After return from the dive trip you can deactivate the collection of -GPS data by de-activating the same check box at the bottom of the main menu. +of the GPS submenu is a check box _Run location service_ (image above). +Check this box and _Subsurface-mobile_ starts to collect GPS locations +automatically, following the preferences specified as described above. After +return from the dive trip you can deactivate the collection of GPS data by +de-activating the same check box at the bottom of the main menu. === Storing the GPS data on the _Subsurface_ cloud Activate the main menu and select the _GPS_ option that brings up the -submenu of GPS-related actions (image on left, above). Tap _Upload GPS data_ -that saves the GPS data on the _Subsurface_ cloud server. These GPS data are -saved *separately* from the other dive log data. All collected GPS data are -kept on the Android device, independent of whether they have been uploaded -or not. +submenu of GPS-related actions. Tap _Upload GPS data_ that saves the GPS +data on the _Subsurface_ cloud server. These GPS data are saved *separately* +from the other dive log data. All collected GPS data are kept on the Android +device, independent of whether they have been uploaded or not. === Downloading GPS data from the _Subsurface_ cloud @@ -324,16 +401,16 @@ different device) by selecting _Download GPS Data_ from the GPS subpanel. === Viewing GPS data -From the GPS submenu (image on left, above) select _Show GPS fixes_. This -brings up a list of GPS positions obtained using the location service (image -on left, below). Two actions are possible for each of the locations, enabled -if you tap the handle (the three horisontal stripes on the right, see image -on left, below) and then drags the specific item to the left (image on -right, below). This exposes two options. Tapping the dustbin deletes this -particular GPS location. Tapping the teardrop-shaped icon (actually a Google -Maps pin) opens up Google Maps with a pin indicating the exact map position -of the GPS record being viewed. The two above options can be hidden by -drawing the GPS record to the right, again using the handle. +From the GPS submenu select _Show GPS fixes_. This brings up a list of GPS +positions obtained using the location service (image on left, below). Two +actions are possible for each of the locations, enabled if you tap the +handle (the three horisontal stripes on the right, see image on left, below) +and then drags the specific item to the left (image on right, below). This +exposes two options. Tapping the dustbin deletes this particular GPS +location. Tapping the teardrop-shaped icon (actually a Google Maps pin) +opens up Google Maps with a pin indicating the exact map position of the GPS +record being viewed. The two above options can be hidden by drawing the GPS +record to the right, again using the handle. image::mobile-images/gpsmanagement.jpg["FIGURE: GPS management", align="center"] diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git index 91e5847c7..c363774df 100644 --- a/Documentation/user-manual_fr.html.git +++ b/Documentation/user-manual_fr.html.git @@ -442,10 +442,10 @@ asciidoc.install(3); </div> </div> <div class="paragraph"><p><span class="big">MANUEL UTILISATEUR</span></p></div> -<div class="paragraph"><p><strong>Manual authors</strong>: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg, +<div class="paragraph"><p><strong>Auteurs du manuel</strong> : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg, Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves, Stefan Fuchs</p></div> -<div class="paragraph"><p><span class="blue"><em>Version 4.6, March 2017</em></span></p></div> +<div class="paragraph"><p><span class="blue"><em>Version 4.6, mars 2017</em></span></p></div> <div class="paragraph"><p>Bienvenue en tant qu’utilisateur de <em>Subsurface</em>, un programme avancé d’enregistrement de plongées (carnet de plongées) avec une bonne infrastructure pour décrire, organiser, interpréter et imprimer des plongées @@ -513,18 +513,20 @@ Souhaitez-vous pouvoir accéder ou modifier votre carnet de plongée en </p> </li> </ul></div> -<div class="paragraph"><p><em>Subsurface</em> binaries are available for Windows PCs (Win 7 or later from -version 4.6 of <em>Subsurface</em> onwards), Intel based Macs (OS/X) and many Linux -distributions. <em>Subsurface</em> can be built for many more hardware platforms -and software environments where Qt and libdivecomputer are available.</p></div> -<div class="paragraph"><p>This manual explains how to use the <em>Subsurface</em> program. To install the -software, consult the <em>Downloads</em> page on the -<a href="https://subsurface-divelog.org/"><em>Subsurface</em> web site</a>. Please discuss -issues with this program by sending an email to -<a href="mailto:subsurface@subsurface-divelog.org">our mailing list</a> and report bugs -at <a href="https://github.com/Subsurface-divelog/subsurface/issues">our bugtracker</a>. -For instructions on how to build the software and (if needed) its -dependencies please consult the INSTALL file included with the source code.</p></div> +<div class="paragraph"><p><em>Subsurface</em> est disponible pour Windows (Win 7 ou plus récent, à partir de +la version 4.6 de <em>Subsurface</em>), les Macs basés sur processeurs Intel (OS/X) +et de nombreuses distributions Linux. <em>Subsurface</em> peut être compilé pour +bien plus de plateformes matérielles et d’environnements logiciels où Qt et +libdivecomputer sont disponibles.</p></div> +<div class="paragraph"><p>Ce manuel explique comment utiliser le programme <em>Subsurface</em>. Pour +installer le logiciel, consultez la page <em>Téléchargement</em> sur le +<a href="https://subsurface-divelog.org/">site web de <em>Subsurface</em></a>. En cas de +problème, vous pouvez envoyer un e-mail sur +<a href="mailto:subsurface@subsurface-divelog.org">notre liste de diffusion</a> et +rapportez les bogues sur <a href="http://trac.hohndel.org">notre bugtracker</a>. Pour +des instructions de compilation du logiciel et (si besoin) de ses +dépendances, merci de consulter le fichier INSTALL inclus dans les sources +logicielles.</p></div> <div class="paragraph"><p><strong>Public</strong> : Plongeurs loisirs, apnéistes, plongeurs Tek et plongeurs professionnels</p></div> <div id="toc"> @@ -534,28 +536,31 @@ professionnels</p></div> <div class="sect1"> <h2 id="_utilisation_de_ce_manuel">1. Utilisation de ce manuel</h2> <div class="sectionbody"> -<div class="paragraph"><p>When opened from within <em>Subsurface</em>, this manual does not have external -controls for paging or selecting previous pages. However, two facilities are -provided:</p></div> -<div class="paragraph"><p>The <em>SEARCH</em> function is activated by pressing control-F or command-F on the -keyboard. A text box appears at the bottom right-hand of the window (see -image below). For instance, typing the word "<em>weights</em>" into the search -text box, searches throughout the user manual. To the right of the search -text box are two arrows pointing up and down. These find the previous and -the next occurrence of the search term.</p></div> +<div class="paragraph"><p>Lorsqu’il est ouvert depuis <em>Subsurface</em>, ce manuel ne dispose pas de +contrôles externes pour la pagination ou la sélection des pages +précédentes. Cependant, deux options sont disponibles:</p></div> +<div class="paragraph"><p>La fonction <em>RECHERCHE</em> est activée avec le raccourci clavier Contrôle-F ou +Commande-F. Une boîte de texte apparaît en bas à droite de la fenêtre (voir +image ci-dessous). Par exemple, entrer le mot "<em>weights</em>" dans la boîte de +texte de recherche lancera la recherche dans tout le manuel utilisateur. À +droite de la boîte de recherche se trouvent deux flèches, l’une vers le haut +l’autre vers le bas. Elles mènent respectivement vers l’occurence précédente +et suivante du terme recherché.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/UserManualSearch.jpg" alt="User manual functions" /> </div> </div> -<div class="paragraph"><p><em>PREVIOUS/NEXT LINK</em>. Move between links (underlined words that jump to -specific sections in the user manual) by right-clicking on the text of the -manual. This brings up a context menu to PREVIOUS links selected. (see -image below). For instance if a link has been selected, then the option to -<em>Go Back</em> shows the text at the previous link selected (similar to the -Previous Page button in a browser). Conversely the <em>Go Forward</em> option jumps -to the text seen before selecting the <em>Go Back</em> option. The <em>Reload</em> option -reloads the complete user manual into the window.</p></div> +<div class="paragraph"><p><em>LIEN PRÉCÉDENT/SUIVANT</em>. Naviguez entre les liens (les mots soulignés qui +vous conduisent vers des sections précises du manuel utilisateur) en +cliquant-droit sur le texte du manuel. Cela fera apparaître un menu +contextuel vers les liens PRÉCÉDENTS sélectionnés (voir image +ci-dessous). Par exemple, si un lien a été sélectionné, l’option <em>Retour +lien précédent</em> affiche le texte au lien précédent sélectionné (comme le +fait le bouton Page Précédente d’un navigateur). Inversement, l’option +<em>Aller au lien suivant</em> navigue vers le texte vu avant l’utilisation de +l’option <em>Retour lien précédent</em>. L’option <em>Recharger</em> recharge le manuel +utilisateur complet dans la fenêtre.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/UserManualLinksBack.jpg" alt="User manual functions" /> @@ -567,11 +572,11 @@ reloads the complete user manual into the window.</p></div> <h2 id="S_UserSurvey">2. Le sondage utilisateur</h2> <div class="sectionbody"> <div class="paragraph"><p>Dans le but de développer <em>Subsurface</em> pour servir ses utilisateurs de la -meilleur manière qu’il soit, il est important d’avoir des informations sur -les utilisateurs. À l’ouverture de <em>Subsurface</em> après avoir utilisé le -logiciel pendant une semaine environ, une fenêtre de sondage apparait. Cela -est complètement optionnel et l’utilisateur contrôle quelles informations -sont envoyées ou non à l'équipe de développement de <em>Subsurface</em>. Toutes les +meilleur manière qui soit, il est important d’avoir des informations sur les +utilisateurs. À l’ouverture de <em>Subsurface</em> après avoir utilisé le logiciel +pendant une semaine environ, une fenêtre de sondage apparait. Cela est +complètement optionnel et l’utilisateur contrôle quelles informations sont +envoyées ou non à l'équipe de développement de <em>Subsurface</em>. Toutes les données que l’utilisateur envoie sont utiles et ne seront utilisées que pour les futurs développements et modifications du logiciel pour coller au mieux aux besoins des utilisateurs de <em>Subsurface</em>. Si vous complétez le sondage @@ -585,14 +590,14 @@ envoyer un nouveau sondage en démarrant <em>Subsurface</em> avec l’option <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 Edit Import Log View Share 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 Édition Importer Journal Vue Partager 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, affichant toutes les plongées du journal (carnet) de plongées de l’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 +la plupart des cas, les touches haut/bas peuvent être utilisées pour passer d’une plongée à l’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 @@ -615,8 +620,8 @@ l’emplacement de la plongée, les informations détaillées et le profil d <em>plongée sélectionnée</em> sont affichées dans les panneaux respectifs. Si plusieurs plongées sont sélectionnées, la dernière mise en surbrillance est la <em>plongée sélectionnée</em>, mais les données de <em>toutes les plongées mises en -surbrillances</em> sont affichées dans l’onglet <strong>Stats</strong> du panneau -<strong>informations</strong> (profondeur maximale, minimale et moyenne, les durées, les +surbrillances</em> sont affichées dans l’onglet <strong>Statistiques</strong> du panneau +<strong>Informations</strong> (profondeur maximale, minimale et moyenne, les durées, les températures de l’eau et le SAC (air consommé); temps total et nombre de plongées sélectionnées).</p></div> <div class="imageblock" id="S_ViewPanels" style="text-align:center;"> @@ -633,13 +638,15 @@ permet plusieurs choix d’affichage :</p></div> <div class="paragraph"><p><strong>Info</strong> : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour toutes les plongées mises en surbrillance.</p></div> <div class="paragraph"><p><strong>Globe</strong> : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.</p></div> -<div class="paragraph"><p>Like other functions that can be accessed via the Main Menu, these options -can also be triggered using keyboard shortcuts. The shortcuts are shown with -an underline in the main menu entries, with the Alt-key pressed, or are -denoted after the menu item.</p></div> +<div class="paragraph"><p>Comme d’autres fonctions auxquelles on peut accéder via le menu principal, +ces options peuvent aussi être activées par des raccourcis clavier. Les +raccourcis pour un système particulier sont affichés avec un souligné dans +les entrées de menu. À cause des différents systèmes d’exploitation et +langues, <em>Subsurface</em> peut utiliser différentes touches de raccourcis et ne +sont donc pas détaillées ici.</p></div> <div class="paragraph"><p>Lorsque le programme est lancé pour la première fois, il n’affiche aucune information, parce qu’il n’a aucune information de plongée disponible. Dans -les sections suivantes, le procédure pour créer a nouveau carnet de plongée +les sections suivantes, la procédure pour créer un nouveau carnet de plongée sera détaillée.</p></div> </div> </div> @@ -711,148 +718,166 @@ Tableur ou de fichiers CSV contenant les profils de plongées. </ul></div> <div class="sect2"> <h3 id="S_EnterData">5.1. Entrer les informations de plongée à la main</h3> -<div class="paragraph"><p>This is usually the approach for dives without a dive computer. The basic -record of information within <em>Subsurface</em> is a dive. The most important -information in a simple dive logbook usually includes dive type, date, time, -duration, depth, the names of your dive buddy and the divemaster or dive -guide, and some remarks about the dive. <em>Subsurface</em> can store much more -information for each dive. To add a dive to a dive log, select <em>Log → Add -Dive</em> from the Main Menu. The program then shows three panels on which to -enter information for a dive: two tabs in the <strong>Info</strong> panel (<strong>Notes</strong> and -<strong>Equipment</strong>), as well as the <strong>Dive Profile</strong> panel that displays a graphical -profile of each dive. These panels are respectively marked <span class="red">A</span>, -<span class="red">B</span> and <span class="red">C</span> in the figure below. Each of these tabs will now be -explained for data entry.</p></div> +<div class="paragraph"><p>C’est en général l’approche des plongées sans ordinateur. L’enregistrement +de l’information de base dans <em>Subsurface</em> est une plongée. L’information la +plus importante dans un simple carnet de plongée inclut généralement le type +de plongée, la date et l’heure, la durée, la profondeur, le nom des +équipiers et du moniteur ou du guide de palanquée, et quelques remarques à +propos de la plongée. <em>Subsurface</em> peut stocker bien plus d’informations +pour chaque plongée. Pour ajouter une plongée au carnet, sélectionner +<em>Journal → Ajouter une plongée</em> depuis le menu principal. Le logiciel +affiche alors trois panneaux sur lesquels on peut entrer des informations +pour une plongée: deux onglets dans le panneau <strong>Informations</strong> (<strong>Notes</strong> et +<strong>Équipement</strong>), ainsi que le panneau <strong>Profil de plongée</strong> qui affiche un +profil graphique pour chaque ploingée. Ces panneaux sont respectivement +marqués <span class="red">A</span>, <span class="red">B</span> et <span class="red">C</span> dans l’llustration ci-dessous. Chaque +de ces onglets sera expliqué pour l’entrée de données.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/AddDive1_f22.jpg" alt="FIGURE: Add dive" /> </div> </div> -<div class="paragraph"><p>When you edit a field in Notes or Equipment panels, <em>Subsurface</em> enters -<strong>Editing Mode</strong>, indicated by the message in the blue box at the top of the -<strong>Notes</strong> panel (see the image below). This message is displayed in all the -panels under Notes and Equipment when in <strong>Editing Mode</strong>.</p></div> +<div class="paragraph"><p>Lorsque vous éditez un champ dans Notes ou Équipement, <em>Subsurface</em> entre en +<strong>Mode édition</strong>, indiqué par un message dans une boîte bleue en haut du +panneau <strong>Notes</strong> (voir image ci-dessous). Ce message est affiché dans tous +les panneau sous Notes et Équipement en <strong>Mode édition</strong>.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/BlueEditBar_f22.jpg" alt="Blue edit bar" /> </div> </div> -<div class="paragraph"><p>The <em>Apply changes</em> button should only be selected after all the parts of a -dive have been entered. When entering dives by hand, the <em>Info</em>, -<em>Equipment</em> and <em>Profile</em> tabs should be completed before applying the -information. By selecting the <em>Apply changes</em> button, a local copy of the -information for this specific dive is saved in memory but NOT written to -disk. The <em>Apply changes</em> button should ONLY be selected after all parts of -a dive have been entered. When closing Subsurface, the program will ask -again, this time whether the complete dive log should be saved on disk or -not.</p></div> +<div class="paragraph"><p>Le bouton <em>Appliquer les modifications</em> ne doit être cliqué qu’après avoir +complété toutes les parties d’une plongée. Lors de l’entrée manuelle d’une +plongée, les onglets <em>Informations</em>, <em>Équipement</em> et <em>Profil</em> doivent être +complétés avant d’appliquer les modifications. En cliquant le bouton +<em>Appliquer les modifications</em>, une copie locale des informations d’une +plongée sont sauvegardées dans la mémoire, mais ne sont pas écrites sur le +disque. Le bouton <em>Appliquer lesmodifications</em> ne devrait UNIQUEMENT être +utilisé qu’après avoir entré toutes les informations d’une plongée. En +quittant Subsurface, le logiciel demandera si les carnet de plongée complet +doit être enregistré sur le disque ou non.</p></div> <div class="sect3"> -<h4 id="S_CreateProfile">5.1.1. Creating a Dive Profile</h4> -<div class="paragraph"><p>The <strong>Dive Profile</strong> (a graphical representation of the depth of the dive as a -function of time) is shown in the panel on the top right hand of the -<em>Subsurface</em> window. When a dive is manually added to a logbook, -<em>Subsurface</em> presents a default dive profile that needs to be modified to -best represent the dive described:</p></div> +<h4 id="S_CreateProfile">5.1.1. Création d’un profil de plongée</h4> +<div class="paragraph"><p>Le <strong>Profil de plongée</strong> (une représentation graphique de la profondeur d’une +plongée en fonction du temps) est affiché dans le panneau en haut à droite +de la fenêtre de <em>Subsurface</em>. Lorsqu’il est ajouté manuellement au carnet, +<em>Subsurface</em> affiche un profil de plongée par défaut qui nécessite d'être +modifié pour représenter au mieux la plongée décrite:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/DiveProfile1_f20.jpg" alt="FIGURE: Initial dive profile" /> </div> </div> -<div class="paragraph"><p><em>Modifying the dive profile</em>: When the cursor is moved around the dive -profile, its position is shown by two right-angled red lines as seen below. -The time and depth represented by the cursor are indicated at the top of the -black information box (@ and D). The units (metric/imperial) on the axes are -determined by the <strong>Preference</strong> settings. The dive profile itself comprises -several line segments demarcated by waypoints (white dots on the profile, as -shown above). The default dive depth is 15 m. If the dive depth was 20 m -then you need to drag the appropriate waypoints downward to 20 m. To add a -waypoint, double-click on any line segment. To move an additional waypoint, -drag it. Moving can also be done by selecting the waypoint and using the -arrow keys. To remove a waypoint, right-click on it and choose "Remove this -point" from the context menu. Drag the waypoints to represent an accurate -time duration for the dive. Below is a dive profile for a dive to 20 m for -30 min, followed by a 5 minute safety stop at 5 m.</p></div> +<div class="paragraph"><p><em>Modifier le profile de plongée</em>: lorsque le curseur est déplacé dans la +zone du profil, sa position est affichée par deux lignes rouges à angle +droit, comme illustré ci-dessous. Le temps et la profondeur sont représentés +en haut de la boîte noire d’information (@ et D). Les unités +(métriques/impériales) sur les axes sont déterminées dans les réglages des +<strong>Préférences</strong>. Le profil de plongée lui-même comporte plusieurs segments de +ligne séparés par des points de passage (les points blancs sur le profil, +voir ci-dessous). La profondeur par défaut d’une plongée est de 15m. Si la +prfondeur de votre plongée était de 20m, vous devez glisser le point de +passage approprié jusqu'à 20m. Pour ajouter un point de passage, +double-cliquez sur n’importe quel segment de la ligne. Pour bouger un point +de passage supplémentaire, glissez-le. Le bouger peut également être réalisé +en le sélectionnant et en utilisant les flèches du clavier. Pour supprimer +un point de passage, faites un clic-droit dessus et choisissez "Supprimer ce +point" dans le menu contextuel. Glissez les points de passage pour +représenter une durée correspondante à celle de votre plongée. Ci-dessous se +trouve un profil pour une plongée à 20m durant 30min, suivie d’un palier de +sécurité de 5 minutes à 5 m.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/DiveProfile2_f20.jpg" alt="FIGURE: Edited dive profile" /> </div> </div> -<div class="paragraph"><p><em>Specifying the gas composition:</em> The gas composition used is indicated -along the line segments of the dive profile. This defaults to the first gas -mixture specified in the <strong>Equipment</strong> tab, which was air in the case of the -profile above. The gas mixtures of segments of the dive profile can be -changed by right-clicking on the particular waypoint and selecting the -appropriate gas from the context menu. Changing the gas for a waypoint -affects the gas shown in the segment <em>to the right</em> of that waypoint. Note -that only the gases defined in the <strong>Equipment</strong> tab appear in the context -menu (see image below).</p></div> +<div class="paragraph"><p><em>Spécifier la composition du gaz:</em> la composition du gaz utilisé est +indiquée le long des segments de ligne du profil de plongée. Ceci est le +réglage par défaut pour le premier mélange gazeux spécifié dans l’ongle +<strong>Équipement</strong>, qui était de l’air dans le cas du profil ci-dessus. Les +mélanges gazeux des segments du profil peuvent être modifiés dans +cliquant-droit sur un point de passage précis et en sélectionnant le gaz +approprié dans le menu contextuel. Changer un gaz à un point de passage +modifie le gaz affiché dans le segment <em>à droite</em> du point de passage. Notez +que seuls les gaz définis dans l’onglet <strong>Équipement</strong> apparaissent dans le +menu contextuel (voir image ci-dessous).</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/DiveProfile3_f20.jpg" alt="FIGURE: Gas composition context menu" /> </div> </div> -<div class="paragraph"><p>With the profile now defined, more details must be added to have a fuller -record of the dive. To do this, the <strong>Notes</strong> and the <strong>Equipment</strong> tabs on the -top left hand of the <em>Subsurface</em> window should be used. Click on -<a href="#S_Notes_dc"><strong>this link</strong></a> for instructions on how to use these tabs.</p></div> +<div class="paragraph"><p>Une fois le profil déterminé, d’autres détails doivent être ajoutés pour +obtenir un enregistrement complet de la plongée. Pour y arriver, les onglets +<strong>Notes</strong> et <strong>Équipement</strong> en haut à gauche de la fenêtre de <em>Subsurface</em> +doivent être utilisés. Cliquez sur <a href="#S_Notes_dc"><strong>ce lien</strong></a> pour plus +d’informations sur l’utilisation de ces onglets.</p></div> </div> </div> <div class="sect2"> <h3 id="S_ImportDiveComputer">5.2. Importer de nouvelles informations de plongée à partir de l’ordinateur de plongée</h3> <div class="sect3"> -<h4 id="_connecting_and_importing_data_from_a_dive_computer">5.2.1. Connecting and importing data from a dive computer.</h4> -<div class="paragraph"><p>The use of dive computers allows the collection of a large amount of -information about each dive, e.g. a detailed record of depth, duration, -rates of ascent/descent and of gas partial pressures. <em>Subsurface</em> can -capture this information, using dive details from a wide range of dive -computers. The latest list of supported dive computers can be found at: -<a href="https://subsurface-divelog.org/documentation/supported-dive-computers/"> -Supported dive computers</a>.</p></div> +<h4 id="_connecter_et_importer_des_données_depuis_un_ordinateur_de_plongée">5.2.1. Connecter et importer des données depuis un ordinateur de plongée.</h4> +<div class="paragraph"><p>L’utilisation d’ordinateurs de plongée permet la collecte d’un grand nombre +d’informations à propos de chaque plongée, comme un enregistrement détaillé +de la profondeur, la durée, la vitesse de remontée ou de descente et les +pression partielles des gaz. <em>Subsurface</em> peut récupérer ces informations, +en utilisant les données venant d’une grande variété d’ordinateurs de +plongée. La liste la plus récente des ordinateurs supportés peut être trouvé +ici: +<a href="https://subsurface-divelog.org/documentation/supported-dive-computers/">Ordinateurs +de plongée supportés</a>.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <img src="images/icons/warning2.png" alt="Warning" /> </td> -<td class="content">Several dive computers consume more power when they are in PC-Communication -mode. <strong>This could drain the dive computer’s battery</strong>. We recommend the -user checks to be sure the dive computer is charged when connected to the -USB port of a PC. For example, several Suunto and Mares dive computers do -not recharge through the USB connection. Users should refer to the dive -computer’s manual if they are unsure whether the dive computer recharges its -batteries while connected to the USB port.</td> +<td class="content">Certains ordinateurs de plongée consomme plus d'énergie lorsqu’ils sont en +mode Communication PC. <strong>Ceci peut consommer une grande partie de la +batterie de votre ordinateur de plongée</strong>. Nous recommandons à l’utilisateur +de vérifier que l’ordinateur de plongée est chargé lorsqu’il est conneté au +port USB du PC. Par exemple, certains ordinateurs Suunto et Mares ne se +rechargent pas via la connection USB. Les utilisateurs doivent se reporter +au manuel de leur ordinateur de plongée s’ils ne savent pas si leur +ordinateur de plongée recharge ou non ses batteries lorsqu’il est connecté +au port USB.</td> </tr></table> </div> -<div class="paragraph"><p>To import dive information from a dive computer to a computer with -<em>Subsurface</em>, the two pieces of equipment must communicate with one -another. This involves setting up the communications port (or mount point) -of the computer with <em>Subsurface</em> that communicates with the dive -computer. To set up this communication, users need to find the appropriate -information to instruct <em>Subsurface</em> where and how to import the dive -information. -<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix -A</a> provides the technical information to help the user achieve this for -different operating systems and -<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix -B</a> has dive computer specific information.</p></div> -<div class="paragraph"><p>After this, the dive computer can be hooked up to the user’s PC using these -steps:</p></div> +<div class="paragraph"><p>Pour importer les informations depuis un ordinateur de plongée vers un +ordinateur utilisant <em>Subsurface</em>, les deux pièces d'équipement doivent +communiquer entre elles. Ceci implique la configuration des ports de +communication (ou point de montage) de l’ordinateur sur lequel tourne +<em>Subsurface</em> qui communique avec l’ordinateur de plongée. Pour configurer +cette communication, les utilisateurs doivent trouver l’information +appropriée pour renseigner à <em>Subsurface</em> d’où et comment importer les +informations de +plongée. +<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Annexe +A</a> donne les informations techniques pour aider l’utilisateur à configurer +ceci pour les différents systèmes d’exploitation et +<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Annexe +B</a> contient des informations spécifiques à chaque ordinateur de plongée.</p></div> +<div class="paragraph"><p>Après ceci, l’ordinateur de plongée peut être branché au PC de l’utilisateur +en suivant ces étapes:</p></div> <div class="olist arabic"><ol class="arabic"> <li> <p> -The interface cable should be connected to a free USB port (or the Infra-red - or Bluetooth connection set up as described later in this manual) +Le cable d’interface doit être connecté à un port USB libre (ou une + connection infrarouge + ou Bluetooth doit être configurée comme décrit ultérieurement dans ce + manuel) </p> </li> <li> <p> -The dive computer should be placed into PC Communication mode. +L’ordinateur de plongée doit être placé en mode Communication PC. (Se reporter au manuel de l’ordinateur de plongée) </p> </li> <li> <p> -In <em>Subsurface</em>, from the Main Menu, select <em>Import → Import From Dive - Computer</em>. Dialogue <strong>A</strong> in the figure below appears: +Dans <em>Subsurface</em>, depuis le menu principal, sélectionner <em>Importer → + Importer depuis l’ordinateur de plongée</em>. La boîte de dialogue <strong>A</strong> apparaît + comme sur la figure ci-dessous: </p> </li> </ol></div> @@ -861,208 +886,225 @@ In <em>Subsurface</em>, from the Main Menu, select <em>Import → Import Fro <img src="images/DC_import_f20.jpg" alt="FIGURE: Download dialogue 1" /> </div> </div> -<div class="paragraph"><p>Dive computers tend to keep a certain number of dives in memory, even though -these dives have already been imported to <em>Subsurface</em>. For that reason, if -the dive computer allows this, <em>Subsurface</em> only imports dives that have not -been downloaded before. This makes the download process faster on most dive -computers and also saves battery power of the dive computer (at least for -those not charging while connected via USB).</p></div> +<div class="paragraph"><p>Les ordinateurs de plongée gardent généralement un certain nombre de +plongées en mémoire, même si ces plongées ont déjà été importées dans +<em>Subsurface</em>. Pour cette raison, si l’ordinateur de plongée le permet, +<em>Subsurface</em> importe uniquement les plongées qui n’ont pas été téléchargées +précédemment. Cela accélère le processus de téléchargement sur la plupart +des ordinateurs de plongée et cela économise la batterie de l’ordinateur de +plongée (en tout cas pour ceux qui ne se rechargent pas via USB).</p></div> <div class="ulist"><ul> <li> <p> -The dialogue has two drop-down lists, <strong>Vendor</strong> and <strong>Dive Computer</strong>. On the - <strong>vendor</strong> drop-down list select the make of the computer, e.g. Suunto, - Oceanic, Uwatec, Mares. On the <strong>Dive Computer</strong> drop-down list, the model - name of the dive computer must be selected, e.g. D4 (Suunto), Veo200 - (Oceanic), or Puck (Mares). +La boîte de dialogue propose deux menus déroulants, <strong>Fournisseur</strong> et + <strong>Ordinateur de plongée</strong>. Dans le menu déroulant <strong>Fournisseur</strong>, sélectionnez + la marque de l’ordinateur, p. ex. Suunto, Oceanic, Uwatec, Mares. Dans le + menu déroulant <strong>Ordinateur de plongée</strong>, le nom du modèle doit être + sélectionné, p. ex. D4 (Suunto), Veo200 (Oceanic), ou Puck (Mares). </p> </li> <li> <p> -The <strong>Device or Mount Point</strong> drop-down list contains the USB or Bluetooth - port name that <em>Subsurface</em> needs in order to communicate with the dive - computer. The appropriate port name must be selected. Consult - <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix - A</a> and - <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix - B</a> for technical details on how to find the appropriate port information for - a specific dive computer and, in some cases, how to do the correct settings - to the operating system of the computer on which <em>Subsurface</em> is running. +Le menu déroulant <strong>Périphérique ou point de montage</strong> le nom du port USB ou + Bluetooth dont <em>Subsurface</em> a besoin pour communiquer avec l’ordinateur de + plongée. Le port approprié doit être sélectionné. Consultez + <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Annexe + A</a> et + <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Annexe + B</a> pour obtenir des détails techniques sur la façon de trouver des + informations sur le port approprié à chaque ordinateur de plongée et, dans + certains cas, sur les réglages requis pour le système d’exploitation de + l’ordinateur sur lequel <em>Subsurface</em> fonctionne. </p> </li> <li> <p> -If all the dives on the dive computer need to be downloaded, check the - checkbox <em>Force download of all dives</em>. Normally, <em>Subsurface</em> only - downloads dives after the date-time of the last dive in the <strong>Dive List</strong> - panel. If one or more of your dives in <em>Subsurface</em> has been accidentally - deleted or if there are older dives that still need to be downloaded from - the dive computer, this box needs to be checked. Some dive computers - (e.g. Mares Puck) do not provide a contents list to <em>Subsurface</em> before the - download in order to select only new dives. Consequently, for these dive - computers, all dives are downloaded irrespective of the status of this check - box. +Si toutes les plongées de l’ordinateur de plongée doivent être téléchargées, + cochez la case <em>Forcer le téléchargement de toutes les + plongées</em>. Normalement, <em>Subsurface</em> télécharge uniquement les plongées + postérieures à la date et heure de la dernière plongée du panneau <strong>Liste des + plongées</strong>. Si une ou plusieurs de vos plongées ont été accidentellement + effacées de <em>Subsurface</em> ou si des plongées plus anciennes doivent encore + être téléchargées depuis l’ordinateur de plongée, cette case doit être + cochée. Certains ordinateurs de plongée (p. ex. Mares Puck) ne proposent pas + de liste à <em>Subsurface</em> avant le téléchargement qui permettrait de n’en + sélectionner que certaines. Par conséquent, pour ces ordinateurs de + plongées, toutes les plongées sont téléchargées quel que soit le statut de + cette case à cocher. </p> </li> <li> <p> -If the checkbox <em>Always prefer downloaded dives</em> has been checked and, - during download, dives with identical date-times exist on the dive computer - and on the <em>Subsurface</em> <strong>Dive List</strong> panel, the dive in the <em>Subsurface</em> - divelog will be overwritten by the dive record from the computer. +Si la case <em>Toujours préférer les plongées téléchargées</em> a été cochée et + que, durant le téléchargement, des plongées avec date et heure identiques se + trouvent sur l’ordinateur de plongée et dans le panneau <strong>Liste des plongées</strong> + de <em>Subsurface</em>, la plongée dans le carnet de <em>Subsurface</em> sera écrasée par + l’enregistrement de l’ordinateur de plongée. </p> </li> <li> <p> -The checkbox marked <em>Download into new trip</em> ensures that, after upload, the - downloaded dives are grouped together as a new trip(s) in the <strong>Dive List</strong>. +La case à cocher <em>Télécharger dans un nouveau voyage</em> assure que, après + l’importation, les plongées téléchargées seront regroupées ensemble dans un + nouveau voyage dans la <strong>Liste des plongées</strong>. </p> </li> <li> <p> -Do <strong>not</strong> check the checkboxes labelled <em>Save libdivecomputer logfile</em> and - <em>Save libdivecomputer dumpfile</em>. These are only used as diagnostic tools - when there are problems with downloads(see below). +Ne cochez <strong>pas</strong> les cases nommées <em>Sauvegarder le fichier log de + libdivecomputer</em> et <em>Sauvegarder le fichier de données brutes de + libdivecomputer</em>. Elles sont uniquement utilisées comme outils de diagnostic + lorsque des problèmes de téléchargement se présentent (voir ci-dessous). </p> </li> <li> <p> -Then select the <em>Download</em> button. With communication established, you can - see how the data are retrieved from the dive computer. Depending on the - make of the dive computer and/or number of recorded dives, this could take - some time. Be patient. The <em>Download</em> dialogue shows a progress bar at the - bottom of the dialogue. Remember for some dive computers progress - information could be inaccurate since <em>Subsurface</em> doesn’t know how much - downloadable data there are until the download is complete. After the dives - have been downloaded, they appear in a tabular format on the right-hand side - of the dialogue (see image <strong>B</strong>, above). Each dive comprises a row in the - table, showing the date, duration and depth. Next to each dive is a - checkbox: check all the dives that need to be transferred to the <strong>Dive - List</strong>. In the case of the image above, the last six dives are checked and - will be transferred to the <strong>Dive List</strong>. Then click the <em>OK</em> button at the - bottom of the dialogue. All the imported dives appear in the <strong>Dive List</strong>, - sorted by date and time. Disconnect and switch off the dive computer to - conserve its battery power. +Ensuite, cliquez sur le bouton <em>Télécharger</em>. Une fois la communication + établie, vous pouvez voir comment les données sont récupérées depuis + l’ordinateur de plongée. Selon la marque de l’ordinateur de plongée et/ou le + nombre de plongées enregistrées, cela peut prendre un certain temps. Soyez + patient. En bas de la boîte de dialogue de <em>Téléchargement</em>, vous trouverez + une barre de progression. Rappelez-vous que pour certains ordinateurs de + plongée, l’information de progression peut être incorrecte, puisque + <em>Subsurface</em> ne connait pas la quantité de données à télécharger tant que le + téléchargement n’est pas terminé. Après le téléchargement des plongées, + elles apparaissent sous forme de tableau dans la partie droite de la boîte + de dialogue (voir image <strong>B</strong>, ci-dessus). Chaque plongée comporte une rangée + dans le tableau, montrant la date, la durée et la profoneur. À côté de + chaque plongée se trouve une case à cocher: cochez toutes les plongées qui + doivent être transférées vers la <strong>Liste des plongées</strong>. Dans le cas de + l’image ci-dessus, les six dernières plongées sont cochées et seront + transférées vers la <strong>Liste des plongées</strong>. Cliquez ensuite sur le bouton <em>OK</em> + en bas de la boîte de dialogue. Toutes les plongées importées apparaissent + dans la <strong>Liste des plongées</strong>, classées par date et heure. Déconnectez et + éteignez l’ordinateur de plongée pour économiser sa batterie. </p> </li> <li> <p> -If there is a problem in communicating with the dive computer, an error - message is shown, similar to this text: "Unable to open /dev/ttyUSB0 Mares - (Puck Pro)". Refer to the text in the box below. +S’il y a un problème de communication avec l’ordinateur de plongée, un + message d’erreur s’affiche, semblable à ce texte: "Impossible d’ouvrir + /dev/ttyUSB0 Mares (Puck Pro)". Rapportez-vous au texte dans le boîte de + dialogue ci-dessous. </p> </li> </ul></div> <div class="sidebarblock"> <div class="content"> -<div class="paragraph"><p><strong>PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?</strong></p></div> +<div class="paragraph"><p><strong>PROBLÈMES AVEC LE TÉLÉCHARGEMENT DES DONNÉS DE L’ORDINATEUR DE PLONGÉE?</strong></p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <img src="images/icons/important.png" alt="Important" /> </td> -<td class="content">Check the following:</td> +<td class="content">Vérifiez les éléments suivants:</td> </tr></table> </div> <div class="ulist"><ul> <li> <p> -Is the dive computer still in PC-communication or Upload mode? +L’ordinateur de plongée est-il en mode Communication PC ou Téléchargement? </p> </li> <li> <p> -Is the dive computer’s battery fully charged? If not then charge or replace - it. +La batterie de l’ordinateur de plongée est-elle complètement chargée? Si ce + n’est pas le cas, chargez-la ou remplacez-la. </p> </li> <li> <p> -Is the connecting cable faulty? Does the cable work using other software? - Has it worked before, or is this the first time the cable is being used? Are - the contacts on the dive computer and the cable clean? +Le câble de connection est-il fautif? Le câble fonctionne-t-il avec d’autres + logiciels? A-t-il fonctionné précédemment, ou est-ce la première fois que ce + câble est utilisé? Les contacts sur l’ordinateur de plongée et le câble + sont-ils propres? </p> </li> <li> <p> -Consult - <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix - A</a> to be sure the correct Mount Point was specified (see above). +Consultez + <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Annexe + A</a> pour être certain que le point de montage correct a été spécifié (voir + ci-dessus). </p> </li> <li> <p> -On Unix-like operating systems, does the user have write permission to the - USB port? If not, consult - <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix +Sur les systèmes d’exploitation de type Unix, l’utilisateur a-t-il les + droits d'écriture sur le port USB? Si non, consultez + <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Annexe A</a> </p> </li> </ul></div> -<div class="paragraph"><p>If the <em>Subsurface</em> computer does not recognize the USB adaptor by showing -an appropriate device name next to the Mount Point, then there is a -possibility the cable or USB adaptor is faulty. A faulty cable is the most -common cause of communication failure between a dive computer and -<em>Subsurface</em>. It’s also possible <em>Subsurface</em> cannot interpret the -data. Perform a download for diagnostic purposes with the following two -boxes checked in the download dialogue discussed above:</p></div> +<div class="paragraph"><p>Si l’ordinateur utilisant <em>Subsurface</em> ne reconnaît pas l’adaptateur USB en +ne montrant pas le bon nom de périphérique à côté du Point de monage, il est +possible que le câble ou l’adaptateur USB soit fautif. Un câble défectueux +est la cause la plus courante de problème de communication entre un +ordinateur de plongée et <em>Subsurface</em>. Il est également possible que +<em>Subsurface</em> ne puisse pas interpréter les données. Réalisez un +téléchargement de diagnostic en cochant les deux cases suivantes dans la +boîte de dialogue de téléchargement décrite ci-dessus:</p></div> <div class="literalblock"> <div class="content"> <pre><code>Save libdivecomputer logfile Save libdivecomputer dumpfile</code></pre> </div></div> -<div class="paragraph"><p><strong>Important</strong>: These check boxes are only used when problems are encountered -during the download process. Under normal circumstances they should not be checked. -When checking these boxes, the user is prompted to select a folder where the information will be saved. The default folder is the one in which the -<em>Subsurface</em> -dive log is kept.</p></div> -<div class="paragraph"><p><strong>Important:</strong> <em>After downloading with the above checkboxes -checked, no dives are added to the -<strong>Dive List</strong> but two files are created in the folder selected above</em>:</p></div> +<div class="paragraph"><p><strong>Important</strong>: ces cases à cocher ne doivent être utilisées qu’en cas de problème +durant le processus de téléchargement. En temps normal, elles ne doivent pas être cochées. +En cochant ces cases, l’utilisateur doit sélectionner un dossier où l’information sera enregistrée. Le dossier par défaut est celui dans lequel +le carnet de +<em>Subsurface</em> est stocké.</p></div> +<div class="paragraph"><p><strong>Important:</strong> <em>après un téléchargement avec les cases ci-dessus +cochées, aucune plongée n’est ajoutée à la +<strong>Liste des plongées</strong> mais deux fichiers sont créés dans le dossier sélectionné précédemment</em>:</p></div> <div class="literalblock"> <div class="content"> <pre><code>subsurface.log subsurface.bin</code></pre> </div></div> -<div class="paragraph"><p>These files should be send to the <em>Subsurface</em> mail list: -<em>subsurface@subsurface-divelog.org</em> with a request for the files to be -analyzed. Provide the dive computer make and model as well as contextual -information about the dives recorded on the dive computer.</p></div> +<div class="paragraph"><p>Ces fichiers doivent être envoyés à la liste de diffusion de <em>Subsurface</em>: +<em>subsurface@subsurface-divelog.org</em> avec une demande d’analyse des +fichieres. Précisez la marque et le modèle de l’ordinateur ainsi que des +informations relatives aux plongées enregistrées sur l’ordinateur de +plongée.</p></div> </div></div> </div> <div class="sect3"> -<h4 id="S_Bluetooth">5.2.2. Connecting <em>Subsurface</em> to a Bluetooth-enabled dive computer</h4> -<div class="paragraph"><p>Bluetooth is becoming a more common way of communication between dive -computers and <em>Subsurface</em>, for or instance, the Shearwater Petrel Mk2 and -the OSTC Mk3. <em>Subsurface</em> provides a largely operating system independent -Bluetooth interface. Setting up <em>Subsurface</em> for Bluetooth communication -requires four steps:</p></div> +<h4 id="S_Bluetooth">5.2.2. Connection de <em>Subsurface</em> à un ordinateur de plongée équipé de Bluetooth</h4> +<div class="paragraph"><p>Bluetooth devient un protocole de communication de plus en plus courant pour +relier des ordinateurs de plongée à <em>Subsurface</em>, par exemple le Shearwater +Petrel Mk2 et l’OSTC Mk3. <em>Subsurface</em> propose une interface Bluetooth +largement indépendante du système d’exploitation. La configuration de +<em>Subsurface</em> pour la liaison Bluetootj nécessite quatre étapes:</p></div> <div class="ulist"><ul> <li> <p> -Ensure Bluetooth is activated on the host computer running <em>Subsurface</em>. +Vérifiez que Blutooth est activé sur l’ordinateur sur lequel <em>Subsurface</em> + est actif. </p> </li> <li> <p> -Ensure <em>Subsurface</em> sees the Bluetooth adapter on the host computer. +Vérifiez que <em>Subsurface</em> détecte l’adaptateur Bluetooth de l’ordinateur. </p> </li> <li> <p> -Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in - PC upload mode. +Vérifiez que l’ordinateur de plongée Bluetooth est détectable et en mode + Connection PC. </p> </li> <li> <p> -Ensure <em>Subsurface</em> is paired with the Bluetooth-enabled dive computer. +Vérifiez que <em>Subsurface</em> est jumelé avec l’ordinateur de plongée Bluetooth. </p> </li> </ul></div> -<div class="paragraph"><p>Select the Download dialogue by selecting <em>Import → Import from dive -computer</em> from the <strong>Main Menu</strong>. After checking the box labelled <em>"Choose -Bluetooth download mode"</em>, the dialogue below appears.</p></div> +<div class="paragraph"><p>Faites apparaître la boîte de dialogue de téléchargement en sélectionnant +<em>Importer → Importer depuis l’ordinateur de plongée</em> depuis le <strong>Menu +principal</strong>. Après avoir coché la case <em>"Choisir le mode de téléchargement +Bluetooth"</em>, la boîte de dialogue ci-dessous apparaît.</p></div> <div class="sect4"> <h5 id="_sur_linux_ou_macos">Sur Linux ou MacOS :</h5> <div class="imageblock" style="text-align:center;"> @@ -1070,34 +1112,38 @@ Bluetooth download mode"</em>, the dialogue below appears.</p></div> <img src="images/DC_import_Bluetooth.jpg" alt="FIGURE: Download Bluetooth" /> </div> </div> -<div class="paragraph"><p>On the <em>Linux</em> or <em>MacOS</em> platforms the name of the <em>Subsurface</em> computer -and its Bluetooth address are shown on the right hand side, On the left hand -side, if the computer has connected more than one local Bluetooth devices -you can use the list box to indicate which one needs to connect to -<em>Subsurface</em>. The power state (on/off) of the Bluetooth adapter is shown -below the address and can be changed by checking the <em>Turn on/off</em> box. If -the Bluetooth address is not shown, then <em>Subsurface</em> does not see the local -Bluetooth device. Ensure the Bluetooth driver is installed correctly on the -<em>Subsurface</em> computer and check if it can be used by other Bluetooth -utilities like <em>bluetoothctl</em> or <em>bluemoon</em>. This completes the first two -steps above. Ensure the Bluetooth-enabled dive computer is in PC-upload -mode and it is discoverable by other Bluetooth devices. Consult the manual -of the dive computer for more information. Now the third item in the list -above has been finished. Select the <em>Scan</em> button towards the bottom left -of the dialogue above. After searching, the dive computer should be listed -(perhaps as one of a number of Bluetooth devices) in the main list box on -the lefthand side of the dialogue (see image above). If this does not work, -select the <em>Clear</em> button, then scan again for Bluetooth devices using the -<em>Scan</em> button. After taking these actions <em>Subsurface</em> should see the dive -computer. The label of the discovered dive computer contains the name of -the device, its address and its pairing status. If the device is not paired -and has a red background color, a context menu can be opened by selecting -the item with a right-click. Select the the <em>Pair</em> option and wait for the -task to complete. If this dive computer is being paired to Subsurface for -the first time, it’s possible Subsurface will request a Pass Code or PIN -number. The most commonly-used Pass Code is 0000, and this works for the -Shearwater Petrel. If necessary, consult the user manual of the dive -computer being used.</p></div> +<div class="paragraph"><p>Sur les plateformes <em>Linux</em> ou -MacOS_, le nom de l’ordinateur utilisant +Subsurface_ et son adresse Bluetooth sont affichées du côté droit. À gauche, +si l’ordinateur a été connecté à plusieurs périphériques Bluetootj locaux, +vous pouvez utiliser la liste pour indiquer lequel doit être connecté à +°Subsurface_. L'état (allumé/éteint) de l’adaptateur Bluetooth est affiché +sous l’adresse et peut être modifié en cliquer sur la case +<em>Allumer/éteindre</em>. Si l’adresse Bluetooth n’est pas affichée, <em>Subsurface</em> +ne détecte pas le périphérique Bluetooth local. Assurez-vous que le driver +Bluetooth est installé correctement sur l’ordinateur utilisant <em>Subsurface</em> +et vérifiez qu’il peut être utilisé par d’autres utilitaires Bluetooth comme +<em>bluetoothctl</em> ou <em>bluemoon</em>. Ceci clôture les deux premières étapes. +Vérifiez que l’ordinateur de plongée avec Bluetooth est en mode Connection +PC et est détactable pour d’autres périphériques Bluetooth. Consultez le +manuel de l’ordinateur de plongée pour plus d’information. À présent, la +troisième étape de notre liste est terminée. Sélectionnez le bouton +<em>Scannez</em> en bas à gauche de la boîte de dialogue ci-dessus. Après la +recherche, l’ordinateur de plongée devrait se trouver dans la liste +(peut-être sous la norme d’un numéro de périphérique Bluetooth) dans la +liste principale sur la gauche de la boîte de dialogue (voir image +ci-dessus). Si cela ne fonctionne pas, sélectionnez le bouton <em>Effacer</em>, +puis scannez à nouveau en utilisant le bouton <em>Scan</em>. Après avoir suivi +cette procédure, <em>Subsurface</em> devrait voir l’ordinateur de plongée. La +dénomination de l’ordinateur de plongée détecté contient le nom du +périphérique, son adresse et son statut de jumelage. Si le périphérique +n’est pas jumelé et que son nom est affiché avec un arrière-plan rouge, un +menu contextuel peut être ouvert en sélectionnant ce nom avec un cli-droit. +Sélectionnez l’option <em>Jumeler</em> et attendez que la tâche soit terminée. Si +l’ordinateur est jumelé à Subsurface pour la première fois, il est possible +que Subsurface demande un nombre ou un code PIN. Le plus utilisé est 0000, +et c’est celui qui fonctionne pour un Shearwater Petrel. Si nécessaire, +consultez le manuel utilisateur de l’ordinateur de plongée que vous +utilisez.</p></div> <div class="sidebarblock"> <div class="content"> <div class="admonitionblock"> @@ -1105,12 +1151,13 @@ computer being used.</p></div> <td class="icon"> <img src="images/icons/important.png" alt="Important" /> </td> -<td class="content">Currently <em>Subsurface</em> does not support Bluetooth pairing with dive -computers that require a custom PIN code. In order to pair the devices, use -other OS utilities as suggested below.</td> +<td class="content">Actuellement, <em>Subsurface</em> ne supporte par le jumelage Bluetooth avec les +ordinateurs de plongée qui nécessitent un code PIN personnalisé. Pour +jumeler ces périphériques, utiliser les utilitaires du système +d’exploitation comme suggéré ci-dessous.</td> </tr></table> </div> -<div class="paragraph"><p>One way to achieve this is to use <code>bluetoothctl</code>:</p></div> +<div class="paragraph"><p>Une façon d’y parvenir est d’utiliser <code>bluetoothctl</code>:</p></div> <div class="literalblock"> <div class="content"> <pre><code>$ bluetoothctl @@ -1125,10 +1172,12 @@ Request PIN code [agent] Enter PIN code: 0000</code></pre> </div></div> </div></div> -<div class="paragraph"><p>After the devices are paired, press the <em>Save</em> button of the dialogue. This -closes the Bluetooth dialogue. Now select <em>Download</em> in the <em>Download from -dive computer</em> dialogue which should still be open. The downloaded dives are -shown on the righthand side of the download dialogue.</p></div> +<div class="paragraph"><p>Une fois que les péréphériques sont jumelés, cliquer sur le bouton +<em>Enregistrer</em> de la boîte de dialogue. Ceci fermera la boîte de dialogue +Bluetooth. Ensuite, sélectionnez <em>Télécharger</em> dans la boîte de dialogue +<em>Télécharger depuis l’ordinateur de plongée</em> qui devrait encore être +ouverte. Les plongées téléchargées sont affichées dans la partie droite de +la boîte de dialogue de téléchargement.</p></div> </div> <div class="sect4"> <h5 id="_sur_windows">Sur Windows :</h5> @@ -1137,335 +1186,356 @@ shown on the righthand side of the download dialogue.</p></div> <img src="images/DC_import_Bluetooth_Windows.png" alt="FIGURE: Download Bluetooth on Windows" /> </div> </div> -<div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the -right is not displayed as is the case on the Linux/Mac systems. To start a -scan (by pressing the <em>Scan</em> button) check that the Bluetooth device on the -<em>Subsurface</em> computer is turned on by selecting the dive computer from the -list of available Bluetooth devices (see image above). If the dive computer -is being accessed by Subsurface for the first time, it’s possible Subsurface -will request a Pass Code or PIN number. Supply the Pass Code recommended in -the user manual of the dive computer. A Pass Code or PIN of 0000 is often -the default.</p></div> -<div class="paragraph"><p>The pairing step is checked and done automatically during the download -process. If the devices have never been paired the system will ask -permission and put a message on the right side of the screen: <em>Add a device, -Tap to set up your DC device</em>. Always allow this pairing. After a discovered -item is selected, select the <em>Save</em> button. Finally select the <em>Download</em> -button on the <em>Download</em> dialogue and wait for the process to complete.</p></div> +<div class="paragraph"><p>Sous <em>Windows</em>, les <em>Détails du périphérique Bluetooth local</em> à droite ne +sont pas affichés comme dans les sytèmes Linux/Mac. Pour démarrer un scan +(en appuyant sur le bouton <em>Scan</em>), vérifiez que le périphérique Bluetooth +sur l’ordinateur de <em>Subsurface</em> est activé en sélectionnant l’ordinateur de +plongée dans la liste des périphériques Bluetooth disponibles (voir image +ci-dessus). Si l’ordinateur de plongée est connecté à Subsurface pour la +première fois, il est possible que Subsurface demande un nombre ou un code +PIN. Entrez le code indiqué dans le manuel utilisateur de l’ordinatuer de +plongée. Un code ou PIN de 0000 est souvent le code par défaut.</p></div> +<div class="paragraph"><p>L'étape de jumelage est vérifiée et réalisée automatiquement durant le +processus de téléchargement. Si les périphériques n’ont pas encore été +jumelés, le système demandera l’autorisation de le faire et affichera un +message sur la partie droite de l'écran. <em>Ajouter un périphérique</em>, <em>Tapez +pour configurer votre périphérique</em>. <em>Toujours autoriser le jumelage. Après +la sélection d’un item découvert, cliquez sur le bouton +_Enregistrer</em>. Enfin, sélectionnez le bouton "Télécharger_ dans la boîte de +dialogue de téléchargement et attendez la fin du processus.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <img src="images/icons/important.png" alt="Important" /> </td> -<td class="content">Currently <em>Subsurface</em> works only with local Bluetooth adapters which use -Microsoft Bluetooth Stack. If the local device uses <em>Widcomm</em>, <em>Stonestreet -One Bluetopia Bluetooth</em> or <em>BlueSoleil</em> drivers it will not work. However, -Bluetooth hardware/dongles from these manufacturers (e.g. iSonic) that -support the Microsoft Bluetooth Stack do work.</td> +<td class="content">Actuellement, <em>Subsurface</em> ne fonctionne qu’avec les adaptateurs Bluetooth +locaux qui utilisent Microsoft Bluetooth Stack. Si le périphérique local +utilise des drivers <em>Widcomm</em>, <em>Stonestreet One Bluetopia Bluetooth</em> ou +<em>BlueSoleil</em>, cela ne fonctionnera pas. Cependant, les clés/dongles de ces +fabricants (p. ex. iSonic) qui supportent le Microsoft Bluetooth Stack +fonctionneront.</td> </tr></table> </div> -<div class="paragraph"><p>A log message on the bottom left of the <em>Remote Bluetooth device selection</em> -shows details about the current status of the Bluetooth agent. To select -another dive computer for download using the "Remote Bluetooth selection -dialogue" press the three-dots button from the <em>"Choose Bluetooth download -mode"</em> option.</p></div> +<div class="paragraph"><p>Un journal de message (log) en bas à gauche de la <em>sélection de périphérique +Bluetooth distant</em> affiche des détails sur le statut actuel du l’agent +Bluetooth. Pour sélectionner un autre ordinateur de plongée utilisant la +"boîte de dialogue de sélection Bluetooth distant", cliquez sur le bouton +avec trois points à côté de l’option <em>"Choisir le mode de téléchargement +Bluetooth"</em>.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <img src="images/icons/important.png" alt="Important" /> </td> -<td class="content"><strong>IN CASE OF PROBLEMS</strong>: If the Bluetooth adapter from the <em>Subsurface</em> computer -gets stuck and the <em>Download</em> process fails repeatedly, - <em>unpair</em> the devices and then repeat the above steps. If this is not successful, - <a href="#S_HowFindBluetoothDeviceName"><em>Appendix A</em></a> contains -information for manually setting up and inspecting the Bluetooth connection -with <em>Subsurface</em>.</td> +<td class="content"><strong>EN CAS DE PROBLÈMES</strong>: si l’adaptateur Bluetooth de l’ordinateur utilisant <em>Subsurface</em> +se bloque et que le processus de <em>téléchargement</em> échoue de façon répétée, + <em>dissociez</em> les périphériques et répétez les étapes ci-dessus. Si cela ne fonctionne pas, + l' <a href="#S_HowFindBluetoothDeviceName"><em>Annexe A</em></a> contient +des informations sur la configuration manuelle et la vérification de la connection Bluetooth +avec <em>Subsurface</em>.</td> </tr></table> </div> </div> </div> <div class="sect3"> -<h4 id="S_DeviceNames">5.2.3. Changing the name of a dive computer</h4> -<div class="paragraph"><p>It may be necessary to distinguish between different dive computers used to -upload dive logs to <em>Subsurface</em>. For instance if a buddy’s dive computer is -the same make and model as your own and dive logs are uploaded from both -dive computers to the same <em>Subsurface</em> computer, then you might like to -call one "Alice’s Suunto D4" and the other "Bob’s Suunto D4". Alternatively, -consider a technical diver who dives with two or more dive computers of the -same model, the logs of both (or all) being uploaded. In this case it might -be prudent to call one of them "Suunto D4 (1)" and another "Suunto D4 -(2)". This is easily done in <em>Subsurface</em>. On the <strong>Main Menu</strong>, select <em>Log -→ Edit device names</em>. A dialog box opens, showing the current Model, ID and -Nickname of the dive computers used for upload. Edit the Nickname field for -the appropriate dive computer. After saving the Nickname, the dive logs show -the nickname for that particular device instead of the model name, allowing -easy identification of devices.</p></div> +<h4 id="S_DeviceNames">5.2.3. Changement du nom d’un ordinateur de plongée</h4> +<div class="paragraph"><p>Il peut être nécessaire d'établir une distinction entre différents +ordinateurs de plongée utilisés pour télécharger des données de plongée vers +<em>Subsurface</em>. Par exemple, si l’ordinateur d’un équipier provient du même +fabriquant et est dun même modèle que le votre et que les données sont +téléchargées vers le même ordinateur utilisant <em>Subsurface</em>, vous voudirez +sans doute en appeler un "Suunto D4 d’Alice" et l’autre "Suunto D4 de +Bob". Ou encore, imaginez un plongeur Tek qui plonge avec deux ordinateurs +ou plus; les données pourraient toutes être téléchargées. Dans ce cas, il +serait prident de les appeler "Suunto D4 (1)" et "Suunto D4 (2)". Ceci est +facilement réalisable dans <em>Subsurface</em>. Dans le <strong>Menu principal</strong>, +sélectionnez <em>Journal → Éditer les noms des ordinateurs de plongée</em>. Une +boîte de dialogue s’ouvre, affichant le modèle actuel, son ID et le nom des +ordinateurs utilisés pour le téléchargement. Éditez le champ Nom de +l’ordinateur de plongée concerné. Après avoir sauvegardé le Nom, le journal +de plongée affiche le nom de l’ordinateur concerné à la place du nom du +modèle, permettant une identification plus facile des périphériques.</p></div> </div> <div class="sect3"> -<h4 id="S_MultipleDiveComputers">5.2.4. Uploading data for a specific dive from more than one dive computer</h4> -<div class="paragraph"><p>Some divers use more than one dive computer at the same time, e.g. during -technical diving. If you import the dive profiles from these different dive -computers into <em>Subsurface</em>, the profiles can be viewed -independently. During upload the data from the dive computers are -automatically merged into a single dive. The different profiles are -presented on the <em>Profile</em> panel with the name of each dive computer -indicated at the bottom left. <strong>While the dive is highlighted in the <em>Dive -List</em></strong>, switch between the profiles of the different dive computers by using -either the left/right arrow keyboard keys or by selecting <em>View → Previous -DC</em> or <em>View → Next DC</em>. The data in the <em>Notes</em> panel are not affected by -the specific dive computer that is selected.</p></div> +<h4 id="S_MultipleDiveComputers">5.2.4. Chargement des données d’une plongée spécifique depuis plusieurs ordinateurs de plongée</h4> +<div class="paragraph"><p>Certains plongeurs utilisent plus d’un ordinateur de plongée en même,temps, +par exemple en plongée technique. Si vous importez les profils de ces +différents ordinateurs de plongée dans <em>Subsurface</em>, les profils peuvent +être vu indépendemment. Pendant le téléchargement, les données de ces +ordinateurs de plongée sont automatiquement fusionnées en une seule +plongée. Les différents profils sont présentés dans le panneau <em>Profil</em> avec +le nom de chaque ordinateur de plongée indiqué en bas à gauche. <strong>Lorsque la +plongée est en surbrillance dans la <em>Liste des plongées</em></strong>, passez du profil +d’un ordinateur de plongée à l’autre en utilisant soit les flèches +gauche/droite du clavier, soit en sélectionnant <em>Vue Ordinateur précédent</em> +ou <em>Vue → Ordinateur suivant</em>. Les données du panneau <em>Notes</em> ne sont pas +affectées par le choix de l’un ou l’autre ordinateur de plongée.</p></div> </div> <div class="sect3"> -<h4 id="S_EditDiveInfo">5.2.5. Updating the dive information imported from the dive computer.</h4> -<div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive -computer is not complete and more details must be added to have a full -record of the dives. To do this, the <strong>Notes</strong> and the <strong>Equipment</strong> tabs on the -top left hand of the <em>Subsurface</em> window should be used.</p></div> +<h4 id="S_EditDiveInfo">5.2.5. Mise à jour de l’information importée depuis un ordinateur de plongée.</h4> +<div class="paragraph"><p>Une fois les plongées chargées dans la Liste des plongées, l’information +extraite de l’ordinateur de plongée n’est pas complète et d’autres détails +doivent être ajoutés pour obtenir un enregistrement complet des +plongées. Pour ce faire, les onglets <strong>Notes</strong> et <strong>Équipement</strong> et haut à +gauche de la fenêtre de <em>Subsurface</em> doivent être utilisés.</p></div> <div class="sect4"> <h5 id="S_Notes_dc">Notes</h5> -<div class="paragraph"><p>To have a more complete dive record, the user needs to add additional -information by hand. The procedure below is virtually identical for -hand-entered dives and for dives downloaded from a dive computer.</p></div> -<div class="paragraph"><p>In some cases, you must provide the date and time of the dive, for example -when entering a dive by hand or when a dive computer doesn’t provide the -date and time of the dive. (Usually the date and time of the dive, gas -mixture and water temperature are shown as obtained from the dive computer) -If the contents of the <strong>Notes tab</strong> is changed or edited in any way, the -message in a blue box at the top of the panel shows the dive is being -edited. If you click on the <strong>Notes</strong> tab, the following fields are visible -(left hand image, below):</p></div> +<div class="paragraph"><p>Pour obtenir un enregistrement plus comple de la plongée, l’utilisateur doit +ajouter manuellement certaines informations. La procédure expliquée +ci-dessous est quasiment identique pour les plongées entrées manuellement et +celles qui sont téléchargées depuis un ordinateur de plongée.</p></div> +<div class="paragraph"><p>Dans certains cas, vous devrez préciser la date et l’heure de la plongée, +par exemple lorsque vous entrez une plongée manuellement ou qu’un ordinateur +de plongée ne précise pas la date et l’heure de cette plongée. (D’habitude, +la date et l’heure d’une plongée, le mélange de gaz et la température de +l’eau sont obtenues via l’ordinateur de plongée). Si le contenu de l’onglet +<strong>Notes</strong> est modifié ou édité d’une quelconque manière, le message dans la +boîte bleue en haut du panneau affiche que la plongée a été éditée. Si vous +cliquez sur l’onglet <strong>Notes</strong>, les champs suivants sont visibles (voir image +en bas à gauche):</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/AddDive3_f22.jpg" alt="FIGURE: The Notes tab" /> </div> </div> -<div class="paragraph"><p>The right hand image, above, shows a <strong>Notes tab</strong> filled with dive -information. The <strong>Date</strong> and <strong>Time</strong> fields reflects the date and time of the -dive. By clicking the date, a calendar is displayed for selecting the -correct date. Press ESC to close the calendar. The time values (hour and -minutes) can also be edited directly by clicking on each of them in the text -box and by over-typing the information displayed.</p></div> -<div class="paragraph"><p><strong>Air/water temperatures</strong>: Air and water temperatures during the dive are shown -in text boxes to the right of the Start time. Many dive computers supply water -temperature information and this box may have information. -If air temperature isn’t provided by the dive computer, the first temperature reading -might be used for the air temperature. Generally this is close to the real air temperature. -If editing is required, only a value is required, the units of temperature will be -automatically supplied by -<em>Subsurface</em> (following the <em>Preferences</em>, metric or imperial units will -be used).</p></div> -<div class="paragraph" id="S_locations"><p><strong>Location</strong>:</p></div> +<div class="paragraph"><p>L’image à droite, ci-dessus, montre l’onglet <strong>Notes</strong> complété avec des +informations de plongée. Les champs <strong>Date</strong> et <strong>Heure</strong> indiquent la date et +l’heure de la plongée. En cliquant sur la date, un calendrier est afficher +pour sélectionner la date correcte. Appuyez sur la touche ESC pour fermer le +calendrier. Les valeurs d’heure (heure et minutes) peuvent également être +éditées directement en cliquant sur chacune d’entre elles dans la boîte de +texte et en remplaçant l’information qui s’y trouve.</p></div> +<div class="paragraph"><p><strong>Température de l’air/eau</strong>: les températures de l’air et de l’eau pendant la plongée sont affichées +dans des boîtes de texte à droite de l’heure de début de plongée. De nombreux ordinateurs de plongée +renseignent la température de l’eau, et cette boîte peut contenir cette information. +Si la température de l’air n’est pas renseignée par l’ordinateur de plongée, la première température pour l’eau +peut être utilisée comme température de l’air. En général, elle est proche de la température de l’air. +S’il est nécessaire d'éditer ces informations, seule une valeur est nécessaire, l’unité de température étant +automatiquement fournie par +<em>Subsurface</em> (sur base des <em>Préférences</em>, les unités métriques ou impériales +seront utilisées).</p></div> +<div class="paragraph" id="S_locations"><p><strong>Lieu</strong>:</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <img src="images/icons/warning2.png" alt="Warning" /> </td> -<td class="content">Dive locations are managed as a <strong>separate</strong> part of the dive log. The dive -information in the <strong>Notes</strong> and <strong>Equipment</strong> tabs can therefore NOT be edited -at the same time as the dive site information. Save all the other dive -information (e.g. divemaster, buddy, protective gear, notes about the dive) -by selecting <em>Apply changes</em> on the <strong>Notes</strong> tab BEFORE editing the dive site -information. Then supply a dive site name in the textbox labelled <em>Location</em> -on the <strong>Notes</strong> tab.</td> +<td class="content">Les lieux de plongée sont gérés comme une partie <strong>séparée</strong> du carnet de +plongée. Les informations de plongée dans les onglets <strong>Notes</strong> et +<strong>Équipement</strong> ne peuvent donc PAS être édités en même temps que les +informations sur le site de plongée. Enregistrez toutes les autres +informations (p. ex. instructeur, équipier, équipement, notes à propos de la +plongée) en sélectionnant <em>Appliquer les modifications</em> dans l’onglet +<strong>Notes</strong> AVANT d'éditer les informations sur le site de plongée. Ensuite, +nommez le site de plongée dans la bpîte de texte <em>Lieu</em> dans l’onglet +<strong>Notes</strong>.</td> </tr></table> </div> -<div class="paragraph"><p>Type in the name of the dive site, e.g. "Tihany, Lake Balaton, Hungary". If -several dives are made at the same location, the site information for the -first dive is re-used. Existing dive locations can be edited by selecting -(on the <strong>Dive List</strong> panel) a dive done at that site and by opening the -location information. Click the globe button on the right of the location -name (see image image <strong>A</strong> below). When typing the name of a dive site, a -dropdown list appears showing all sites with similar names. If the dive site -has been used before, click on the already-existing name. The dive site -names in the dropdown list contain either a globe symbol (indicating -existing dive sites in the <em>Subsurface</em> database) or a <strong>+</strong> symbol -(indicating dive site names that appear consistent with the current dive -site name but which haven’t been added to the dive site database). If the -present dive site has not been used before, a message appears as follows -(image <strong>A</strong> below):</p></div> +<div class="paragraph"><p>Entrez le nom du site de plongée, p. ex. "Tihany, Lac Balaton, Hongrie". Si +plusieurs plongées ont été faites au même endroit, les informations de lieu +de la première plongée sont ré-utilisées. Les lieux de plongée existants +peuvent être édités en sélectionnant (dans le panneau <strong>Liste des plongées</strong>) +une plongée faite sur ce site et en ouvrant les informations de cet +endroit. Cliquez sur le bouton avec une image de globe à droite du nom du +lieu (voir l’image <strong>A</strong> ci-dessous). Lorsque vous entrez le nom d’un site de +plongée, une liste déroulante apparaît, affichant tous les sites comportant +un nom similaire. Si le site de plongée a déjà été utilisé précédemment, +cliquez sur le nom existant. Les noms de sites de plongée présents dans la +liste contiennent soit un symbole en forme de globe (indiquant qu’ils sont +répertoriés comme lieux de plongée dans la base de données de <em>Subsurface</em>) +ou un symbole <strong>+</strong> (qui indique des noms de lieux de plongée qui semblent +consistant avec le nom du site courant mais qui n’ont pas encore été ajoutés +à la base de données). Si le site de plongée actuel n’a pas encore été +utilisé, un message apparaît comme suit (voir image <strong>A</strong> ci-dessous):</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Locations1_f22.jpg" alt="FIGURE:Location description panel" /> </div> </div> -<div class="paragraph"><p>Click the globe button and a panel appears to enter the coordinates and -other information about the site (image <strong>B</strong>, above). The most important -items are the coordinates of the site. There are three ways to specify -coordinates:</p></div> +<div class="paragraph"><p>Cliquez sur le bouton contenant une image de globe; un panneau apparaît +permettant d’entrer les coordonnées et d’autres informations concernant le +site (voir image <strong>B</strong> ci-dessus). Les informations les plus importantes sont +les coordonnées du site. Il y a trois façons de spécifier les coordonnées:</p></div> <div class="olist loweralpha"><ol class="loweralpha"> <li> <p> -Use the world map in the bottom right hand part of the <em>Subsurface</em> - window. The map displays an orange bar indicating "No location data - Move - the map and double-click to set the dive location". Doubleclick at the - appropriate place, and the orange bar disappears and the coordinates are - stored. +Utilisez la carte du monde en bas à droite de la fenêtre de + <em>Subsurface</em>. Cette carte affiche une barre orange indiquant "Pas de données + de localisation - Bougez la carte et double-cliquez pour définir le lieu de + plongée". Double-cliquez à l’endroit requis; la barre orange disparaît alors + et les coordonnées sont stockées. </p> </li> <li> <p> -Use eiher the Subsurface-Mobile App or the <em>Subsurface</em> Companion App on an - Android or iPhone device with GPS and if the dive site coordinates were - stored using one of these apps. <a href="#S_Companion">Click here for more - information</a> +Utiliser l’application Subsurface-Mobile ou l’application <em>Subsurface</em> + Companion avec un périphérique Android ou un iPhone avec GPS si les + coordonnées du site de plongée ont été stockées en utilisant une de ces + applications. <a href="#S_Companion">Cliquez ici pour plus d’information</a> </p> </li> <li> <p> -Enter coordiantes by hand if they are known, using one of four formats with - latitude followed by longitude: +Entrez les coordonnées manuellement si vous les connaissez, en utilisant un + des quatre formats avec la latitude suivie de la longitude: </p> <div class="literalblock"> <div class="content"> -<pre><code>ISO 6709 Annex D format e.g. 30°13'28.9"N 30°49'1.5"E Degrees and decimal -minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds, -e.g. N30° 13' 29.8" , E30° 49' 1.5" Decimal degrees, e.g. 30.22496 , +<pre><code>Format ISO 6709 Annexe D p. ex. 30°13'28.9"N 30°49'1.5"E Degrés et minutes +décimales, p. ex. N30° 13.49760' , E30° 49.30788' Degrés minutes secondes, +p. ex. N30° 13' 29.8" , E30° 49' 1.5" Degrés décimaux, p. ex. 30.22496 , 30.821798</code></pre> </div></div> </li> </ol></div> -<div class="paragraph"><p>Southern hemisphere latitudes are given with a <strong>S</strong>, e.g. S30°, or with a -negative value, e.g. -30.22496. Similarly western longitudes are given with -a <strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards -don’t have the degree sign (°). It can be replaced by a <strong>d</strong> like this: N30d -W20d. If both a dive site name and coordinates have been provided, save the -dive site information by selecting the button <em>Apply changes</em> at the top of -the panel.</p></div> -<div class="paragraph"><p><strong>Important</strong>: GPS coordinates of a dive site are linked to the location -name - so <strong>saving</strong> a dive site with only coordinates and no name -causes problems. (Subsurface will think all of these -dives have the same location and try to keep their GPS coordinates the -same).</p></div> -<div class="paragraph"><p><strong>Dive site name lookup:</strong> If you typed coordinates into the appropriate -text box, you can do an automated name lookup based on the coordinates. -This is done when <em>Subsurface</em> uses the Internet to find the name of the dive site -based on the coordinates that were typed. If a name has been found, it is -automatically inserted into the tags box. The list box -(Titled <em>Dive sites on same coordinates</em>") at the bottom -of the dive site panel contains the names of other dives sites used at the -current location. For instance if the dive site is "Blue Hole" and there are several -sites named "Blue Hole", all of them are listed.</p></div> -<div class="paragraph"><p>Enter any other contextual information about the dive site (Description and -Notes), then select <em>Apply Changes</em> to save the geolocation for this dive -site. The dive site information can later be edited by clicking the globe -icon to the right of the dive site name in the <strong>Notes tab</strong>.</p></div> -<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing you to choose the type of dive -performed. The options are OC (Open Circuit SCUBA, the default setting, for most recreational dives), -Freedive (dive without SCUBA equipment), CCR (Closed-circuit -rebreather) and pSCR (Passive semi-closed rebreather).</p></div> -<div class="paragraph"><p><strong>Divemaster</strong>: The name of the divemaster or dive guide should be -entered in this field -which offers auto selection based on the list of divemasters in -the current logbook.</p></div> -<div class="paragraph"><p><strong>Buddy</strong>: In this field, enter the name(s) of the buddy or buddies -(separated with commas) who were on the -dive. Auto selection based on the list of buddies in the current logbook is -offered.</p></div> -<div class="paragraph"><p><strong>Suit</strong>: Here the type of dive suit used can be entered. -Auto selection of the suit description is available. -Some dry-suit users may choose to use this field to record what combination of -suit and thermal under suit was used.</p></div> -<div class="paragraph"><p><strong>Rating</strong>: Provide a subjective overall rating of the dive on a -5-point scale by clicking the appropriate star on the rating scale.</p></div> -<div class="paragraph"><p><strong>Visibility</strong>: Provide a rating of visibility during the -dive on a 5-point scale by clicking the appropriate star.</p></div> -<div class="paragraph"><p><strong>Tags</strong>: Tags that describe the type of dive done can be entered -here (separated by commas). Examples of common tags are boat, drift, training, -cave, etc. -<em>Subsurface</em> has many built-in tags. By starting to type a tag, <em>Subsurface</em> lists -the tags that correspond to the typing. For instance, by typing -<code>cav</code>, the tags <strong>cave</strong> and <strong>cavern</strong> are shown to choose from.</p></div> -<div class="paragraph"><p><strong>Notes</strong>: Any additional information for the dive can be entered here.</p></div> -<div class="paragraph"><p>The <em>Apply changes</em> and <em>Discard changes</em> buttons are used to save all the -information for tabs in the <strong>Info</strong> panel and in the <strong>Dive Profile</strong> -panel. Use them when <strong>ALL</strong> other information has been added. The image -<a href="#S_Notes_dc">at the beginning of this section</a> shows an example of a -<strong>Notes tab</strong> after completing the dive information.</p></div> +<div class="paragraph"><p>Les latitudes dans l’hémisphère sud sont données avec un <strong>S</strong>, p. ex. S30°, +ou avec une valeur négative, p. ex. -30.22496. De la même façon, les +longitudes ouest sont données avec un <strong>W</strong>, p. ex. W07°, ou avec une valeur +négative, p. ex. -7.34323. Certains claviers ne comportent par le signe +degré (°). Il peut être remplacé par un <strong>d</strong> comme ceci: N30d W20d. Si le +nom du site de plongée et les coordonnées ont tous les deux été renseignés, +enregistrez les informations du site de plongée en sélectionnant le bouton +<em>Appliquer les modifications</em> en haut du panneau.</p></div> +<div class="paragraph"><p><strong>Important</strong>: les coordonnées GPS d’un site de plongée sont liées au nom de +lieu - ainsi, <strong>enregistrer</strong> un site de plongée avec uniquement les coordonnées mais aucun nom +causera des problèmes. (Subsurface pensera que toutes ces +plongées ont le même lieu et tentera de garder leurs coordonnées GPS +identiques).</p></div> +<div class="paragraph"><p><strong>Recherche du nom d’un site de plongée</strong>: si vous avez entré les coordonnées dans la boîte +de texte appropriée, vous pouvez lancer une recherche de nom sur base des coordonnées. +Ceci est réalisé lorsque <em>Subsurface</em> utilise Internet pour trouver le nom d’un site de plongée +sur base des coordonées que vous avez entrées. Si un nom est trouvé, il est +automatiquement inséré dans la boîte Étiquettes. La liste (intitulée <em>"Sites de plongée situés aux mêmes coordonnées</em>") en bas +du panneau du site de plongée contient les noms d’autres sites de plongée utilisés +au même endroit. Par exemple, si le site de plongée est "Blue Hole" et qu’il y a plusieurs +sites nommés "Blue Hole", ils seront tous listés.</p></div> +<div class="paragraph"><p>Entrez toute information contextuelle relative au site de plongée +(Description et Notes) puis sélectionnez <em>Appliquer les modifications</em> pour +enregistrer la géolocalisation du site de plongée. L’information concernant +le site de plongée peut être éditée ultérieurement en cliquant sur l’icone +en forme de globe à droite du nom du site de plongée dans l’onglet <strong>Notes</strong>.</p></div> +<div class="paragraph"><p><strong>Mode de plongée</strong>: cette liste déroulante vous permet de choisir le type de plongée +réalisée. Les options sont OC (scaphandre en circuit ouvert, le choix par défaut pour la plupart des plongées loisir), +Apnée (plongée sans scaphandre), CCR (recycleur +en circuit fermé) et pSCR (recycleur passif semi-fermé).</p></div> +<div class="paragraph"><p><strong>Moniteur/Guide de palanquée</strong>: le nom du moniteur ou du guide de palanquée doit être +entré dans ce champ +qui permet une sélection automatique basé sur la liste des moniteurs +déjà présents dans le carnet en cours.</p></div> +<div class="paragraph"><p><strong>Équipier</strong>: dans ce champ, entrez le(s) nom(s) de votre/vos équipier(s) +(sparés par des virgules) qui participaient à la +plongée. Une sélection automatique se base sur la liste des équipiers déjà présents dans le +carnet en cours.</p></div> +<div class="paragraph"><p><strong>Combinaison</strong>: le type de combinaison peut être entré ici. +Une sélection automatique est disponible. +Certains utilisateurs de vêtement étanche peuvent utiliser ce champ pour enregistrer quelle ensemble de +combinaison et souris ils ont utilisé.</p></div> +<div class="paragraph"><p><strong>Évaluation</strong>: attribue une évaluation subjective à une plongée sur une +échelle de 5 points en cliquant sur l'étoile correspondante.</p></div> +<div class="paragraph"><p><strong>Visibilité</strong>: attribue une évaluation de la visibilité à une plongée sur une +échelle de 5 points en cliquant sur l'étoile correspondante.</p></div> +<div class="paragraph"><p><strong>Étiquettes</strong>: il est possible de définir ici des étiquettes qui décrivent le +type de plongée (séparées par des virgules). Des exemples courants d'étiquettes sont bateau, +plongée dérivante, exercice, grotte, etc. +<em>Subsurface</em> contient de nombreuses étiquettes. En commençant à taper une étiquette, <em>Subsurface</em> liste +les étiquettes correspondant à la frappe. Par exemple, en entrant +<code>cav</code>, les étiquettes <strong>cave</strong> et <strong>caverne</strong> sont proposées.</p></div> +<div class="paragraph"><p><strong>Notes</strong>: toute information supplémentaire concernant une plongée peut être entrée ici.</p></div> +<div class="paragraph"><p>Les boutons <em>Appliquer les modifications</em> et <em>Annuler les modifications</em> +sont utilisés pour enregistrer toutes les informations des onglets du +panneau <strong>Informations</strong> et du panneau <strong>Profil de plongée</strong>. Utilisez-les +lorsque <strong>TOUTES</strong> les autres informations ont été ajoutées. L’image +<a href="#S_Notes_dc">située au début de cette section</a> montre un exemple de +l’onglet <strong>Notes</strong> après avoir complété les informations d’une plongée.</p></div> </div> <div class="sect4"> -<h5 id="_equipment">Equipment</h5> -<div class="paragraph"><p>The Equipment tab allow entering information about the type of cylinder and -gas used, as well as the weights used for the dive. The message in the blue -box at the top of the panel:</p></div> +<h5 id="_équipement">Équipement</h5> +<div class="paragraph"><p>L’onglet Équipement permet d’entrer les informations concernant le type de +bloc et le gaz utilisé, ainsi que le lestage utilisé pour la plongée. Le +message dans la boîte bleue en haut du panneau:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/BlueEditBar_f22.jpg" alt="FIGURE: Blue edit bar" /> </div> </div> -<div class="paragraph"><p>shows the equipment is being edited. This is a highly interactive part of -<em>Subsurface</em> and the information on cylinders and gases (entered here) -determines the behavior of the <strong>Dive profile</strong> (top right-hand panel).</p></div> -<div class="paragraph" id="cylinder_definitions"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks -like this:</p></div> +<div class="paragraph"><p>indique que l'équipement a été édité. C’est une partie hautement interactive +de <em>Subsurface</em> et les informations sur les blocs et les gaz (entrées ici) +déterminent le comportement du <strong>Profil de plongée</strong> (panneau en haut à +droite).</p></div> +<div class="paragraph" id="cylinder_definitions"><p><strong>Blocs</strong>: les informations concernant les blocs sont entrées via une boîte de dialogue +qui ressemble à ceci:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/DC_gas-dialogue1_f20.jpg" alt="FIGURE: Initial cylinder dialogue" /> </div> </div> -<div class="paragraph"><p>For hand-entered dives, this information needs to be typed in. For dive -computers, <em>Subsurface</em> often gets the gas used from the dive computer and -automatically inserts the gas composition(% oxygen or % helium) in the -table. The + button at the top right allows adding more cylinders for this -dive. The dark dustbin icon on the left allows you to delete information for -a cylinder. Note that it is not possible to delete a cylinder if it is used -during the dive. A cylinder might be implicitly used in the dive, even -without a gas change event. Start by selecting a cylinder type on the -left-hand side of the table. To select a cylinder, the <em>Type</em> box should be -clicked. This brings up a list button that can be used to display a dropdown -list of cylinders:</p></div> +<div class="paragraph"><p>Pour les plongées entrées manuellement, cette information doit être +entrée. Pour les ordinateurs de plongée, <em>Subsurface</em> reçoit souvent +l’information concernant le gaz utilisé et insère automatiquement sa +composition (% d’oxygène ou % d’hélium) dans le tableau. Le bouton + en haut +à droite permet d’ajouter des blocs pour cette plongée. L’icone de corbeille +noire à gauche permet de supprimer les informations d’un bloc. Notez qu’il +n’est pas possible de supprimer un bloc s’il est utilisé durant la +plongée. Un bloc doit être implicitement utilisé pour la plongée, même sans +événement de changement de gaz. Commencez par sélectionner un type de bloc +dans la partie gauche du tableau. Pour sélectionner un bloc, il faut +cliquer sur la boîte <em>Type</em>. Cela fera apparaître un bouton permettant +d’afficher une liste déroulante de blocs:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/DC_gas-dialogue2_f20.jpg" alt="FIGURE: The cylinder drop-down list button" /> </div> </div> -<div class="paragraph"><p>The drop-down list can then be used to select the cylinder type that was -used for this dive, or just start typing in the box which shows the -available options for the entered characters. The <strong>Size</strong> of the cylinder as -well as its working pressure (<em>Work.press</em>) will automatically be shown in -the dialogue.</p></div> -<div class="paragraph"><p>Next, indicate the starting pressure and the ending pressure of the -specified gas during the dive. The unit of pressure (metric/imperial) -corresponds to the settings chosen in the <em>Preferences</em>.</p></div> -<div class="paragraph"><p>Finally, provide the gas mixture used. If air was used, the value of 21% can -be entered into the oxygen box or this field can be left blank. If nitrox or -trimix were used, their percentages of oxygen and/or helium should be -entered. Any inappropriate fields should be left empty. After typing the -information for the cylinder, save the data either by pressing <em>ENTER</em> on -the keyboard or by clicking outside the cell containing the -cursor. Information for any additional cylinders can be added by using the<br /> -button at the top right hand. Here is an example of a complete description -for a dive using two cylinders (air and EAN50):</p></div> +<div class="paragraph"><p>La liste déroulante peut être utilisée pour sélectionner le type de bloc +utilisé pour cette plongée, ou il suffit de commencer à taper dans la boîte +pour afficher les options disponibles selon les lettres entrées. La <strong>Taille</strong> +du bloc ainsi que sa pression de service (_Pression de service) seront +automatiquement affichées dans la boîte de dialogue.</p></div> +<div class="paragraph"><p>Ensuite, indiquez la pression de déart et celle d’arrivée pour le gaz +spécifié pendant la plongée. L’unité de pression (métrique/impériale) +correspond au réglage choisi dans les <em>Préférences</em>.</p></div> +<div class="paragraph"><p>Pour terminer, renseignez le mélange de gaz utilisé. S’il s’agit d’air, la +valeur de 21% peut être entrée dans la case Oxygène, ou ce champ peut être +laissé vide. Si du nitrox ou du trimix a été utilisé, les pourcentages +d’oxygène et/ou d’hélium doivent être entrés. Tout champ non requis +concerné doit être laissé vide. Après avoir entré les informations du bloc, +enregistrez les données soit en pressant la douche <em>ENTRÉE</em>, soit en +cliquant hors de la case contenant le curseur. Les informatioins pour les +blocs supplémentaires peuvent être ajoutées en utilisant le bouton + en haut +à droite. Voici un exemple d’une description complète pour une plongée +utilisant deux blocs (air et EAN50):</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/CylinderDataEntry3_f20.jpg" alt="FIGURE: a completed cylinder dive information table" /> </div> </div> -<div class="paragraph"><p><strong>Weights</strong>: Information about the weight system used can be entered -using a dialogue similar to that of the cylinder information. If you click -the + button on the top right of the weights dialogue, the table looks like -this:</p></div> +<div class="paragraph"><p><strong>Poids</strong>: les informations à propos du système de lestage peuvent être entrés +via une interface similaire à celles des blocs. Si vous cliquez +sur le bouton + en haut à droite , le tableau apparaît +comme suit:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURE:The Weights dialogue" /> </div> </div> -<div class="paragraph"><p>By clicking on the <em>Type</em> field, a drop-down list becomes accessible through -a down-arrow:</p></div> +<div class="paragraph"><p>En cliquant sur le champ: <em>Type</em>, une liste déroulante devient accessible +via une flèche vers le bas:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/WeightsDataEntry2_f20.jpg" alt="FIGURE:Weights type drop-down list button" /> </div> </div> -<div class="paragraph"><p>This can be used to select the type of weight system used during the -dive. You may start typing in the box to specify a different weighting -mechanism that will be saved by <em>Subsurface</em>. In the <strong>Weight</strong> field, type -in the amount of weight used during the dive. After specifying the weight -system, save the data by pressing <em>ENTER</em> on the keyboard or by clicking -outside the cell with the cursor. It’s possible to enter information for -more than one weight system by adding an additional system using the<br /> -button on the top right hand. Weight systems can be deleted using the dust -bin icon on the left hand. Here is an example of information for a dive with -two types of weights: integrated as well as a weight belt:</p></div> +<div class="paragraph"><p>Celle-ci peut être utilisée pour sélectionner le type de poids utilisé +durant la plongée. Vous pouvez commencer à taper dans la case pour spécifier +un mécanisme différent de lestage qui sera sauvegardé par <em>Subsurface</em>. Dans +le champ <strong>Poids</strong>, entrez la quantité de poids utilisé durant la +plongée. Après avoir spécifié le système de lestage, enregistrez les données +avec la touche <em>ENTRÉE</em> du clavier ou en cliquant hors de la case contenant +le curseur. Il est possible d’entrer des informations pour plusieurs +systèmes de lestage en utilisant le pouton + en haut à droite. Les systèmes +de lestage peuvent être supprimés en utilisant l’icone de corbeille sur la +gauche. Voici un exemple d’informations pour une plongée avec deux systèmes +de lestage: des poids intégrés et une ceinture:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/WeightsDataEntry3_f20.jpg" alt="FIGURE: A completed weights information table" /> @@ -1474,7 +1544,7 @@ two types of weights: integrated as well as a weight belt:</p></div> </div> </div> <div class="sect3"> -<h4 id="_editing_several_selected_dives_simultaneously">5.2.6. Editing several selected dives simultaneously</h4> +<h4 id="_éditer_simultanément_une_sélection_de_plusieurs_plongées">5.2.6. Éditer simultanément une sélection de plusieurs plongées</h4> <div class="paragraph"><p><em>METHOD 1</em>: After downloading dives from a dive computer, the dive profiles of each is shown in the <strong>Dive profile</strong> tab, as well as a few items of information in the <strong>Notes</strong> tab (e.g. water temperature) and in the @@ -1510,34 +1580,36 @@ dives now contain the data initially selected in the original source dive log.</p></div> </div> <div class="sect3"> -<h4 id="S_Bookmarks">5.2.7. Adding Bookmarks to a dive</h4> -<div class="paragraph"><p>Many divers wish to annotate dives with text that indicate particular -events, e.g. "Saw dolphins", or "Released surface buoy". This is easily -done:</p></div> +<h4 id="S_Bookmarks">5.2.7. Ajout des signets à une plongée</h4> +<div class="paragraph"><p>De nombreux plongeurs désirent annonter leurs plongées avec du texte +indiquant des événements particuliers, p. ex. "J’ai vu des dauphins", ou +"Déploiement de parachute de palier". Ceci peut ^être facilement réalisé:</p></div> <div class="ulist"><ul> <li> <p> -Right-click at the appropriate point on the dive profile. This brings up - the dive profile context menu. Select <em>Add bookmark</em>. A red flag is placed - on the dive profile at that point (see <strong>A</strong> below). +Cliquez-droit à l’endroit voulu dans le profil de plongée. Cela fait + apparaître le menu contextuel du profil de plongée. Sélectionnez <em>Ajouter un + signet</em>. Un drapeau rouge est alors placé à cet endroit sur le profil de + plongée (voir <strong>A</strong> ci-dessous). </p> </li> <li> <p> -Right-click on the red flag. This brings up the context menu (see <strong>B</strong> - below). Select <em>Edit name</em>. +Cliquez-droit sur le drapeau rouge. Ceci fait apparaître un menu contextuel + (voir <strong>B</strong> ci-dessous). Sélectionnez <em>Modifier le nom</em>. </p> </li> <li> <p> -A text box is shown. Type the explanatory text for the bookmark (see <strong>C</strong> - below). Select <em>OK</em>. This saves the text associated with the bookmark. +Une boîte de texte s’affiche. Entrez le texte explicatif pour le signet + (voir <strong>C</strong> ci-dessous). Sélectionnez <em>OK</em>. Ceci enregistrera le texte associé + au signet. </p> </li> <li> <p> -Hovering the mouse over the red bookmark, the appropriate text is shown at - the bottom of the information box (see <strong>D</strong> below). +En survolant le signet rouge avec la souris, le texte associé est affiché + dans le bas de la boîte d’information (voir <strong>D</strong> ci-dessous). </p> </li> </ul></div> @@ -1548,15 +1620,17 @@ Hovering the mouse over the red bookmark, the appropriate text is shown at </div> </div> <div class="sect3"> -<h4 id="_saving_the_updated_dive_information">5.2.8. Saving the updated dive information</h4> -<div class="paragraph"><p>The information entered in the <strong>Notes</strong> tab and the <strong>Equipment</strong> tab can be -saved by using the two buttons on the top right hand of the <strong>Notes</strong> tab. If -the <em>Apply changes</em> button is clicked, the dive data are saved in the memory -image of the dive. If the <em>Discard changes</em> button is clicked, the newly -entered dive data are erased from the computer memory, although the dive -profile is retained. When the user exits <em>Subsurface</em> there is a final -prompt to confirm the new data should now be saved permanently on the -computer disk.</p></div> +<h4 id="_enregistrer_les_informations_de_plongée_mises_à_jour">5.2.8. Enregistrer les informations de plongée mises à jour</h4> +<div class="paragraph"><p>Les informations entrées dans les onglets <strong>Notes</strong> et <strong>Équipement</strong> peuvent +être enregistrées en utilisant les deux boutons en haut à droite de l’onglet +<strong>Notes</strong>. Si vous cliquez sur le bouton <em>Appliquer les modifications</em>, les +données de la plongée sont enregistrées dans l’image mémoire de la +plongée. Si le bouton <em>Annuler les modifications</em> est cliqué, les données de +plongées nouvellement entrées sont effacées de la mémoire de l’ordinateur, +bien que le profil de plongée soit conservé. Lorsque l’utilisateur quitte +<em>Subsurface</em>, il y a une dernière notificatioin pour confirmer que les +nouvelles données doivent être enregistrées de manière permanente sur le +disque de l’ordinateur.</p></div> </div> </div> <div class="sect2"> @@ -1588,63 +1662,65 @@ issues (or other reasons that would cause the beginning time of the dives to be significantly different) <em>Subsurface</em> will not create duplicate entries. Below is more specific information to import data to <em>Subsurface</em>.</p></div> <div class="sect3"> -<h4 id="_using_the_universal_import_dialogue">5.3.1. Using the universal import dialogue</h4> -<div class="paragraph" id="Unified_import"><p>Importing dives from other software is done through a universal interface -activated by selecting <em>Import</em> from the Main Menu, then clicking on <em>Import -Log Files</em>. This brings up dialogue <strong>A</strong>, below.</p></div> +<h4 id="_utilisation_de_la_boîte_de_dialogue_universelle_d_8217_importation">5.3.1. Utilisation de la boîte de dialogue universelle d’importation</h4> +<div class="paragraph" id="Unified_import"><p>L’importation de plongées depuis d’autres logiciels se fait au travers d’une +interface universelle en sélectionnant <em>Importer</em> depuis le menu principal, +puis en cliquant sur <em>Importer des fichiers de plongée</em>. Ceci fera +apparaître la boîte de dialogue <strong>A</strong>, comme ci-dessous.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Import1_f20.jpg" alt="FIGURE: Import dialogue: step 1" /> </div> </div> -<div class="paragraph"><p>Towards the bottom right is a dropdown selector with a default label of -<em>Dive Log Files</em> which accesses different types of direct imports available, -as in dialogue <strong>B</strong>, above. Currently these are:</p></div> +<div class="paragraph"><p>En bas à droite se trouve la liste déroulante avec la mention par défaut +<em>Dive Log Files</em> qui permet d’accéder aux différents types d’importations +directes disponibles, comme dans le dialogue <strong>B</strong> ci-dessus. Actuellement, il +s’agit de:</p></div> <div class="ulist"><ul> <li> <p> -XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log - systems) +Carnet de plongée formatés en XML (DivingLog 5.0, MacDive et divers autres + systèmes de carnet de plongée) </p> </li> <li> <p> -Cochran dive logs +Carnets de plongée Cochran </p> </li> <li> <p> -UDDF-formatted dive logs (e.g. Kenozooid) +Carnets de plongée formatés en UDDF (p. ex. Kenozooid) </p> </li> <li> <p> -UDCF-formatted dive logs +Carnets de plongée formatés en UDCF </p> </li> <li> <p> -Poseidon MkVI CCR logs +Logs Poseidon MkVI CCR </p> </li> <li> <p> -APD Inspiration/Evolution CCR logs +Logs APD Inspiration/Evolution CCR </p> </li> <li> <p> -LiquiVision logs +Logs LiquiVision </p> </li> <li> <p> -divelogs.de logs +Logs divelogs.de </p> </li> <li> <p> -OSTC Tools logs +Logs OSTC Tools </p> </li> <li> @@ -1659,38 +1735,38 @@ Suunto Dive Manager (DM3, DM4, DM5) </li> <li> <p> -DL7 files used by Diver’s Alert network (DAN) +Fichers DL7 utilisés par Diver’s Alert network (DAN) </p> </li> <li> <p> -Underwater technologies AV1 dive logs +Logs Underwater technologies AV1 </p> </li> <li> <p> -Divesoft dive logs +Logs Divesoft </p> </li> <li> <p> -Poseidon MK VI eCCR dive logs +Logs Poseidon MK VI eCCR </p> </li> <li> <p> -CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs +Carnet de plongée CSV (format texte ou tableau), y compris les logs APD CCR </p> </li> </ul></div> -<div class="paragraph"><p>Selecting the appropriate format and then the specific log file in the large -window containing the file list on the right 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 class="paragraph"><p>Sélectionner le format voulu puis le fichier recherché dans la fenêtre +contenant la liste des fichiers sur la droite de la boîte de dialogue, +ouvrira le carnet de plongée importé dans la <strong>Liste des plongées</strong> de +<em>Subsurface</em>. Certains autres formats, non accessible depuis la boîte de +dialogue d’importation, sont également supportés, comme expliqué ci-dessous.</p></div> </div> <div class="sect3"> -<h4 id="_importing_from_ostctools">5.3.2. Importing from OSTCTools</h4> +<h4 id="_importation_depuis_ostctools">5.3.2. Importation depuis OSTCTools</h4> <div class="paragraph"><p><em>OSTC Tools</em> is a Microsoft-based suite of dive download and dive management tools for the OSTC family of dive computers. <em>OSTC Tools</em> downloads dive data from the dive computer and stores it as a binary file with file @@ -1699,27 +1775,30 @@ the universal import dialogue. From the dropdown list at the bottom right select <em>OSTCTools Files (.dive .DIVE)</em>. This makes the <em>OSTC Tools</em> dive logs visible in the file list panel. Select one or more dive, then click the <em>Open</em> button. The OSTC dives are shown in the <strong>Dive List</strong> panel.</p></div> -<div class="paragraph"><p>All H&W devices supported by OSTCTools can be imported to <em>Subsurface</em>. This -includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, and probably -although untested, Frog, OSTC2 and OSTC CR.</p></div> -<div class="paragraph"><p>Please remember that OSTCTools is <strong>not</strong> true diving log software, but rather -a useful set of tools for analysis and management of OSTC devices. Only raw -dive computer data will be imported to <em>Subsurface</em>; the rest of the data -(buddies, equipment, notes, etc) need to be completed manually.</p></div> +<div class="paragraph"><p>Tous les périphériques H&W supportés par OSTCTools peuvent être importés +dans <em>Subsurface</em>. Ceci comprend les modèles OSTC, OSTC Mk2, OSTC 2N/2C, +OSTC3, OSTC Sport, et probablement, bien que non testés, Frog, OSTC2 et OSTC +CR.</p></div> +<div class="paragraph"><p>Ne perdez pas de vue qu’OSTCTools n’est <strong>pas</strong> un vrai logiciel de carnet de +plongée, mais plutôt un ensemble d’outils pour l’analyse et la gestion des +périphériques OSTC. Seules les données brutes de l’ordinateur de plongée +seront importées dans <em>Subsurface</em>, le reste des données (équipiers, +équipement, notes, etc.) doit être complété manuellement.</p></div> </div> <div class="sect3"> -<h4 id="_importing_from_mares_dive_organizer_v2_1">5.3.3. Importing from Mares Dive Organizer V2.1</h4> -<div class="paragraph"><p>Since Mares uses 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 gateway to extract the dive log -information.</p></div> +<h4 id="_importation_depuis_mares_dive_organizer_v2_1">5.3.3. Importation depuis Mares Dive Organizer V2.1</h4> +<div class="paragraph"><p>Vu que Mares utilise un logiciel Windows propriétaire non-compatible avec +les applications multi-plateformes, ces carnets de plongée ne peuvent pas +être importés directement dans <em>Subsurface</em>. Ceux-ci doivent être important +en suivant une procédure en trois étapes, en utilisant <em>www.divelogs.de</em> +comme passerelle pour extraire les informations du carnet de plongée.</p></div> <div class="olist arabic"><ol class="arabic"> <li> <p> -Export the dive log data from Mares Dive Organizer to your desktop, using a - <em>.sdf</em> file name extension. Refer to <a href="#Mares_Export">Appendix C</a> for more - information. +Exportez les données du carnet de plongée depuis le Mares Dive Organizer + vers votre bureau, en utilisant un fichier avec l’extension + <em>.sdf</em>. référez-vous à l’<a href="#Mares_Export">Annexe C</a> pour plus + d’information. </p> </li> <li> @@ -1733,14 +1812,14 @@ Data should then be imported into <em>www.divelogs.de</em>. First, create a user </li> <li> <p> -Finally, import the dives from <em>divelogs.de</em> to <em>Subsurface</em>, using the - instructions below. +Enfin, importez les plongées depuis <em>divelogs.de</em> vers <em>Subsurface</em>, en + suivant les instructions ci-dessous. </p> </li> </ol></div> </div> <div class="sect3"> -<h4 id="S_SmartTrakImport">5.3.4. Importing Scubapro <em>SmartTrak</em> divelogs</h4> +<h4 id="S_SmartTrakImport">5.3.4. Importer les logs Scubapro <em>SmartTrak</em></h4> <div class="paragraph"><p><em>SmartTrak</em> stores the raw data from a Uwatec/Scubapro dive computer along with a plethora of other data manually added by the user, ranging from dive points to buddies data or DAN survey info. However, this is Microsoft @@ -1751,13 +1830,13 @@ Microsoft Access databases, preventing the integration the importer into the generated by SmartTrak to Subsurface’s <em>.xml</em> format. It can be built together with <em>Subsurface</em> for Linux systems. Two dependencies need to be installed in your system before building: <em>libglib2.0</em> and <em>libmdb2</em>.</p></div> -<div class="paragraph"><p>Feel free to contact the <em>Subsurface</em> development team on -<a href="mailto:subsurface@subsurface-divelog.org">our mailing list</a> for assistance in -importing <em>SmartTrak</em> dive logs.</p></div> +<div class="paragraph"><p>N’hésitez pas à contacter l'équipe de développement de <em>Subsurface</em> via +<a href="mailto:subsurface@subsurface-divelog.org">notre liste de diffusion</a> pour de +l’aide à l’importation des lofs <em>SmartTrak</em>.</p></div> <div class="paragraph"><p>Assuming the above dependencies have been installed and the <em>Subsurface</em> source tree is in the directory <em>~/src/subsurface</em>, then:</p></div> <div class="sect4"> -<h5 id="_building_em_smtk2ssrf_em">Building <em>smtk2ssrf</em></h5> +<h5 id="_compiler_em_smtk2ssrf_em">Compiler <em>smtk2ssrf</em></h5> <div class="ulist"><ul> <li> <p> @@ -1791,7 +1870,7 @@ After a successful build, there will be an executable named <em>smtk2ssrf</em> i </ul></div> </div> <div class="sect4"> -<h5 id="_running">Running</h5> +<h5 id="_utilisation">Utilisation</h5> <div class="paragraph"><p><em>smtk2ssrf</em> accepts 0, 2 or more parameters. If it is launched without parameters in a graphical user interface, a simple window opens for choosing the <em>.slg</em> file(s) to import and a destination file to store the @@ -1825,7 +1904,7 @@ messages in the console or in the graphical window: some may be relevant as support for Galileo family of dive computers is still a work in progress.</p></div> </div> <div class="sect4"> -<h5 id="_merging_the_imported_dives_with_the_existing_divelog">Merging the imported dives with the existing divelog</h5> +<h5 id="_fusionner_les_plongées_importées_dans_un_carnet_de_plongée_existant">Fusionner les plongées importées dans un carnet de plongée existant</h5> <div class="paragraph"><p>Open the new file (generated in the previous steps) using <em>Subsurface</em> and check the dives and data. If everything is fine, close the <em>.xml</em> file and open your regular divelog. Then from the <strong>Main Menu</strong> select <em>Import → @@ -1837,7 +1916,7 @@ from <em>SmartTrak</em>, so a renumbering action is needed. See the section on </div> </div> <div class="sect3"> -<h4 id="S_ImportingDivelogsDe">5.3.5. Importing dives from <strong>divelogs.de</strong></h4> +<h4 id="S_ImportingDivelogsDe">5.3.5. Importer des plongées depuis <strong>divelogs.de</strong></h4> <div class="paragraph"><p>Importing dive information from <em>divelogs.de</em> is simple, using a single dialogue box. The <em>Import → Import from Divelogs.de</em> option should be selected from the Main Menu. This brings up a dialogue box (see image <strong>A</strong> @@ -1872,8 +1951,8 @@ information that may be helpful for importing spreadsheet-based data into normally organized into a single line that provides the headers (or <em>field names</em> or <em>column headings</em>) of the data columns, followed by the data, one record per line.</p></div> -<div class="paragraph"><p>There are two types of <em>CSV</em> dive logs that can be imported into -<em>Subsurface</em>:</p></div> +<div class="paragraph"><p>Il y a deux types de carnets de plongée au format <em>CSV</em> pouvant être +importées dans <em>Subsurface</em>:</p></div> <div class="olist arabic"><ol class="arabic"> <li> <p> @@ -1923,7 +2002,8 @@ Which data columns need to be imported into <em>Subsurface</em>? Is it a <em>CSV </li> <li> <p> -Is the numeric information (e.g. dive depth) in metric or in imperial units? +Les données numériques (p. ex. la profondeur de plongée) sont-elles en + système métrique ou mesures impériales? </p> </li> </ol></div> @@ -1970,7 +2050,7 @@ The data from the <em>CSV</em> file are imported and shown in the <strong>Dive L panel.</p></div> <div class="sidebarblock" id="S_CSV_Intro"> <div class="content"> -<div class="paragraph"><p><strong>A Diver’s Introduction to <em>CSV</em> Files</strong></p></div> +<div class="paragraph"><p><strong>Introduction aux fichiers <em>CSV</em> pour la plongée</strong></p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -2008,8 +2088,9 @@ Key Largo,2012-11-24,09:12,34:15,20.4,Jason McDonald Wismar Baltic,2012-12-01,10:13,35:27,15.4,Dieter Albrecht Pulau Weh,2012-12-20,09:46,55:56,38.6,Karaeng Bontonompo</code></pre> </div></div> -<div class="paragraph"><p>The above data are not easily read by a human. Here is the same information -in TAB-delimited format:</p></div> +<div class="paragraph"><p>Les données ci-dessus ne sont pas aisément lisible pour un être +humain. Voici les mêmes informations dans un format séparé par des +tabulations :</p></div> <div class="literalblock"> <div class="content"> <pre><code>Dive site Dive date Time Dive_duration Dive_depth Dive buddy @@ -2066,25 +2147,25 @@ smaller file to make sure everything works.</td> </div> </div> <div class="sect2"> -<h3 id="_importing_dive_coordinates_from_a_mobile_device_with_gps">5.4. Importing Dive coordinates from a mobile device with GPS.</h3> -<div class="paragraph"><p>A smartphone with built-in GPS facilities can be used to store the locations -of dives. This is performed by:</p></div> +<h3 id="_importation_des_coordonnées_de_plongée_depuis_un_appareil_mobile_avec_gps">5.4. Importation des coordonnées de plongée depuis un appareil mobile avec GPS.</h3> +<div class="paragraph"><p>Un smartphone avec GPS peut être utilisé pour stocker les lieux de +plongées. Ceci est réalisé comme suit:</p></div> <div class="paragraph"><p>Taking the mobile device along on the dive boat / liveabord while automatically collecting dive site coordinate information.</p></div> <div class="paragraph"><p>2) Uploading the coordinates from the mobile device to the <em>Subsurface</em> Internet server.</p></div> <div class="paragraph"><p>Syncronising the dives in the <em>Subsurface</em> dive list with the coordinates stored on the <em>Subsurface</em> Internet server.</p></div> -<div class="paragraph"><p>_Subsurface has two tools for achieving this:</p></div> +<div class="paragraph"><p><em>Subsurface</em> comporte deux outils pour réaliser cela:</p></div> <div class="ulist"><ul> <li> <p> -The <em>Subsurface Companion App</em> (Android and iOS). +L’application <em>Subsurface Companion</em> (Android et iOS). </p> </li> <li> <p> -The <em>Subsurface-mobile</em> app (Android and iOS) +L’application <em>Subsurface-mobile</em> (Android et iOS) </p> </li> </ul></div> @@ -2097,8 +2178,8 @@ the <em>Subsurface</em> desktop version, <em>Subsurface-mobile</em> performs man functions of the desktop version, including the management and viewing of dive information. Below, we describe how to perform the above three steps using each of the two mobile apps.</p></div> -<div class="paragraph"><p>For information on using the <em>Subsurface Companion App</em>, click -<a href="#S_Companion"><em>here</em></a>.</p></div> +<div class="paragraph"><p>Pour plus d’information sur l’utilisation de l’application <em>Subsurface +Companion</em>, cliquez <a href="#S_Companion"><em>ici</em></a>.</p></div> <div class="sect3"> <h4 id="_storing_and_and_using_gps_locations_using_em_subsurface_mobile_em">5.4.1. Storing and and using GPS locations using <em>Subsurface-mobile</em></h4> <div class="sect4"> @@ -2306,7 +2387,7 @@ Import local GPX file: The Android device searches for .gpx files and </p> </li> </ul></div> -<div class="paragraph"><p><strong>List of dive locations</strong></p></div> +<div class="paragraph"><p><strong>Liste des emplacements de plongée</strong></p></div> <div class="paragraph"><p>The main screen shows a list of dive locations, each with a name, date and time (see <strong>A</strong> below). Some locations may have an arrow-up icon over the selection box to the left showing they need to be uploaded to the @@ -2520,7 +2601,7 @@ then to change the date-time back again <strong>after</strong> downloading GPS d <td class="icon"> <img src="images/icons/info.jpg" alt="Note" /> </td> -<td class="content">TIPS:</td> +<td class="content">CONSEILS:</td> </tr></table> </div> <div class="ulist"><ul> @@ -2550,13 +2631,13 @@ It may also be useful to give informative names to the locations sent to the </div> </div> <div class="sect2"> -<h3 id="S_LoadImage">5.5. Adding photographs to dives</h3> +<h3 id="S_LoadImage">5.5. Ajouter des photos aux plongées</h3> <div class="paragraph"><p>Many (if not most) divers take photographs during a dive. <em>Subsurface</em> allows the storage and display of photographs for each dive. Photos are superimposed on the dive profile at the times during the dive when they were taken. They can also be viewed from the dive profile.</p></div> <div class="sect3"> -<h4 id="_loading_photos_and_synchronizing_between_dive_computer_and_camera">5.5.1. Loading photos and synchronizing between dive computer and camera</h4> +<h4 id="_chargement_des_photos_et_synchronisation_entre_l_8217_ordinateur_de_plongée_et_l_8217_appareil_photo">5.5.1. Chargement des photos et synchronisation entre l’ordinateur de plongée et l’appareil photo</h4> <div class="paragraph"><p>Right-click on a dive or on a group of dives on the dive list, bringing up the <a href="#S_DiveListContextMenu">Dive list context Menu</a>. Select the appropriate option to import images either from file or from the @@ -2579,7 +2660,8 @@ used during that same dive. These two devices often differ by several minutes. <em>Subsurface</em> attempts to synchronize these two devices so that the exact times of photographs can be used to position photographs on the dive profile.</p></div> -<div class="paragraph"><p><em>Subsurface</em> synchronizes camera with dive computer in three ways:</p></div> +<div class="paragraph"><p><em>Subsurface</em> synchronise l’appareil photo avec l’ordinateur de plongée de +trois façons:</p></div> <div class="ulist"><ul> <li> <p> @@ -2642,8 +2724,8 @@ that all photos associated with a dive are visible, including photos taken before or after the dive.</p></div> </div> <div class="sect3"> -<h4 id="_viewing_the_photos">5.5.2. Viewing the photos</h4> -<div class="paragraph"><p>After the images have been loaded, they appear in two places:</p></div> +<h4 id="_visualiser_les_photos">5.5.2. Visualiser les photos</h4> +<div class="paragraph"><p>Après avoir été chargées, les images apparaissent à deux endroits:</p></div> <div class="ulist"><ul> <li> <p> @@ -2690,7 +2772,7 @@ deleted using the <em>Photos</em> tab (see text below).</p></div> </div> </div> <div class="sect3"> -<h4 id="_the_em_photos_em_tab">5.5.3. The <em>Photos</em> tab</h4> +<h4 id="_l_8217_onglet_em_photos_em">5.5.3. L’onglet <em>Photos</em></h4> <div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em> tab of the <em>Notes</em> panel. Photos taken in rapid succession during a dive (therefore sometimes with large overlap on the dive profile) can easily be @@ -2704,7 +2786,7 @@ the <em>Photos</em> panel by selecting it (single-click) and then by pressing th as well as the dive profile.</p></div> </div> <div class="sect3"> -<h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4> +<h4 id="_photos_stockées_sur_un_disque_dur_externe">5.5.4. Photos stockées sur un disque dur externe</h4> <div class="paragraph"><p>Most underwater photographers store photos on an external drive. If such a drive can be mapped by the operating system (almost always the case) the photos can be directly accessed by <em>Subsurface</em>. This eases the interaction @@ -2719,7 +2801,7 @@ only the file names of the photos. If the external drive with the photos is re-connected, the photos can be seen in the normal way.</p></div> </div> <div class="sect3"> -<h4 id="_finding_out_which_dives_have_associated_photos">5.5.5. Finding out which dives have associated photos.</h4> +<h4 id="_trouver_quelles_plongées_ont_des_photos_associées">5.5.5. Trouver quelles plongées ont des photos associées.</h4> <div class="paragraph"><p>Inspecting each individual dive in order to determine whether there are associated photos can be time consuming. There is a rapid way of seeing which dives have associated photos and which not: activate the <em>Photos</em> @@ -2730,7 +2812,7 @@ just before/after the dive or both during and before/after the dive. More information is provided in the section dealing with <a href="#S_Divelist_columns">photo icons on the <strong>Divelist</strong></a>.</p></div> </div> <div class="sect3"> -<h4 id="S_FindMovedImages">5.5.6. Moving photographs among directories, hard disks or computers</h4> +<h4 id="S_FindMovedImages">5.5.6. Déplacer des photos entre dossiers, disques durs ou ordinateurs</h4> <div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive, <em>Subsurface</em> saves the directory path where the photo lies as well as the file name of the photo, in order to find it when the dive is opened again. @@ -2847,7 +2929,7 @@ decompression.</p></div> </div> </div> <div class="sect3"> -<h4 id="_sidemount_dives">5.6.2. Sidemount dives</h4> +<h4 id="_plongées_sidemount">5.6.2. Plongées Sidemount</h4> <div class="paragraph"><p>Sidemount diving is just another form of multi-cylinder diving, often with both or all cylinders having the same gas mixture. Although it’s a popular configuration for cave divers, sidemount diving can be done by recreational @@ -2942,7 +3024,7 @@ over two hours.</p></div> </div> </div> <div class="sect3"> -<h4 id="S_CCR_dives">5.6.4. Closed circuit rebreather (CCR) dives</h4> +<h4 id="S_CCR_dives">5.6.4. Plongées en recycleur circuit fermé (CCR)</h4> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -2965,7 +3047,7 @@ databases: one dive at a time.</td> </tr></table> </div> <div class="sect4"> -<h5 id="_import_a_ccr_dive">Import a CCR dive</h5> +<h5 id="_importer_une_plongée_ccr">Importer une plongée CCR</h5> <div class="paragraph"><p>See the section dealing with <a href="#S_ImportingAlienDiveLogs">Importing dive information from other digital sources</a>. CCR dive data are currently obtained from the proprietary software provided when purchasing CCR dice @@ -3125,33 +3207,37 @@ B</a>.</p></div> <h2 id="_obtaining_more_information_about_dives_entered_into_the_logbook">6. Obtaining more information about dives entered into the logbook</h2> <div class="sectionbody"> <div class="sect2"> -<h3 id="_the_strong_info_strong_tab_for_individual_dives">6.1. The <strong>Info</strong> tab (for individual dives)</h3> -<div class="paragraph"><p>The Info tab gives some summary information about a particular dive that has -been selected in the <strong>Dive List</strong>. Useful information here includes the -surface interval before the dive, the maximum and mean depths of the dive, -the gas volume consumed, the surface air consumption (SAC) and the number of -oxygen toxicity units (OTU) incurred.</p></div> +<h3 id="_l_8217_onglet_strong_informations_strong_pour_une_seule_plongée">6.1. L’onglet <strong>Informations</strong> (pour une seule plongée)</h3> +<div class="paragraph"><p>L’onglet Informations donnée des informations résumées sur une plongée +sélectionnée dans la <strong>Liste des plongées</strong>. Les informations utiles +comprennent l’intervalle de surface avant une plongée, les profondeurs +maximale et moyenne de la plongée, le volume de gaz consommé, la +consommation équivalente à l’air (SAC) et le nombre d’unités de toxicité de +l’oxygène (OTU) atteint.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <img src="images/icons/info.jpg" alt="Note" /> </td> -<td class="content">Gas consumption and SAC calculations: <em>Subsurface</em> calculates SAC and Gas -consumption taking in account gas incompressibility, particularly at tank -pressures above 200 bar, making them more accurate. Refer to -<a href="#SAC_CALCULATION">Appendix F</a> for more information.</td> +<td class="content">Consommation de gaz et calculs de la SAC (consommation équivalente à l’air): +<em>Subsurface</em> calcule la SAC et la consommation de gaz et tenant compte de +l’incompressibilité du gaz, en particuliter pour des blocs à des pressions +supérieures à 200 bar, les rendant plus précises. Référez-vous à +<a href="#SAC_CALCULATION">l’Annexe F</a> pour plus d’information.</td> </tr></table> </div> </div> <div class="sect2"> -<h3 id="S_ExtraDataTab">6.2. The <strong>Extra Data</strong> tab (usually for individual dives)</h3> -<div class="paragraph"><p>When using a dive computer, it often reports several data items that cannot -easily be presented in a standardised way because the nature of the -information differs from one dive computer to another. These data often -comprise setup information, metadata about a dive, battery levels, no fly -times, or gradient factors used during the dive. When possible, this -information is presented in the <strong>Extra Data</strong> tab. Below is an image showing -extra data for a dive using a Poseidon rebreather.</p></div> +<h3 id="S_ExtraDataTab">6.2. L’onglet <strong>Extra info</strong> (généralement pour des plongées séparées)</h3> +<div class="paragraph"><p>Lors de l’utilisation d’un ordinateur de plongée, celui-ci transmet souvent +des données qui ne peuvent pas être facilement standardisées parce que la +nature de ces informations diffère d’un ordinateur à l’autre. Ces données +conprennent souvent des informations de configuration, des métadonnées à +propos d’une plongée, le niveau de batterie, le temps d’interdiction de vol +(no fly) ou les gradient factor utilisés lors de la plongée. Quand cela est +possible, ces informations sont présentées dans l’onglet <strong>Extra +Info</strong>. Ci-dessous, vous trouverez une image affichant des données +supplémentaires pour une plongée utilisant un recycleur Poseidon.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/ExtraDataTab_f20.jpg" alt="FIGURE: Extra Data tab" /> @@ -3159,31 +3245,33 @@ extra data for a dive using a Poseidon rebreather.</p></div> </div> </div> <div class="sect2"> -<h3 id="_the_strong_stats_strong_tab_for_groups_of_dives">6.3. The <strong>Stats</strong> tab (for groups of dives)</h3> -<div class="paragraph"><p>The Stats tab gives summary statistics for more than one dive, assuming that -more than one dive has been selected in the <strong>Dive List</strong> using the standard -Ctrl-click or Shift-click of the mouse. If only one dive has been selected, -figures for only that dive are given. This tab shows the number of dives -selected, the total amount of dive time in these dives, as well as the -minimum, maximum and mean for the dive duration, water temperature and -surface air consumption (SAC). It also shows the depth of the shallowest and -deepest dives of those selected.</p></div> +<h3 id="_l_8217_onglet_strong_statistiques_strong_pour_un_groupe_de_plongées">6.3. L’onglet <strong>Statistiques</strong> (pour un groupe de plongées)</h3> +<div class="paragraph"><p>L’onglet Statistiques donne des statistiques résumées pour plusieurs +plongées, pour autant que plusieurs plongées soient sélectionnées dans la +<strong>Liste des plongées</strong> en utilisant les raccourcis standard Ctrl-clic ou +Maj-clic avec la souris. So une seule plongée est sélectionnée, les données +ne concernent que cette seule plongée. Cet onglet affiche le nombre de +plongées sélectionnées, la durée totale de ces plongées ainsi que les durées +minimale, maximale et moyenne parmi ces plongées, la température de l’eau et +la consommation équivalente à l’air (SAC). L’onglet affiche également la +plus petite et la plus grande profondeur atteinte pour ces plongées.</p></div> </div> <div class="sect2"> -<h3 id="S_DiveProfile">6.4. The <strong>Dive Profile</strong></h3> +<h3 id="S_DiveProfile">6.4. Le <strong>Profil de plongée</strong></h3> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Profile2.jpg" alt="Typical dive profile" /> </div> </div> -<div class="paragraph"><p>Of all the panels in <em>Subsurface</em>, the Dive Profile contains the most -detailed information about each dive. The Dive Profile has a <strong>button bar</strong> on -the left hand side, allowing control of several display options. The -functions of these buttons are described below. The main item in the Dive -Profile is the graph of dive depth as a function of time. In addition to -depth, it also shows the ascent and descent rates compared to the -recommended speed of going up or down in the water column. This information -is given using different colors:</p></div> +<div class="paragraph"><p>Parmi toutes les panneaux de <em>Subsurface</em>, le profil de plongée contient les +informations les plus détaillées concernant chaque plongée. Le profil de +plongée possède une <strong>barre de boutons</strong> sur el côté gauche, permettant le +contrôle de nombreuses options d’affichage. Les fonctions de ces boutons +sont décrites ci-dessous. L’objet principal du profil de plongée est le +graphique de la profondeur de la plongée en fonction du temps. En plus de la +profondeur, ce graphique affiche également les vitesses de descente et de +remontée en comparaison avec la vitesse recommandée. Cette information est +donnée en utilisant différentes couleurs:</p></div> <div class="tableblock"> <table rules="all" width="100%" @@ -3226,31 +3314,33 @@ cellspacing="0" cellpadding="4"> </tbody> </table> </div> -<div class="paragraph"><p>The profile also includes depth readings for the peaks and troughs in the -graph. So users should see the depth of the deepest point and other -peaks. Mean depth is plotted as a grey line, indicating mean dive depth up -to a particular moment during the dive.</p></div> +<div class="paragraph"><p>Le profil permet également une lecture de la profondeur via les sommets et +planchers sur le graphique. Ainsi les utilisateurs, peuvent voir la +profondeur du point le plus bas et d’autres sommets. La profondeur moyenne +est affichée sous la forme d’une ligne grise, indiquant la moyenne de +profondeur à un moment précis de la plongée.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <img src="images/icons/scale.jpg" alt="Note" /> </td> -<td class="content">In some cases the dive profile does not fill the whole area of the <strong>Dive -Profile</strong> panel. Clicking the <strong>Scale</strong> button in the toolbar on the left of -the dive profile increases the size of the dive profile to fill the area of -the panel.</td> +<td class="content">Dans certains cas, le profil de plongée ne remplit pas toute la zone du +panneau <strong>Profil de plongée</strong>. Cliquer sur le bouton <strong>Ajuster l'échelle du +graphique</strong> dans la barre d’outils sur la gauche du profil de plongée +augmente la taille du profil de plongée pour remplir la zone du panneau.</td> </tr></table> </div> -<div class="paragraph"><p><strong>Water temperature</strong> is shown as a blue line with temperature values -placed adjacent to significant changes.</p></div> +<div class="paragraph"><p>La <strong>température de l’eau</strong> est indiquée par une ligne bleue avec des valeurs de +température placées lors de changements significatifs.</p></div> <div class="sect3"> -<h4 id="S_InfoBox">6.4.1. The <strong>Information Box</strong></h4> -<div class="paragraph"><p>The Information box displays a large range of information about the dive -profile. Normally the Information Box is located to the top left of the -<strong>Dive Profile</strong> panel. The Information Box can be moved around in the <strong>Dive -Profile</strong> panel by click-dragging it with the mouse so that it is not -obstructing important detail. The position of the Information Box is saved -and used again during subsequent dive analyses.</p></div> +<h4 id="S_InfoBox">6.4.1. La boîte <strong>Information</strong></h4> +<div class="paragraph"><p>La boîte Information affiche un grand nombre d’informations concernant le +profil de plongée. Normalement, la boîte Information est située dans le coin +supérieur gauche du panneau <strong>Profil de plongée</strong>. Elle peut être déplacée +dans tout le panneau <strong>Profil de plongée</strong> en la cliquant-déplaçant avec la +souris à un endroit où elle ne masquera pas d’information importante. La +position de la boîte Information est enregistrée ré-utilisée pour les +analyses de plongée suivantes.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/InfoBox2.jpg" alt="Figure: Information Box" /> @@ -3277,13 +3367,13 @@ panel. These are:</p></div> <td class="icon"> <img src="images/icons/MOD.jpg" alt="Note" /> </td> -<td class="content">Show the <strong>Maximum Operating Depth (MOD)</strong> of the dive, given the gas mixture -used. MOD is dependent on the oxygen concentration in the breathing gas. -For air (21% oxygen) it is around 57 m if a maximum pO<sub>2</sub> of 1.4 is -specified in the <strong>Preferences</strong> section (select <em>File → Preferences → -Profile</em> and edit the text box <em>pO<sub>2</sub> in calculating MOD</em>. When diving -below the MOD there is a markedly increased risk of exposure to the dangers -of oxygen toxicity.</td> +<td class="content">Affiche la <strong>Profondeur maximale d’utilisation (MOD)</strong> d’une plongée, en +fonction du mélange gazeux utilisé. La MOD dépend de la concentration en +oxygène du gaz respiré. Pour l’air (21% d’oxygène), il vaut envuron 57m si +une pO<sub>2 maximale de 1.4 est choisie dans la section <strong>Préférences</strong> +(sélectionnez <em>Fichier → Préférences → Profil</em> et éditez le champ <em>pO</sub>2 +dans le calcul de MOD</em>). En plongeant sous la MOD, il y a un risque +important d’exposition aux dangers liés à la toxicité de l’oxygène.</td> </tr></table> </div> <div class="admonitionblock"> @@ -3335,8 +3425,8 @@ trimix diver can expect the same narcotic effect as a diver breathing air diving at a depth equalling the END.</td> </tr></table> </div> -<div class="paragraph"><p>Figure (<strong>B</strong>) above shows an information box with a nearly complete set of -data.</p></div> +<div class="paragraph"><p>La figure (<strong>B</strong>) ci-dessous affiche une boîte d’information avec un ensemble +quasiment complet de données.</p></div> <div class="sect4"> <h5 id="S_gas_pressure_graph">The Gas Pressure Bar Graph</h5> <div class="paragraph"><p>On the left of the <strong>Information Box</strong> is a vertical bar graph showing the @@ -3445,7 +3535,7 @@ Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters f </div> </div> <div class="sect3"> -<h4 id="_computer_reported_events_during_dive">6.4.2. Computer-reported events during dive</h4> +<h4 id="_événements_rapportés_par_l_8217_ordinateur_durant_la_plongée">6.4.2. Événements rapportés par l’ordinateur durant la plongée</h4> <div class="paragraph"><p>Many dive computers record events during a dive. For instance, most dive computers report alarms relating to high partial pressures of oxygen, to rapid ascents or the exceeding of no-deco limits (NDL). On the other hand, @@ -3476,7 +3566,7 @@ dive. These are indicated as a small red flag on the profile and are discussed more fully in the section on <a href="#S_Bookmarks"><em>inserting bookmarks</em></a>.</p></div> </div> <div class="sect3"> -<h4 id="_the_profile_toolbar">6.4.3. The Profile Toolbar</h4> +<h4 id="_la_barre_d_8217_outils_du_profil">6.4.3. La barre d’outils du profil</h4> <div class="paragraph"><p>The dive profile can include graphs of the <strong>partial pressures</strong> of O<sub>2</sub>, N<sub>2</sub>, and He during the dive (see figure above) as well as a calculated and dive computer reported deco ceilings (only visible for deep, long, or @@ -3488,8 +3578,8 @@ shown below the profile data.</p></div> <td class="icon"> <img src="images/icons/O2.jpg" alt="Note" /> </td> -<td class="content">Show the partial pressure of <strong>oxygen</strong> during the dive. This is shown below -the dive depth and water temperature graphs.</td> +<td class="content">Affiche la pression partielle d'<strong>oxygène</strong> durant la plongée. Ceci est +affiché sous les graphiques de profondeur et de température de l’eau.</td> </tr></table> </div> <div class="admonitionblock"> @@ -3497,7 +3587,7 @@ the dive depth and water temperature graphs.</td> <td class="icon"> <img src="images/icons/N2.jpg" alt="Note" /> </td> -<td class="content">Show the partial pressure of <strong>nitrogen</strong> during the dive.</td> +<td class="content">Affiche la pression partielle d'<strong>azote</strong> durant la plongée.</td> </tr></table> </div> <div class="admonitionblock"> @@ -3505,8 +3595,9 @@ the dive depth and water temperature graphs.</td> <td class="icon"> <img src="images/icons/He.jpg" alt="Note" /> </td> -<td class="content">Display of the partial pressure of <strong>helium</strong> during the dive. This is only -important to divers using Trimix, Helitrox or similar breathing gasses.</td> +<td class="content">Affiche la pression partielle d'<strong>hélium</strong> durant la plongée. Ceci n’est +important que pour les plongeurs qui utilisent du Trimix, du Triox +(Helitrox) ou d’autres mélanges gazeux similaires.</td> </tr></table> </div> <div class="paragraph"><p>The <strong>air consumption</strong> graph displays the tank pressure and its change during @@ -3527,8 +3618,9 @@ the color is a representation of the breathing gas density.</p></div> <td class="icon"> <img src="images/icons/Heartbutton.png" alt="Note" /> </td> -<td class="content">Clicking on the heart rate button allows display of heart rate information -during the dive if the dive computer was attached to a heart rate sensor.</td> +<td class="content">Cliquer sur le bouton Communter le rythme cardique permet d’afficher +l’information de rythme cardiaque pendant la plongée si l’ordinateur de +plongée est jumelé avec un détecteur de rythme cardique.</td> </tr></table> </div> <div class="paragraph"><p>It is possible to <strong>zoom</strong> into the profile graph. This is done either by @@ -3558,10 +3650,10 @@ underneath the two red dots.</td> <td class="icon"> <img src="images/icons/ShowPhotos.png" alt="Note" /> </td> -<td class="content">Photographs that have been added to a dive can be shown on the profile by -selecting the <strong>Show-photo</strong> button. The position of a photo on the profile -shows the exact time when this photo was taken. If this button is not -active, the photos are hidden.</td> +<td class="content">Les photos qui ont été ajoutées à une plongée peuvent être affichées sur le +profil en sélectionnant le bouton <strong>Communer l’affichage des images</strong>. La +position d’une photo sur le profil indique le moment exact où la photo a été +prise. Si le bouton n’est pas actif, les photos sont masquées.</td> </tr></table> </div> <div class="paragraph"><p>The profile can also include the dive computer reported <strong>ceiling</strong> (more @@ -3593,9 +3685,10 @@ computers offer longer non-stop bottom times.</p></div> <td class="icon"> <img src="images/icons/cceiling.jpg" alt="Note" /> </td> -<td class="content">If the dive computer itself calculates a ceiling and makes it available to -<em>Subsurface</em> during upload of dives, this can be shown as a red area by -checking <strong>Dive computer reported ceiling</strong> button on the Profile Panel.</td> +<td class="content">Si l’ordinateur de plongée calcule une palier et le rend disponible à +<em>Subsurface</em> durant le chargement des plongées, il peut être affiché sous la +forme d’une zone rouge en cochant le bouton "Commuter le plafond rapporté +par l’ordinateur de plongée" dans le panneau Profil.</td> </tr></table> </div> <div class="admonitionblock"> @@ -3603,10 +3696,10 @@ checking <strong>Dive computer reported ceiling</strong> button on the Profile P <td class="icon"> <img src="images/icons/ceiling1.jpg" alt="Note" /> </td> -<td class="content">If the <strong>Calculated ceiling</strong> button on the Profile Panel is clicked, then a -ceiling, calculated by <em>Subsurface</em>, is shown in green if it exists for a -particular dive (<strong>A</strong> in figure below). This setting can be modified in two -ways:</td> +<td class="content">Si le bouton <strong>Communter le plafond calculé</strong> du panneau Profil est cliqué, un +plafond, calculé par <em>Subsurface</em> est affiché en vert s’il existe pour une +plongée donnée (<strong>A</strong> dans l’image ci-dessous). Ceci peut être modifié de deux +façons:</td> </tr></table> </div> <div class="admonitionblock"> @@ -3614,9 +3707,9 @@ ways:</td> <td class="icon"> <img src="images/icons/ceiling2.jpg" alt="Note" /> </td> -<td class="content">If, in addition, the <strong>show all tissues</strong> button on the Profile Panel is -clicked, the ceiling is shown for the tissue compartments following the -Bühlmann model (<strong>B</strong> in figure below).</td> +<td class="content">Si, en outre, le bouton <strong>Commuter l’affichage de tous les tissus</strong> est +cliqué, le plafond est affiché pour les compartiments de tissus selon le +modèle Bühlmann (<strong>B</strong> dans l’image ci-dessous).</td> </tr></table> </div> <div class="admonitionblock"> @@ -3625,8 +3718,9 @@ Bühlmann model (<strong>B</strong> in figure below).</td> <img src="images/icons/ceiling3.jpg" alt="Note" /> </td> <td class="content"> -<div class="paragraph"><p>If, in addition, the <strong>3m increments</strong> button on the Profile Panel is clicked, -then the ceiling is indicated in 3 m increments (<strong>C</strong> in figure below).</p></div> +<div class="paragraph"><p>Si, en plus le bouton <strong>Commuter le plafond calculé avec des incréments de +3m</strong> est cliqué, le plafond est affiché avec des incréments de 3m (<strong>C</strong> dans +l’image ci-dessous).</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Ceilings2.jpg" alt="Figure: Ceiling with 3m resolution" /> @@ -3797,7 +3891,7 @@ tissues at the end of the dive.</p></div> </div> </div> <div class="sect3"> -<h4 id="_the_dive_profile_context_menu">6.4.4. The Dive Profile context menu</h4> +<h4 id="_le_menu_contextuel_du_profil_de_plongée">6.4.4. Le menu contextuel du Profil de plongée</h4> <div class="paragraph"><p>The context menu for the Dive Profile is accessed by right-clicking while the mouse cursor is over the Dive Profile panel. The menu allows creating Bookmarks, Gas Change Event markers, or manual CCR set-point changes other @@ -3819,10 +3913,10 @@ from the context menu.</p></div> </div> </div> <div class="sect1"> -<h2 id="_organizing_the_logbook_manipulating_groups_of_dives">7. Organizing the logbook (Manipulating groups of dives)</h2> +<h2 id="_organiser_le_carnet_de_plongée_manipuler_des_groupes_de_plongées">7. Organiser le carnet de plongée (manipuler des groupes de plongées)</h2> <div class="sectionbody"> <div class="sect2"> -<h3 id="S_DiveListContextMenu">7.1. The Dive List context menu</h3> +<h3 id="S_DiveListContextMenu">7.1. Le menu contextuel de la Liste des plongées</h3> <div class="paragraph"><p>Several actions on either a single dive, or a group of dives, can be performed using the Dive List Context Menu. It is found by selecting either a single dive or a group of dives and then right-clicking.</p></div> @@ -3831,9 +3925,10 @@ a single dive or a group of dives and then right-clicking.</p></div> <img src="images/ContextMenu.jpg" alt="Figure: Context Menu" /> </div> </div> -<div class="paragraph"><p>The context menu is used in many functions described below.</p></div> +<div class="paragraph"><p>Le menu contextuel est utilisé pour de nombreuses fonctions décrites +ci-dessous.</p></div> <div class="sect3"> -<h4 id="S_Divelist_columns">7.1.1. Customizing the columns showed in the <strong>Dive List</strong> panel</h4> +<h4 id="S_Divelist_columns">7.1.1. Personnaliser les colonnes affichées dans le panneau <strong>Liste des plongées</strong></h4> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" /> @@ -3854,8 +3949,8 @@ are three icons:</p></div> <td class="icon"> <img src="images/icons/duringPhoto.png" alt="Note" /> </td> -<td class="content">This dive has photographs taken during the dive, typically using an -underwater camera.</td> +<td class="content">Cette plongée contient des photos prises durant la plongée, généralement +prises avec un appareil ou caméra submersible.</td> </tr></table> </div> <div class="admonitionblock"> @@ -3881,7 +3976,7 @@ or after the dive.</td> </div> </div> <div class="sect2"> -<h3 id="S_Renumber">7.2. Renumbering the dives</h3> +<h3 id="S_Renumber">7.2. Renuméroter les plongées</h3> <div class="paragraph"><p>Dives are normally numbered incrementally from non-recent dives (low sequence numbers) to recent dives (higher sequence numbers). Numbering of dives is not always consistent. For instance, when non-recent dives are @@ -3897,7 +3992,7 @@ List Context Menu to perform the renumbering. A popup window appears letting the user specify the starting number for the process.</p></div> </div> <div class="sect2"> -<h3 id="S_Group">7.3. Grouping dives into trips and manipulating trips</h3> +<h3 id="S_Group">7.3. Grouper des plongées en voyages et manipuler les voyages</h3> <div class="paragraph"><p>For regular divers, the dive list can rapidly become very long. <em>Subsurface</em> can group dives into <em>trips</em>. It does this by grouping dives that have date/times not separated by more than two days and creating a single heading @@ -3914,7 +4009,7 @@ having to scan a long lists of dives. To group the dives in a dive list, (from the Main Menu) select <em>Log → Auto group</em>. The <strong>Dive List</strong> panel 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> +<h4 id="_éditer_le_titre_et_l_8217_information_associée_à_un_voyage_déterminé">7.3.1. Éditer le titre et l’information associée à un voyage déterminé</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 bar from the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Notes</strong> @@ -3926,20 +4021,20 @@ the buttons at the top right of the <strong>Trip Notes</strong> tab. The trip ti <strong>Dive List</strong> panel should now reflect the edited information.</p></div> </div> <div class="sect3"> -<h4 id="_viewing_the_dives_during_a_particular_trip">7.3.2. Viewing the dives during a particular trip</h4> +<h4 id="_visualiser_les_plongées_d_8217_un_voyage_déterminé">7.3.2. Visualiser les plongées d’un voyage déterminé</h4> <div class="paragraph"><p>Once the dives have been grouped into trips, you can expand one or more trips by clicking the expansion button [+/-] on the left of each trip title. This expands the selected trip, revealing individual dives during the trip.</p></div> </div> <div class="sect3"> -<h4 id="_merging_dives_from_more_than_one_trip_into_a_single_trip">7.3.3. Merging dives from more than one trip into a single trip</h4> +<h4 id="_fusionner_des_plongées_venant_des_voyages_différents_en_un_seul_voyage">7.3.3. Fusionner des plongées venant des voyages différents en un seul voyage</h4> <div class="paragraph"><p>After selecting a trip title, the context menu allows the merging of trips by either merging the selected trip with the trip below or with the trip 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.4. Splitting a single trip into more than one trip</h4> +<h4 id="_diviser_un_voyage_en_plusieurs_voyages">7.3.4. Diviser un voyage en plusieurs voyages</h4> <div class="paragraph"><p>If a trip includes, for example, ten dives, you can split this trip into two trips (trip 1: top four dives; trip 2: bottom six dives) by selecting and right-clicking the top four dives. The resulting context menu lets the user @@ -3955,9 +4050,9 @@ right (B):</p></div> </div> </div> <div class="sect2"> -<h3 id="_manipulating_single_dives">7.4. Manipulating single dives</h3> +<h3 id="_manipuler_des_plongées_uniques">7.4. Manipuler des plongées uniques</h3> <div class="sect3"> -<h4 id="_delete_a_dive_from_the_dive_log">7.4.1. Delete a dive from the dive log</h4> +<h4 id="_effacer_une_plongée_du_carnet_de_plongée">7.4.1. Effacer une plongée du carnet de plongée</h4> <div class="paragraph"><p>Dives can be permanently deleted from the dive log by selecting and right-clicking them to bring up the context menu, then selecting <strong>Delete dive(s)</strong>. Typically this would apply to a case where a user wishes to delete @@ -3979,7 +4074,7 @@ within a separate trip. To do this, select and right-click the dive(s) to bring up the context menu, and then select <strong>Create new trip above</strong>.</p></div> </div> <div class="sect3"> -<h4 id="_shift_the_start_time_of_dive_s">7.4.4. Shift the start time of dive(s)</h4> +<h4 id="_décaler_l_8217_heure_de_début_d_8217_une_ou_plusieurs_plongées">7.4.4. Décaler l’heure de début d’une ou plusieurs plongées</h4> <div class="paragraph"><p>Sometimes it’s necessary to adjust the start time of a dive. This may apply to situations where dives are done in different time zones or when the dive computer has a wrong time. To do this, select and right-click the dive(s) to @@ -3989,7 +4084,7 @@ minutes) by which the dives should be adjusted and click on the option of whether the time adjustment should be earlier 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> +<h4 id="_fusionner_plusieurs_plongées_en_une_seule">7.4.5. Fusionner plusieurs plongées en une seule</h4> <div class="paragraph"><p>Sometimes a dive is briefly interrupted, for example, 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> @@ -4006,7 +4101,7 @@ merged:</p></div> </div> </div> <div class="sect3"> -<h4 id="_split_selected_dives">7.4.6. Split selected dives</h4> +<h4 id="_diviser_les_plongées_sélectionnées">7.4.6. Diviser les plongées sélectionnées</h4> <div class="paragraph"><p>On some occasions, a diver reaches the surface and immediately dives again. However, it may happen that the dive computer does not register a new dive, but continues the previous dive due to the brief surface interval. In @@ -4026,7 +4121,7 @@ to dives</a>.</p></div> to dives</a>.</p></div> </div> <div class="sect3"> -<h4 id="_undo_dive_manipulations">7.4.9. Undo dive manipulations</h4> +<h4 id="_annuler_les_manipuations_sur_les_plongées">7.4.9. Annuler les manipuations sur les plongées</h4> <div class="paragraph"><p>Important actions on dives or trips, described above, can be undone or redone. This includes: <em>delete dives</em>, <em>merge dives</em>, <em>split selected dives</em>, <em>renumber dives</em> and <em>shift dive times</em>. To do this after @@ -4035,7 +4130,7 @@ brings up the possibility to <em>Undo</em> or <em>Redo</em> an action.</p></div> </div> </div> <div class="sect2"> -<h3 id="S_Filter">7.5. Filtering the dive list</h3> +<h3 id="S_Filter">7.5. Filtrer la liste des plongées</h3> <div class="paragraph"><p>The dives in the <strong>Dive List</strong> panel can be filtered, selecting only some of the dives based on their attributes, e.g. dive tags, dive site, divemaster, buddy or protective clothing. For instance, filtering lets you list the deep @@ -4074,9 +4169,9 @@ those dives that have either one OR both of these tags.</p></div> </div> </div> <div class="sect1"> -<h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2> +<h2 id="S_ExportLog">8. Export le carnet de plongée ou des parties de celui-ci</h2> <div class="sectionbody"> -<div class="paragraph"><p>There are two ways to export dive information from Subsurface:</p></div> +<div class="paragraph"><p>Il y a deux façons d’exporter des informations de plongée depuis Subsurface:</p></div> <div class="ulist"><ul> <li> <p> @@ -4111,20 +4206,21 @@ entry</em>." Close this message panel.</p></div> <img src="images/facebook1.jpg" alt="Figure: Facebook login" /> </div> </div> -<div class="paragraph"><p>Having established a login to <em>Facebook</em>, transferring a dive profile to a -<em>Facebook</em> timeline is easy. In the <em>Subsurface</em> <strong>Dive List</strong> panel, -highlight the dive to be transferred. Then, from the <strong>Main Menu</strong>, select -<em>Share on → Facebook</em>. A dialogue box is shown, determining the amount of -additional information to be transferred with the dive profile (image <strong>A</strong>, -below). To transfer a dive profile to <em>Facebook</em>, the name of a <em>Facebook</em> -album is needed. The checkboxes on the left hand side determine how much -additional information is added to the dive profile, shown in the text box -on the right hand side of the panel (image <strong>A</strong>, below). Customise the -message that will be posted with the dive profile by editing any of the -information. After specifying additional information and verifying the text, -select the <em>OK</em> button that triggers the transfer to <em>Facebook</em>. After the -transfer is done, an acknowledgement dialogue appears, indicating it was -successful.</p></div> +<div class="paragraph"><p>Une fois qu’une connexion à <em>Facebook</em> est établie, transférer un profil de +plongée vers <em>Facebook</em> est facile. Dans le panneau <strong>Liste des plongées</strong> de +<em>Subsurface</em>, sélectionnez la plongée à transférer. Ensuite, à partir du +<strong>menu principal</strong>, sélectionnez <em>Partager sur → Facebook</em>. Une fenêtre +s’affiche, pour déterminer quelles informations seront transférées avec le +profil de plongée (image <strong>A</strong> ci-dessous). Pour transférer un profil de +plongée vers <em>Facebook</em>, le nom d’un album <em>Facebook</em> doit être fourni. Les +cases à cocher sur la partie gauche permettent de sélectionner des +informations supplémentaires à transférer avec le profil de plongée. Ces +informations sont affichées dans le champs de texte sur la partie droite du +panneau. (image <strong>A</strong> ci dessous). Personnalisez le message qui sera envoyé +avec le profil de plongée en modifiant les informations. Une fois les +informations supplémentaires ajoutées et vérifiées, sélectionner le bouton +<em>OK</em> qui effectue le transfert vers <em>Facebook</em>. Après le transfert, une +fenêtre de confirmation apparait ,indiquant le succès du transfert.</p></div> <div class="paragraph"><p>À la fois l’album créé et la publication sur votre ligne temporelle seront marquées comme privés. Pour que vos amis puissent la voir, connectez-vous à <em>Facebook</em> depuis un navigateur ou l’application Facebook et modifiez les @@ -4149,11 +4245,13 @@ below).</p></div> <img src="images/Export_f20.jpg" alt="Figure: Export dialog" /> </div> </div> -<div class="paragraph"><p>A dive log or part of it can be saved in several formats:</p></div> +<div class="paragraph"><p>Un carnet de plongée ou une partie de celui-ci peut être enregistré dans +différents formats:</p></div> <div class="ulist"><ul> <li> <p> -<em>Subsurface XML</em> format. This is the native format used by <em>Subsurface</em>. +Format <em>Subsurface XML</em>. C’est le format utilisé nativement par + <em>Subsurface</em>. </p> </li> <li> @@ -4454,11 +4552,11 @@ user profile and settings, including unique cloud and <em>Subsurface-Mobile</em> </div> </div> <div class="sect1"> -<h2 id="S_PrintDivelog">11. Printing a dive log</h2> +<h2 id="S_PrintDivelog">11. Imprimer un carnet de plongée</h2> <div class="sectionbody"> <div class="paragraph"><p><em>Subsurface</em> provides a simple and flexible way to print a whole dive log or only a few selected dives. Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.</p></div> -<div class="paragraph"><p>Some decisions need to be made before printing:</p></div> +<div class="paragraph"><p>Certains choix doivent être fait avant l’impression:</p></div> <div class="ulist"><ul> <li> <p> @@ -4611,14 +4709,15 @@ information on how to write or modify a template.</p></div> <div class="sect1"> <h2 id="S_Configure">12. Configurer un ordinateur de plongée</h2> <div class="sectionbody"> -<div class="paragraph"><p><em>Subsurface</em> lets you configure a dive computer. Currently, the -Heinrichs-Weikamp (OSTC 2/2N/2C, OSTC 3, Sport) and Suunto Vyper (Stinger, -Mosquito, D3, Vyper, Vytec, Cobra, Gekko and Zoop) family of dive computers -are supported. A large number of settings of these dive computers can be -read and changed to different values. To begin, be sure the appropriate -hardware driver is installed for the dive computer (also required for -downloading dives) and the device name of the dive computer is known. See -<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">APPENDIX A</a> for information on how to do this.</p></div> +<div class="paragraph"><p><em>Subsurface</em> vous permet de configurer un ordinateur de +plongée. Actuellement, les familles d’ordinateurs supportés sont +Heinrichs-Weikamp (OSTC 2/2N/2C, OSTC 3, Sport) et Suunto Vyper (Stinger, +Mosquito, D3, Vyper, Vytec, Cobra, Gekko et Zoop). De nombreux paramètres de +ces ordinateurs de plongée peuvent être lues et modifiées. Pour commencer, +assurez vous que les pilotes pour votre ordinateur de plongée sont installés +(également nécessaire pour télécharger les plongées) et que le nom de +périphérique de l’ordinateur de plongée est connu. Voir +<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">ANNEXE A</a> pour plus d’informations sur la manière de procéder.</p></div> <div class="paragraph"><p>Une fois que l’ordinateur de plongée est connecté à <em>Subsurface</em>, sélectionner <em>Fichier → Configurer l’ordinateur de plongée</em>, à partir du menu principal. Sélectionner le nom du périphérique (ou le point de montage) @@ -4772,8 +4871,8 @@ represented either as traditional coordinates (degrees, minutes, seconds) or as decimal degrees Choose the appropriate option.</p></div> </div> <div class="sect2"> -<h3 id="_profile">13.3. Profile</h3> -<div class="paragraph"><p>This panel has three sections:</p></div> +<h3 id="_profil">13.3. Profil</h3> +<div class="paragraph"><p>Ce panneau comporte trois sections:</p></div> <div class="imageblock" id="S_CCR_options" style="text-align:center;"> <div class="content"> <img src="images/Pref4_f23.jpg" alt="FIGURE: Preferences Graph page" /> @@ -4923,8 +5022,8 @@ was no gas switch to such a cylinder), then these cylinders are omitted from tha </ul></div> </div> <div class="sect2"> -<h3 id="_language">13.4. Language</h3> -<div class="paragraph"><p>Choose a language that <em>Subsurface</em> will use.</p></div> +<h3 id="_langue">13.4. Langue</h3> +<div class="paragraph"><p>Choisissez une langue que <em>Subsurface</em> utilisera.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Pref3_f23.jpg" alt="FIGURE: Preferences Language page" /> @@ -4937,11 +5036,11 @@ country combination from the list of locations. The <em>Filter</em> text box to list similar languages. For instance there are several system variants of English or French. <strong>This particular preference requires a restart of <em>Subsurface</em> to take effect</strong>.</p></div> -<div class="paragraph"><p>In this section also specify appropriate date and time formats for showing -dive details.</p></div> +<div class="paragraph"><p>Dans cette section, spécifiez également les formats de date et d’heure pour +l’affiche des détails de plongée.</p></div> </div> <div class="sect2"> -<h3 id="_network">13.5. Network</h3> +<h3 id="_réseau">13.5. Réseau</h3> <div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources on the Internet. This is important, for instance, when <em>Subsurface</em> needs to communicate with web services such as Cloud storage, the @@ -4997,7 +5096,7 @@ from your ISP. </ul></div> </div> <div class="sect2"> -<h3 id="_georeference">13.6. Georeference</h3> +<h3 id="_géoréférencement">13.6. Géoréférencement</h3> <div class="paragraph"><p><em>Subsurface</em> provides a geo-lookup service (that is, given the coordinates of a dive site) derived from a click on the <strong>Dive Map panel</strong> at the bottom right of the <em>Subsurface</em> window, or from a GPS instrument or from the @@ -5015,7 +5114,7 @@ below).</p></div> </div> </div> <div class="sect1"> -<h2 id="S_DivePlanner">14. The <em>Subsurface</em> dive planner</h2> +<h2 id="S_DivePlanner">14. Le planificateur de plongée de <em>Subsurface</em></h2> <div class="sectionbody"> <div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessed by selecting <em>Log → Plan Dive</em> from the main menu. It allows calculation of inert gas @@ -5028,51 +5127,52 @@ of gradient factors as implemented by Erik Baker, or using the VPM-B model.</p>< <td class="icon"> <img src="images/icons/warning2.png" alt="Warning" /> </td> -<td class="content">The <em>Subsurface</em> dive planner IS CURRENTLY EXPERIMENTAL and assumes the user -is already familiar with the <em>Subsurface</em> user interface. It is explicitly -used under the following conditions:</td> +<td class="content">Le planificateur de plongée de <em>Subsurface</em> EST POUR L’INSTANT EN PHASE +EXPÉRIMENTALE et suppose que l’utilisateur est déjà familier avec +l’interface utilisateur de <em>Subsurface</em>. Il est utilisé explicitement aux +conditions suivantes:</td> </tr></table> </div> <div class="ulist"><ul> <li> <p> -The user is conversant with dive planning and has the necessary training to - perform dive planning. +L’utilisateur est bien informé au sujet de la planification de plongée et a + la formation nécessaire pour faire une planification de plongée. </p> </li> <li> <p> -The user plans dives within his/her certification limits. +L’utilisateur planifie des plongées dans les limites de sa certification. </p> </li> <li> <p> -Dive planning makes large assumptions about the characteristics of the - <em>average person</em> and cannot compensate for individual physiology or health - or personal history or life style characteristics. +La planification de plongée se base sur les caractéristiques d’une <em>personne + normale</em> et ne peut compenser les caractéristiques physiologiques, l'état de + santé, l’historique personnel et les caractéristiques du mode de vie. </p> </li> <li> <p> -The safety of a dive plan depends heavily on the way in which the planner is - used. +La sécurité d’une planification de plongée dépend en grande partie de la + façon dont le planificateur est utilisé. </p> </li> <li> <p> -The user is familiar with the user interface of <em>Subsurface</em>. +L’utilisateur est familier avec l’interface de <em>Subsurface</em>. </p> </li> <li> <p> -A user who is not absolutely sure about any of the above requirements should - not use this feature. +Un utilisateur qui n’est pas absolument certain d’un des prérequis ci-dessus + ne devrait pas utiliser cette fonction. </p> </li> </ul></div> </div></div> <div class="sect2"> -<h3 id="_the_em_subsurface_em_dive_planner_screen">14.1. The <em>Subsurface</em> dive planner screen</h3> +<h3 id="_l_écran_du_planificateur_de_plongée_em_subsurface_em">14.1. L'écran du planificateur de plongée <em>Subsurface</em></h3> <div class="paragraph"><p>Like the <em>Subsurface</em> dive log, the planner screen is divided into several sections (see image below). The <strong>setup</strong> parameters for a dive are entered into the sections on the left hand and bottom side of the screen. They are: @@ -5092,7 +5192,7 @@ messages about the dive plan are printed.</p></div> </div> </div> <div class="sect2"> -<h3 id="_open_circuit_dives">14.2. Open circuit dives</h3> +<h3 id="_plongées_en_circuit_ouvert">14.2. Plongées en circuit ouvert</h3> <div class="ulist"><ul> <li> <p> @@ -5102,7 +5202,7 @@ Towards the center bottom of the planner (circled in blue in the image <div class="ulist"><ul> <li> <p> -Open Circuit (the default) +Circuit ouvert (option par défaut) </p> </li> <li> @@ -5119,7 +5219,7 @@ pSCR </li> <li> <p> -Choose the Open Circuit option. +Choisissez l’option Circuit ouvert. </p> </li> <li> @@ -5147,7 +5247,8 @@ In the table labelled <em>Available Gases</em>, add the information of the </li> <li> <p> -The <em>Available Gases</em> table includes three gas depth fields, labelled: +Le tableau <em>Gaz disponibles</em> inclut trois champs de profondeur de gaz, + nommés: </p> <div class="ulist"><ul> <li> @@ -5174,7 +5275,7 @@ MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based on the </li> <li> <p> -The profile of the planned dive can be created in two ways: +Le profil d’une plongée planifiée peut être créé de deux façons: </p> <div class="ulist"><ul> <li> @@ -5203,7 +5304,7 @@ The most efficient way to create a dive profile is to enter the appropriate </li> </ul></div> <div class="sect3"> -<h4 id="_recreational_dives">14.2.1. Recreational dives</h4> +<h4 id="_plongées_loisir">14.2.1. Plongées loisir</h4> <div class="paragraph"><p>Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL). It computes the maximum time a diver can stay at the current depth without needing mandatory decompression stops and without using more than the existing gas (minus a reserve). The planner automatically takes @@ -5274,8 +5375,9 @@ Define the depth of the dive by dragging the waypoints (white dots) on the </li> <li> <p> -The ascent speed can be changed. The default ascent speeds are those - considered safe for recreational divers. +La vitesse de remontée peut être modifiée. Les vitesses de remontée par + défaut sont celles qui sont considérées comme sûres pour les plongées + loisir. </p> </li> </ul></div> @@ -5324,7 +5426,17 @@ at the cost of higher tissue compartment pressures in the slow tissues. When selecting one of these models, keep in mind they are NOT exact physiological models but only mathematical models that appear to work in practice.</p></div> -<div class="paragraph"><p>For more information external to this manual see:</p></div> +<div class="paragraph"><p>Please note as well that there is an intrinsic assumption of the VPM-B model +that off-gassing only happens during the ascent phase of the dive (which is +the part controlled by the planner). Thus it is possible to get misleading +results if you manually enter waypoints well in the decompression phase of +your dive. This is particularly relevant when editing a dive read from disk +in the planner since that will have waypoints up to the surface. Thus for +those dives, first delete all waypoints during the ascent phase. This is +most easily done by holding the Ctrl- or Command-key while clicking on the +trash can icon next to the first ascent waypoint in the table on the left +hand side.</p></div> +<div class="paragraph"><p>Pour plus d’information en dehors de ce manuel, voir:</p></div> <div class="ulist"><ul> <li> <p> @@ -5338,8 +5450,8 @@ practice.</p></div> factors for dummies, by Kevin Watts</a> <a href="https://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers"><em>Deco for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10: -1-905492-07-3. An excellent non-technical review that discusses both the -Bühlmann deco model and the VPM-B model. +1-905492-07-3. Un excellent livre non technique qui traite à la fois des +modèles de décompression Bühlmann et VPM-B. </p> </li> </ul></div> @@ -5427,8 +5539,9 @@ computed assuming the diver uses a CCR with the specified set-point. If the last segment (however short) is on open circuit (OC, indicated by a zero set-point) the decompression is computed in OC mode and the planner only considers gas changes in OC mode.</p></div> -<div class="paragraph"><p>Below is an example of a dive plan to 45m using Tx21/35, followed by an -ascent using EAN50 and oxygen and using the settings as described above.</p></div> +<div class="paragraph"><p>Ci-dessous, vous trouverez un exemple d’une planification de plongée +utilisant du Tx21/35, suivie d’une remontée utilisant de l’EAN50 et de +l’oxygène, et utilisant les réglages décrits ci-dessous.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Planner_OC_deco_VPM.jpg" alt="FIGURE: Planning a dive: setup" /> @@ -5437,7 +5550,7 @@ ascent using EAN50 and oxygen and using the settings as described above.</p></di <div class="paragraph"><p>Once the above steps have been completed, save by clicking the <em>Save</em> button towards the top middle of the planner. The saved dive plan will appear in the <strong>Dive List</strong> panel of <em>Subsurface</em>.</p></div> -<div class="paragraph"><p><strong>The dive plan details</strong></p></div> +<div class="paragraph"><p><strong>Les détails du plan de plongée</strong></p></div> <div class="paragraph"><p>On the bottom right of the dive planner, under <em>Dive Plan Details</em>, the exact details of the dive plan are provided. These details may be modified by checking any of the options under the <em>Notes</em> section of the dive @@ -5477,7 +5590,7 @@ in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.< </div> </div> <div class="sect2"> -<h3 id="_planning_ccr_dives">14.4. Planning CCR dives</h3> +<h3 id="_planifier_des_plongées_ccr_recycleur">14.4. Planifier des plongées CCR (recycleur)</h3> <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 @@ -5502,7 +5615,7 @@ this is calculated for bail out ascents.</p></div> is not calculated, so gas consumptions of 0 liters are the norm.</p></div> </div> <div class="sect2"> -<h3 id="S_Replan">14.5. Modifying an existing dive plan</h3> +<h3 id="S_Replan">14.5. Modifier une planification existante</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 no way to change a saved dive plan. To change a dive plan, select it on the <strong>Dive @@ -5517,7 +5630,7 @@ dive and do not influence other each during decompression calculation (see next section).</p></div> </div> <div class="sect2"> -<h3 id="_planning_for_repetitive_dives">14.6. Planning for repetitive dives</h3> +<h3 id="_planifier_des_plongées_successives">14.6. Planifier des plongées successives</h3> <div class="paragraph"><p>Repetitive dives can easily be planned if the dates and start times of the repetitive dive set are specified appropriately in the top left-hand <em>Start Time</em> field. <em>Subsurface</em> calculates the gas loading figures and the affect @@ -5534,7 +5647,7 @@ the <strong>Dive List</strong> and activate the planner: the planner takes into configuration in the highlighted dive.</p></div> </div> <div class="sect2"> -<h3 id="_printing_the_dive_plan">14.7. Printing the dive plan</h3> +<h3 id="_imprimer_un_plan_de_plongée">14.7. Imprimer un plan de plongée</h3> <div class="paragraph"><p>Selecting the <em>Print</em> button in the planner allows printing of the <em>Dive Plan Details</em> for wet notes. You can also cut and paste the <em>Dive Plan Details</em> to include in a text file or word processing document.</p></div> @@ -5545,7 +5658,7 @@ is to use the <em>File → Print</em> function on the main menu in the same for dive logs or by copy and paste to a word processor.</p></div> </div> <div class="sect2"> -<h3 id="S_MergeDivePlan">14.8. Saving a dive with its dive plan</h3> +<h3 id="S_MergeDivePlan">14.8. Enregistrer une plongée avec sa planification</h3> <div class="paragraph"><p>In the section dealing with <a href="#S_MultipleDiveComputers">dives using more than one dive computer</a> we discussed the way in which multiple profiles for a single dive can be viewed using the left-arrow and right-arrow keyboard keys. A similar method can be used for saving a dive plan with the profile @@ -5584,7 +5697,7 @@ righ-arrow/left-arrow keyboard keys.</p></div> </div> </div> <div class="sect1"> -<h2 id="_running_em_subsurface_em_from_the_command_line">15. Running <em>Subsurface</em> from the command-line</h2> +<h2 id="_lancer_em_subsurface_em_depuis_la_ligne_de_commande">15. Lancer <em>Subsurface</em> depuis la ligne de commande</h2> <div class="sectionbody"> <div class="paragraph"><p><em>Subsurface</em> can be launched from the command-line to set some specialised settings or as part of an script-based automated process for manipulating a @@ -5593,7 +5706,7 @@ dive log. The format for launching <em>Subsurface</em> from the command-line is: <div class="content"> <pre><code>subsurface [options] [logfile ...] [--import logfile ...]</code></pre> </div></div> -<div class="paragraph"><p>The options include:</p></div> +<div class="paragraph"><p>Ces options incluent:</p></div> <div class="tableblock"> <table rules="all" width="100%" @@ -5753,7 +5866,7 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </ul></div> </div> <div class="sect2"> -<h3 id="_edit">16.2. Edit</h3> +<h3 id="_édition">16.2. Édition</h3> <div class="ulist"><ul> <li> <p> @@ -5939,8 +6052,9 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives. </li> <li> <p> -<em>Check for updates</em> - Find out whether a newer version of Subsurface is - available on the <a href="https://subsurface-divelog.org/"><em>Subsurface</em> web site</a>. +<em>Vérifier les mises à jour</em> - Vérifier si une nouvelle version de + Subsurface est disponible sur le <a href="https://subsurface-divelog.org/">site web de + <em>Subsurface</em> </a>. </p> </li> <li> @@ -5992,12 +6106,13 @@ Sous Windows, le bon pilote devrait être téléchargé automatiquement la </p> </li> </ul></div> -<div class="paragraph"><p>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 -computer using a USB-to-serial interface based on the Silicon Labs CP2101 or -similar chip can be found as <em>Mac_OSX_VCP_Driver.zip</em> at the -<a href="https://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101">Silicon -Labs document and software repository</a>.</p></div> +<div class="paragraph"><p>Sous Mac, les utilisateurs peuvent parfois avoir besoin d’installer +manuellement le bon pilote. Par exemple, pour le Mares Puck ou n’importe +quel autre ordinateur de plongée utilisant une interface USB-série basé sur +le composant Silicon Labs CP2101 ou similaire, le bon pilote est disponible +sous <em>Mac_OSX_VCP_Driver.zip</em> sur le +<a href="https://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101">dépôt +de documents et logiciels Silicon Labs</a>.</p></div> </div> <div class="sect2"> <h3 id="S_HowFindDeviceName">17.2. Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture</h3> @@ -6119,7 +6234,7 @@ Upload Log</em> and wait for the <em>Wait PC</em> message.</p></div> <div class="ulist"><ul> <li> <p> -<strong>Pair the <em>Subsurface</em> computer with the dive computer.</strong> +<strong>Jumeler l’ordinateur utilisant <em>Subsurface</em> avec l’ordinateur de plongée.</strong> </p> </li> </ul></div> @@ -6162,7 +6277,7 @@ process.</p></div> <div class="ulist"><ul> <li> <p> -Enable the Bluetooth controller and pair your dive computer +Activez le contrôleur Bluetooth et jumelez votre ordinateur de plongée </p> </li> <li> @@ -6438,8 +6553,8 @@ available from some Internet web sites e.g. Windows-based IrDA drivers for the Uwatec can also be downloaded from the ScubaPro web site, with drivers 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 class="paragraph"><p>Pour les ordinateurs Apple Mac, la connection IrDA via l’interface MCS7780 +n’est plus disponible depuis OSX 10.6 ou supérieur.</p></div> </div> <div class="sect2"> <h3 id="S_ImportingDR5">18.3. Importing from Heinrichs Weikamp DR5</h3> @@ -6934,11 +7049,12 @@ pour convertir un carnet de plongée enregistrée sous forme de tableur vers un fichier CSV qui pourra ensuite être importé dans <em>Subsurface</em>. Créer un fichier CSV est simple malgré que la procédure soit différente selon le tableur utilisé.</p></div> -<div class="paragraph"><p>Organize the diving data in the spreadsheet, so the first row contains the -names (or titles) of each column and the information for each dive is stored -in a single row. <em>Subsurface</em> supports many data items (Dive number, Date, -Time, Duration, Location, GPS, Max. Depth, Mean Depth, Buddy, Notes, Weight -and Tags). Organize dive data following a few simple rules:</p></div> +<div class="paragraph"><p>Organiser les données de plongées dans le tableur pour que la première ligne +contienne le nom (ou le titre) de chaque colonne et que les informations de +chaque plongée soient contenues sur une seule ligne. <em>Subsurface</em> supporte +de nombreux éléments (Dive #, Date, Time, Duration, Location, GPS, +Max. Depth, Mean Depth, Buddy, Notes, Weight et Tags). Organiser les +données de plongées selon quelques règles simples :</p></div> <div class="olist arabic"><ol class="arabic"> <li> <p> @@ -7465,7 +7581,7 @@ page size.</td> </div> </div> <div class="sect1"> -<h2 id="_appendix_f_faqs">22. APPENDIX F: FAQs.</h2> +<h2 id="_annexe_f_faqs">22. ANNEXE F: FAQs.</h2> <div class="sectionbody"> <div class="sect2"> <h3 id="S_APPENDIX_F">22.1. Subsurface appears to miscalculate gas consumption and SAC</h3> @@ -7541,7 +7657,7 @@ salvaged after being overwritten by new dives.</p></div> <div id="footer"> <div id="footer-text"> Last updated - 2017-07-04 13:38:54 CEST + 2017-10-11 10:34:39 CEST </div> </div> </body> diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt index d1ea7a20f..10c164d6a 100644 --- a/Documentation/user-manual_fr.txt +++ b/Documentation/user-manual_fr.txt @@ -849,6 +849,7 @@ carnet en cours. Une sélection automatique est disponible. Certains utilisateurs de vêtement étanche peuvent utiliser ce champ pour enregistrer quelle ensemble de combinaison et souris ils ont utilisé. + *Évaluation*: attribue une évaluation subjective à une plongée sur une échelle de 5 points en cliquant sur l'étoile correspondante. @@ -1369,8 +1370,9 @@ using a comma as a field separator: Wismar Baltic,2012-12-01,10:13,35:27,15.4,Dieter Albrecht Pulau Weh,2012-12-20,09:46,55:56,38.6,Karaeng Bontonompo -The above data are not easily read by a human. Here is the same information -in TAB-delimited format: +Les données ci-dessus ne sont pas aisément lisible pour un être +humain. Voici les mêmes informations dans un format séparé par des +tabulations : Dive site Dive date Time Dive_duration Dive_depth Dive buddy Illovo Beach 2012-11-23 10:45 46:15 18.4 John Smith @@ -2439,7 +2441,7 @@ quasiment complet de données. [[S_gas_pressure_graph]] -===== Le graphique de pression gazeuse +===== The Gas Pressure Bar Graph On the left of the *Information Box* is a vertical bar graph showing the pressures of the nitrogen (and other inert gases, e.g. helium, if @@ -3871,6 +3873,17 @@ When selecting one of these models, keep in mind they are NOT exact physiological models but only mathematical models that appear to work in practice. +Please note as well that there is an intrinsic assumption of the VPM-B model +that off-gassing only happens during the ascent phase of the dive (which is +the part controlled by the planner). Thus it is possible to get misleading +results if you manually enter waypoints well in the decompression phase of +your dive. This is particularly relevant when editing a dive read from disk +in the planner since that will have waypoints up to the surface. Thus for +those dives, first delete all waypoints during the ascent phase. This is +most easily done by holding the Ctrl- or Command-key while clicking on the +trash can icon next to the first ascent waypoint in the table on the left +hand side. + Pour plus d'information en dehors de ce manuel, voir: * link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding |