From f9e6a3ecc6198cf4fb8fae856e258c461399aa5c Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Tue, 11 Oct 2016 10:57:09 +0200 Subject: Documentation: Merge french translations Signed-off-by: Guillaume GARDET Signed-off-by: Dirk Hohndel --- Documentation/50-pot/subsurface-mobile-manual.pot | 387 +++--- Documentation/50-pot/subsurface-user-manual.pot | 1356 +++++++++---------- Documentation/fr/po/subsurface-mobile-manual.fr.po | 411 +++--- Documentation/fr/po/subsurface-user-manual.fr.po | 1358 ++++++++++---------- Documentation/mobile-manual_fr.html.git | 228 ++-- Documentation/mobile-manual_fr.txt | 233 ++-- Documentation/user-manual_fr.html.git | 61 +- Documentation/user-manual_fr.txt | 44 +- 8 files changed, 2101 insertions(+), 1977 deletions(-) diff --git a/Documentation/50-pot/subsurface-mobile-manual.pot b/Documentation/50-pot/subsurface-mobile-manual.pot index 38af45653..4396820c6 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: 2016-07-21 10:32+0200\n" +"POT-Creation-Date: 2016-10-11 10:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,7 +26,7 @@ msgstr "" #. type: Plain text #: mobile-manual.txt:15 -msgid "[big]#Subsurface-mobile for Android: USER MANUAL#" +msgid "[big]#Subsurface-mobile USER MANUAL#" msgstr "" #. type: Plain text @@ -42,7 +42,7 @@ msgstr "" #. type: Plain text #: mobile-manual.txt:21 -msgid "[blue]#_Version 1.0, March 2016_#" +msgid "[blue]#_Version 1.1, September 2016_#" msgstr "" #. type: Plain text @@ -52,9 +52,9 @@ msgid "" "extensive infrastructure to describe, organize, interpret and print scuba " "and free dives. _Subsurface_ offers many advantages over other similar " "software solutions, including compatibility with Windows, Mac-OS/X, Linux " -"(many distributions) and Android (iOS under development). In addition, " -"_Subsurface_ is open-source software that allows downloading dive " -"information from most dive computers." +"(many distributions), Android and iOS. In addition, _Subsurface_ is " +"open-source software that allows downloading dive information from most dive " +"computers." msgstr "" #. type: Title - @@ -64,38 +64,34 @@ msgid "Introducing Subsurface-mobile" msgstr "" #. type: Plain text -#: mobile-manual.txt:38 +#: mobile-manual.txt:39 msgid "" -"_Subsurface-mobile_ is an extension of _Subsurface_ on laptop and tabletop " -"computers. It 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_ also allows the gathering of GPS " -"locations where dives are performed." -msgstr "" - -#. type: Plain text -#: mobile-manual.txt:41 -msgid "" -"Because of the restrictions of iOS, _Subsurface-mobile_ for iOS does not " -"have all the features of the same app for Android." +"_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)." msgstr "" #. type: Plain text #: mobile-manual.txt:51 msgid "" -"While _Subsurface-mobile_ allows one to enter and save dive information " -"using an Android device, 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 Android and the desktop versions. 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 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." msgstr "" #. type: Plain text #: mobile-manual.txt:53 -msgid "_Subsurface-mobile_ allows one to:" +msgid "_Subsurface-mobile_ allows you to:" msgstr "" #. type: Plain text @@ -117,17 +113,17 @@ msgstr "" #. type: Plain text #: mobile-manual.txt:59 -msgid "Manually create and add new dive records to one's dive log." +msgid "Manually create and add new dive records to your dive log." msgstr "" #. type: Plain text #: mobile-manual.txt:60 -msgid "Store the updated dive log on the Internet." +msgid "Store the updated dive log in the _Subsurface_ cloud storage." msgstr "" #. type: Plain text #: mobile-manual.txt:61 -msgid "Record, store and apply GPS positions of dives." +msgid "Record, store and apply GPS positions of dives (Android only)." msgstr "" #. type: Plain text @@ -149,14 +145,14 @@ msgstr "" #. type: Title == #: mobile-manual.txt:71 #, no-wrap -msgid "Installing _Subsurface-mobile_ on an Android device" +msgid "Installing _Subsurface-mobile_ on your mobile device" msgstr "" #. type: Plain text #: mobile-manual.txt:75 msgid "" -"Find _Subsurface-mobile_ in the _Google Play Store_. Search for " -"_Subsurface-mobile_ and install it." +"Find _Subsurface-mobile_ in the _Google Play Store_ or the _iTunes Store_ " +"and install it." msgstr "" #. type: Title == @@ -184,39 +180,44 @@ msgstr "" #. type: Title === #: mobile-manual.txt:85 #, no-wrap -msgid "When NOT Using Internet access" +msgid "When NOT Using Cloud Storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:89 +#: mobile-manual.txt:90 msgid "" -"If the striked-out cloud icon is selected, the app will not access the " -"Internet to obtain dive log information. This means that dive log " -"information is manually entered and stored on the mobile device only." +"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." msgstr "" #. type: Title === -#: mobile-manual.txt:90 +#: mobile-manual.txt:91 #, no-wrap -msgid "Using Internet access" +msgid "Using Cloud Storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:93 +#: mobile-manual.txt:95 msgid "" -"Since _Subsurface_ is largely dependent on a dive log saved on the Internet, " -"provide a PIN for access to the _Subsurface Cloud_, obtained in one of two " -"ways:" +"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." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:97 +msgid "You can also create a new account from your mobile device." msgstr "" #. type: Title ==== -#: mobile-manual.txt:94 +#: mobile-manual.txt:98 #, no-wrap msgid "Using the desktop version of _Subsurface_:" msgstr "" #. type: Plain text -#: mobile-manual.txt:105 +#: mobile-manual.txt:109 #, no-wrap msgid "" "Open the desktop version of _Subsurface_ and\n" @@ -224,7 +225,7 @@ msgid "" "https://subsurface-divelog.org/documentation/subsurface-4-user-manual/#\\_create_a_cloud_storage_account[user\n" "manual for the _Subsurface_ desktop version]. Once the account has\n" "been created and verified using the desktop version,\n" -"_Subsurface_ desktop alows one to download dive information from dive " +"_Subsurface_ desktop alows you to download dive information from dive " "computers and store this\n" "on the cloud which can, in turn, be downloaded to " "_Subsurface-mobile_. _Subsurface-mobile_\n" @@ -234,31 +235,31 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:114 +#: mobile-manual.txt:118 msgid "" "Once the dive list has been downloaded from the Internet, " -"_Subsurface-mobile_ keeps a local copy on the mobile device. This means " -"that, if there is no Internet connection at a dive site, one can still " -"access the local copy and view and manipulate dive information. If there is " +"_Subsurface-mobile_ keeps a local copy on the mobile device. This means that " +"even if there is no Internet connection at a dive site, you can still access " +"the local copy and view and manipulate dive information. If there is " "Internet connectivity, _Subsurface-mobile_ accesses the cloud-based dive log " "to verify that the local copy is still the same as the Internet-stored " "copy. If not, the local copy and the copy on the server are synchronised." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:116 +#: mobile-manual.txt:120 #, no-wrap msgid "mobile-images/Credentials.jpg" msgstr "" #. type: Title ==== -#: mobile-manual.txt:119 +#: mobile-manual.txt:123 #, no-wrap msgid "Using _Subsurface-mobile_:" msgstr "" #. type: Plain text -#: mobile-manual.txt:127 +#: mobile-manual.txt:131 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 " @@ -271,14 +272,14 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:130 +#: mobile-manual.txt:134 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:133 +#: mobile-manual.txt:137 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 " @@ -286,39 +287,21 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:136 +#: mobile-manual.txt:141 msgid "" -"The dive list is initially empty. One can now start entering dives in the " -"dive log or one can download existing dives from the cloud." -msgstr "" - -#. type: Plain text -#: mobile-manual.txt:142 -msgid "" -"The text box to enter the PIN is shown whenever the e-mail address field is " -"empty. One can create a new cloud account by clearing the e-mail address " -"and typing a new e-mail address, upon which a new PIN is sent to the " -"newly-provided e-mail address. On the other hand, one can change to a " -"different existing cloud account by providing an e-mail address and password " -"already registered with the cloud server (image on right, above)" -msgstr "" - -#. type: Plain text -#: mobile-manual.txt:145 -msgid "" -"Once Internet access has been enabled, one can temporarily disable this " -"service when using _Subsurface-mobile_ in areas with no Internet access, " -"e.g. remote dive sites (see below)" +"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." msgstr "" #. type: Title == -#: mobile-manual.txt:146 +#: mobile-manual.txt:143 #, no-wrap msgid "A Few Remarks About The User Interface" msgstr "" #. type: Plain text -#: mobile-manual.txt:155 +#: mobile-manual.txt:152 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 " @@ -329,6 +312,13 @@ msgid "" "the edit without saving changes." msgstr "" +#. type: Plain text +#: mobile-manual.txt:155 +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 #, no-wrap @@ -336,160 +326,170 @@ msgid "mobile-images/actionbutton.jpg" msgstr "" #. type: Plain text -#: mobile-manual.txt:163 +#: mobile-manual.txt:164 msgid "" -"Instead of the more traditional \"hamburger\" menu button in the top left or " -"right corner of the screen to open menus, _Subsurface-mobile_ uses a " -"different user interaction philosophy based on the Kirigami framework " -"developed by the Plasma developers. To open the main menu one has three " -"options:" +"In order to have a consistent experience between iOS and Android, " +"_Subsurface-mobile_ on Android does not use the traditional \"hamburger\" " +"menu button in the top left or right corner of the screen to open menus. " +"Instead, _Subsurface-mobile_ uses a different user interaction philosophy " +"based on the Kirigami framework developed by the Plasma developers. There " +"are three ways to open the main menu:" msgstr "" #. type: Plain text -#: mobile-manual.txt:166 +#: mobile-manual.txt:167 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:167 +#: mobile-manual.txt:168 msgid "Swipe towards the right across the left edge of the screen" msgstr "" #. type: Plain text -#: mobile-manual.txt:169 +#: mobile-manual.txt:170 msgid "Drag the action button visible on most screens to the right" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:170 +#: mobile-manual.txt:171 #, no-wrap msgid "mobile-images/menu.jpg" msgstr "" #. type: Plain text -#: mobile-manual.txt:176 +#: mobile-manual.txt:177 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 one taps the _GPS_ option on " -"the main menu. On the right is the menu that opens if one taps the _Manage " +"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." msgstr "" +#. type: Plain text +#: mobile-manual.txt:181 +msgid "" +"All screenshots in this user manual are currently from the Android " +"version. As indicated earlier, the iOS version currently doesn't support " +"_GPS_ features." +msgstr "" + #. type: Title == -#: mobile-manual.txt:177 +#: mobile-manual.txt:182 #, no-wrap msgid "Viewing the Dive List" msgstr "" #. type: Plain text -#: mobile-manual.txt:185 +#: mobile-manual.txt:190 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 one can scroll up and " +"(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." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:186 +#: mobile-manual.txt:191 #, no-wrap msgid "mobile-images/DiveList.jpg" msgstr "" #. type: Plain text -#: mobile-manual.txt:193 +#: mobile-manual.txt:199 msgid "" -"One can view other dives by swiping the _Details view_ to the right (for the " +"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 " "also possible to delete the dive (tap the dustbin on the Action Bar) or to " -"view the dive location on a map viewer (normally Google Maps; tap the GPS " -"icon on the Action Bar.)." +"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.)." msgstr "" #. type: Title == -#: mobile-manual.txt:194 +#: mobile-manual.txt:200 #, no-wrap msgid "Editing dive details" msgstr "" #. type: Plain text -#: mobile-manual.txt:204 +#: mobile-manual.txt:211 msgid "" "At the bottom of the dive details screen the _Action Button_ contains a " -"pencil (image on right, above). Tapping the button brings up a panel with " -"edit boxes that allows one to change the existing dive information, " +"pencil (image on right, above). Tapping the pencil button brings up a panel " +"with edit boxes that allows you to change the existing dive information, " "e.g. adding text to the dive notes or changing the names or values of some " "of the information (see image below). It may be necessary to scroll the " "window to access all the information. At the bottom of the edit screen is a " "_Save_ action button. Tap this to save the new information. Having saved the " "data, the dive list screen is updated and shown. To cancel any edits, tap " -"the Android Back Button." +"the Android Back Button or swipe the edit screen up (fling it away)." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:205 +#: mobile-manual.txt:212 #, no-wrap msgid "mobile-images/EditDive.jpg" msgstr "" #. type: Title == -#: mobile-manual.txt:207 +#: mobile-manual.txt:214 #, no-wrap msgid "Adding a new dive to the dive list" msgstr "" #. type: Plain text -#: mobile-manual.txt:218 +#: mobile-manual.txt:226 msgid "" -"It is also possible to manually add an additional dive to the existing dive " -"list. On the main menu tap _Manage dives -> Add dive manually_. This opens a " -"screen that is identical to the editing screen discussed above. When a dive " -"is added manually, one cannot directly add a dive profile from a dive " -"computer. However, if one does not use a dive computer, the duration, depth " -"and several other bits of information about the new dive can be entered. The " -"_Action button_ at the bottom of the screen contains a disk symbol. Tap this " -"to save the new dive. To cancel any edits, tap the Android Back Button. The " -"left-hand image below shows a screenshot of a dive being created and the " -"right-hand image shows the same dive in _Details View_." +"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 " +"_Manage dives -> Add dive manually_. This opens a screen that is identical " +"to the editing screen discussed above. When a dive is added manually, you " +"cannot directly add a dive profile from a dive computer. However, if you do " +"not use a dive computer, the duration, depth and several other bits of " +"information about the new dive can be entered. The _Action button_ at the " +"bottom of the screen contains a disk symbol. Tap this to save the new " +"dive. To cancel any edits, tap the Android Back Button. The left-hand image " +"below shows a screenshot of a dive being created and the right-hand image " +"shows the same dive in _Details View_." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:219 +#: mobile-manual.txt:227 #, no-wrap msgid "mobile-images/ManuallyEnterDive.jpg" msgstr "" #. type: Title == -#: mobile-manual.txt:221 +#: mobile-manual.txt:229 #, no-wrap msgid "Deleting a dive" msgstr "" #. type: Plain text -#: mobile-manual.txt:227 +#: mobile-manual.txt:235 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. One has a brief " +"is tapped, the dive shown in the _Details View_ is deleted. You have a brief " "opportunity to undo the delete by tapping the grey _Undo_ button in the " "message that appears at the bottom of the screen (see image below)." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:228 +#: mobile-manual.txt:236 #, no-wrap msgid "mobile-images/Delete_undo.jpg" msgstr "" #. type: Plain text -#: mobile-manual.txt:235 +#: mobile-manual.txt:243 msgid "" -"One can also delete a dive from the dive list by long-pressing a specific " +"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). Tap the dustbin. The dive is deleted without asking any confirmation " "because _Subsurface-mobile_ assumes that the combination of a long tap on " @@ -498,166 +498,153 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:236 +#: mobile-manual.txt:244 #, no-wrap msgid "mobile-images/RedDustbin.jpg" msgstr "" #. type: Title == -#: mobile-manual.txt:238 +#: mobile-manual.txt:246 #, no-wrap msgid "Dive log management" msgstr "" #. type: Plain text -#: mobile-manual.txt:248 +#: mobile-manual.txt:256 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 tap the " +"dragging the Action Button to the right, or alternatively tappping 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:249 +#: mobile-manual.txt:257 #, no-wrap msgid "Add new dive manually" msgstr "" #. type: Plain text -#: mobile-manual.txt:252 +#: mobile-manual.txt:260 msgid "This is described above under the section dealing with the dive list." msgstr "" #. type: Title === -#: mobile-manual.txt:253 +#: mobile-manual.txt:261 #, no-wrap -msgid "Upload dive log to the _Subsurface_ cloud storage" +msgid "Sync the dive log with the _Subsurface_ cloud storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:259 +#: mobile-manual.txt:268 msgid "" -"One can upload the dives contained on the mobile device to the _Subsurface_ " +"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." +"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 " +"cloud storage." msgstr "" #. type: Title === -#: mobile-manual.txt:260 +#: mobile-manual.txt:269 #, no-wrap -msgid "Download dive log from the cloud storage" +msgid "Working offline or online" msgstr "" #. type: Plain text -#: mobile-manual.txt:265 +#: mobile-manual.txt:278 msgid "" -"In the dive management subpanel, tap the option _Manual sync with cloud_, " -"causing the local divelog to be refreshed from the cloud so that the cloud " -"and local versions are synchronised." +"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 " +"to always sync with the cloud servers after every modification of the dive " +"list. This is not recommended unless you are in an area with fast and " +"reliable internet connection, as otherwise _Subsurface-mobile_ might appear " +"to hang between operations as it tries to connect to the cloud server." msgstr "" #. type: Title === -#: mobile-manual.txt:266 -#, no-wrap -msgid "Working offline" -msgstr "" - -#. type: Plain text -#: mobile-manual.txt:273 -msgid "" -"Sometimes one wishes to use the app when an Internet connection is not " -"available, for instance at remote dive sites. In such a case " -"_Subsurface-mobile_ may unnecesarily search for an Internet connection, " -"causing long delays in executing some functions. In the dive management " -"menu, one can turn the Internet access on or off by tapping the _Offline " -"mode_ or _Enable auto cloud sync_ options." -msgstr "" - -#. type: Title === -#: mobile-manual.txt:274 +#: mobile-manual.txt:279 #, no-wrap msgid "Changing the login credentials on the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:280 +#: mobile-manual.txt:285 msgid "" -"It may be necessary to change one's login credentials, for instance if one's " -"email address (initially used as a credential) has changed. To change the " -"credentials, open the main menu and tap _Cloud credentials_. This opens the " -"setup screen for specifying new credentials." +"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." msgstr "" #. type: Title == -#: mobile-manual.txt:282 +#: mobile-manual.txt:287 #, no-wrap -msgid "Recording dive locations using GPS." +msgid "Recording dive locations using GPS (Android only)." msgstr "" #. type: Plain text -#: mobile-manual.txt:288 +#: mobile-manual.txt:294 msgid "" -"The fact that most smartphones have GPS facilities allows one to record the " -"locations of dives. One can 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:" +"The fact that most smartphones have GPS facilities allows " +"_Subsurface-mobile_ on Android to record the locations of dives. You can " +"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:" msgstr "" #. type: Title === -#: mobile-manual.txt:289 +#: mobile-manual.txt:295 #, no-wrap msgid "Setting up the GPS" msgstr "" #. type: Plain text -#: mobile-manual.txt:297 +#: mobile-manual.txt:304 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). One 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." +"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." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:298 +#: mobile-manual.txt:305 #, no-wrap msgid "mobile-images/gpssetup.jpg" msgstr "" #. type: Title === -#: mobile-manual.txt:300 +#: mobile-manual.txt:307 #, no-wrap msgid "Collecting GPS positions" msgstr "" #. type: Plain text -#: mobile-manual.txt:309 +#: mobile-manual.txt:316 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 the dive one can deactivate the collection of GPS data by " -"de-activating the same check box at the bottom of the main menu." +"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:310 +#: mobile-manual.txt:317 #, no-wrap msgid "Storing the GPS data on the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:317 +#: mobile-manual.txt:324 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_ " @@ -668,31 +655,31 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:318 +#: mobile-manual.txt:325 #, no-wrap msgid "Downloading GPS data from the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:322 +#: mobile-manual.txt:330 msgid "" -"Download the GPS data that have been saved on the cloud by selecting " -"_Download GPS Data_ from the GPS subpanel." +"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:323 +#: mobile-manual.txt:331 #, no-wrap msgid "Viewing GPS data" msgstr "" #. type: Plain text -#: mobile-manual.txt:334 +#: mobile-manual.txt:342 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 one taps the handle (the three horisontal stripes on the right, see image " +"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 " @@ -702,22 +689,22 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:335 +#: mobile-manual.txt:343 #, no-wrap msgid "mobile-images/gpsmanagement.jpg" msgstr "" #. type: Title === -#: mobile-manual.txt:337 +#: mobile-manual.txt:345 #, no-wrap msgid "Applying GPS data to dives in the dive log" msgstr "" #. type: Plain text -#: mobile-manual.txt:345 +#: mobile-manual.txt:353 msgid "" "Assuming that all the dives have been entered into the dive log or have been " -"downloaded from the _Subsurface_ cloud, one can apply the GPS positions to " +"downloaded from the _Subsurface_ cloud, you can apply the GPS positions to " "these dives. GPS positions can therefore only be applied to dives in the " "dive list. From the GPS subpanel, tap _GPS-tag dives_. The dive list " "contains the start and end times of each dive. Now, _Subsurface-mobile_ " diff --git a/Documentation/50-pot/subsurface-user-manual.pot b/Documentation/50-pot/subsurface-user-manual.pot index 744eae3d2..5ff8d606f 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: 2016-07-21 10:32+0200\n" +"POT-Creation-Date: 2016-10-11 10:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -600,7 +600,7 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:299 user-manual.txt:661 user-manual.txt:3148 +#: user-manual.txt:299 user-manual.txt:661 user-manual.txt:3152 #, no-wrap msgid "images/icons/warning2.png" msgstr "" @@ -905,7 +905,7 @@ msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:475 user-manual.txt:3700 +#: user-manual.txt:475 user-manual.txt:3714 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "" @@ -1034,7 +1034,7 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:552 user-manual.txt:3627 user-manual.txt:3715 +#: user-manual.txt:552 user-manual.txt:3641 user-manual.txt:3729 #, no-wrap msgid "On Windows:" msgstr "" @@ -4320,35 +4320,35 @@ msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' #: user-manual.txt:2214 #, no-wrap -msgid "images/icons/tissues.jpg" +msgid "images/icons/heatmap.png" msgstr "" #. type: Plain text -#: user-manual.txt:2227 +#: user-manual.txt:2231 msgid "" -"Display inert gas tissue pressures relative to ambient inert gas pressure " -"(horizontal grey line). Tissue pressures are calculated using the Bühlmann " -"ZH-L16 algorithm and are displayed as lines ranging from green (faster " -"tissues) to blue (slower tissues). The black line, graphed above the " -"ambient pressure, is the maximum allowable tissue supersaturation (pressure " -"limit) derived from the gradient factors specified in the *Preferences*. For " -"divers doing planned decompression diving, efficient rates of offgassing are " -"obtained with tissue pressures between the ambient inert gas pressure (grey " -"line) and the pressure limit (black line). This display is a representation " -"of the tissue pressures during the whole dive. In contrast, the " -"xref:S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box* on " -"the *Dive Profile* is an instantaneous reflection of tissue pressures at the " -"moment in time, at the position of the cursor on the dive profile." +"Display that tissue heat-map. This is a representation of the inert gas " +"pressures in the different tissues of a decompression model. Faster tissues " +"are displayed on top while the slower tissues are shown on the bottom. The " +"color is a representation of the inert gas loading of the tissue. Blue " +"colors indicate the tissue's inert gas pressure is below the ambient " +"pressure and the tissue is currently on-gasing. The more red the color is, " +"the higher the pressure is above the ambient pressure and the tissue is " +"off-gassing potentially releasing inert gases to the environment which can " +"be the cause for the formation of inert gas bubbles. This display is a " +"representation of the tissue pressures during the whole dive. In contrast, " +"the xref:S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box* " +"on the *Dive Profile* is an instantaneous reflection of tissue pressures at " +"the moment in time, at the position of the cursor on the dive profile." msgstr "" #. type: Target for macro image -#: user-manual.txt:2228 +#: user-manual.txt:2232 #, no-wrap -msgid "images/tissuesGraph.jpg" +msgid "images/tissueHeatmap.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2236 +#: user-manual.txt:2240 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on " @@ -4361,7 +4361,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2238 +#: user-manual.txt:2242 #, no-wrap msgid "" " ** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " @@ -4369,7 +4369,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2240 +#: user-manual.txt:2244 #, no-wrap msgid "" " ** " @@ -4378,13 +4378,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2242 +#: user-manual.txt:2246 #, no-wrap msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2261 +#: user-manual.txt:2265 msgid "" "The context menu for the Dive Profile is accessed by right-clicking while " "the mouse cursor is over the Dive Profile panel. The menu lets you create " @@ -4405,13 +4405,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2263 +#: user-manual.txt:2267 #, no-wrap msgid "The *Information Box*" msgstr "" #. type: Plain text -#: user-manual.txt:2272 +#: user-manual.txt:2276 msgid "" "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 " @@ -4424,13 +4424,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2273 +#: user-manual.txt:2277 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2290 +#: user-manual.txt:2294 msgid "" "When the mouse points inside the *Dive Profile* panel, the information box " "expands and shows many data items. In this situation, the data reflect the " @@ -4450,20 +4450,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2293 +#: user-manual.txt:2297 msgid "" "The user has control over the display of some statistics, shown as four " "buttons on the left of the profile panel. These are:" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2294 +#: user-manual.txt:2298 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2303 +#: user-manual.txt:2307 msgid "" "Clicking this button causes the Information Box to display the *Maximum " "Operating Depth (MOD)* of the dive, given the gas mixture used. MOD is " @@ -4475,13 +4475,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2304 +#: user-manual.txt:2308 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2316 +#: user-manual.txt:2320 msgid "" "Clicking this button causes the Information Box to display either the " "*No-deco Limit (NDL)* or the *Total Time to Surface (TTS)*. NDL is the time " @@ -4498,13 +4498,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2317 +#: user-manual.txt:2321 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2326 +#: user-manual.txt:2330 msgid "" "Clicking this button causes the Information Box to display the *Surface Air " "Consumption (SAC)*. SAC is an indication of the surface-normalized " @@ -4517,13 +4517,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2327 +#: user-manual.txt:2331 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2342 +#: user-manual.txt:2346 msgid "" "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox " "dives as well as the *Equivalent Narcotic Depth (END)* for trimix " @@ -4539,20 +4539,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2344 +#: user-manual.txt:2348 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." msgstr "" #. type: Title ==== -#: user-manual.txt:2346 +#: user-manual.txt:2350 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "" #. type: Plain text -#: user-manual.txt:2353 +#: user-manual.txt:2357 msgid "" "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 " @@ -4563,13 +4563,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2354 +#: user-manual.txt:2358 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2360 +#: user-manual.txt:2364 msgid "" "The light green area indicates the total gas, with the top margin of the " "light green area showing the total gas pressure inhaled by the diver and " @@ -4579,7 +4579,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2366 +#: user-manual.txt:2370 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the inert gases inhaled by the diver, usually " @@ -4590,7 +4590,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2370 +#: user-manual.txt:2374 msgid "" "The dark green area at the bottom of the graph represents the pressures of " "inert gas in each of the 16 tissue compartments, following the Bühlmann " @@ -4598,7 +4598,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2375 +#: user-manual.txt:2379 msgid "" "The top black horizontal line indicates the gradient factor that applies to " "the depth of the diver at the particular point on the *Dive Profile*. The " @@ -4608,7 +4608,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2379 +#: user-manual.txt:2383 msgid "" "The bottom margin of the red area in the graph indicates the Bühlman-derived " "M-value. That is the pressure value of inert gases at which bubble formation " @@ -4616,7 +4616,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2382 +#: user-manual.txt:2386 msgid "" "These five values are shown on the left in the graph above. The way the Gas " "Pressure Bar Graph changes during a dive can be seen on the right hand side " @@ -4624,7 +4624,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2385 +#: user-manual.txt:2389 msgid "" "Graph *A* indicates the start of a dive with the diver at the surface. The " "pressures in all the tissue compartments are still at the equilibrium " @@ -4632,7 +4632,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2388 +#: user-manual.txt:2392 msgid "" "Graph *B* indicates the situation after a descent to 30 meters. Few of the " "tissue compartments have had time to respond to the descent, so their gas " @@ -4640,7 +4640,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2393 +#: user-manual.txt:2397 msgid "" "Graph *C* represents the pressures after 30 minutes at 30 m. The fast " "compartments have attained equilibrium (i.e. they have reached the hight of " @@ -4650,7 +4650,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2399 +#: user-manual.txt:2403 msgid "" "Graph *D* shows the pressures after ascent to a depth of 4.5 meters. Since " "during ascent the total inhaled gas pressure has decreased strongly from 4 " @@ -4661,7 +4661,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2404 +#: user-manual.txt:2408 msgid "" "Graph *E* indicates the situation after remaining at 4.5 meters for 10 " "minutes. The fast compartments have decreased in pressure. As expected, the " @@ -4671,19 +4671,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2407 +#: user-manual.txt:2411 #, no-wrap msgid "Organizing the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: user-manual.txt:2409 +#: user-manual.txt:2413 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2413 +#: user-manual.txt:2417 msgid "" "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 " @@ -4692,30 +4692,30 @@ msgstr "" #. TODO: NEEDS REPLACEMENT #. type: Target for macro image -#: user-manual.txt:2415 +#: user-manual.txt:2419 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2418 +#: user-manual.txt:2422 msgid "The context menu is used in many functions described below." msgstr "" #. type: Title ==== -#: user-manual.txt:2419 +#: user-manual.txt:2423 #, no-wrap msgid "Customizing the columns showed in the *Dive List* panel" msgstr "" #. type: Target for macro image -#: user-manual.txt:2421 +#: user-manual.txt:2425 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2429 +#: user-manual.txt:2433 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " @@ -4729,13 +4729,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2431 +#: user-manual.txt:2435 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: user-manual.txt:2443 +#: user-manual.txt:2447 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (higher sequence numbers). Numbering of " @@ -4749,7 +4749,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2448 +#: user-manual.txt:2452 msgid "" "You can also renumber a few selected dives in the dive list. Select the " "dives that need renumbering. Right-click on the selected list and use the " @@ -4758,13 +4758,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2450 +#: user-manual.txt:2454 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: user-manual.txt:2458 +#: user-manual.txt:2462 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 " @@ -4775,13 +4775,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2459 +#: user-manual.txt:2463 #, no-wrap msgid "images/Group2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2465 +#: user-manual.txt:2469 msgid "" "Grouping into trips allows a rapid way of accessing individual dives without " "having to scan a long lists of dives. To group the dives in a dive list, " @@ -4790,13 +4790,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2466 +#: user-manual.txt:2470 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2479 +#: user-manual.txt:2483 msgid "" "Normally, in the dive list, minimal information is included in the trip " "title. More information about a trip can be added by selecting its trip " @@ -4810,13 +4810,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2480 +#: user-manual.txt:2484 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2485 +#: user-manual.txt:2489 msgid "" "Once the dives have been grouped into trips, you can expand one or more " "trips by clicking the arrow-head on the left of each trip title. This " @@ -4824,13 +4824,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2486 +#: user-manual.txt:2490 #, no-wrap msgid "Collapsing or expanding dive information for different trips" msgstr "" #. type: Plain text -#: user-manual.txt:2491 +#: user-manual.txt:2495 msgid "" "After selecting a particular trip in the dive list, the context menu allows " "several options to expand or collapse dives within trips. This includes " @@ -4838,13 +4838,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2492 +#: user-manual.txt:2496 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "" #. type: Plain text -#: user-manual.txt:2497 +#: user-manual.txt:2501 msgid "" "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 " @@ -4852,13 +4852,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2498 +#: user-manual.txt:2502 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "" #. type: Plain text -#: user-manual.txt:2507 +#: user-manual.txt:2511 msgid "" "If a trip includes ten dives, you can split this trip into two trips (trip " "1: top 4 dives; trip 2: bottom 6 dives) by selecting and right-clicking the " @@ -4869,25 +4869,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2508 +#: user-manual.txt:2512 #, no-wrap msgid "images/SplitDive3a.jpg" msgstr "" #. type: Title === -#: user-manual.txt:2510 +#: user-manual.txt:2514 #, no-wrap msgid "Manipulating single dives" msgstr "" #. type: Title ==== -#: user-manual.txt:2512 +#: user-manual.txt:2516 #, no-wrap msgid "Delete a dive from the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2519 +#: user-manual.txt:2523 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 " @@ -4897,13 +4897,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2520 +#: user-manual.txt:2524 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: user-manual.txt:2527 +#: user-manual.txt:2531 msgid "" "You can unlink dives from the trip to which they belong. To do this, select " "and right-click the relevant dives to bring up the context menu. Then select " @@ -4913,13 +4913,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2528 +#: user-manual.txt:2532 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: user-manual.txt:2533 +#: user-manual.txt:2537 msgid "" "Selected dives can be moved from the trip to which they belong and placed " "within a separate trip. To do this, select and right-click the dive(s) to " @@ -4927,13 +4927,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2534 +#: user-manual.txt:2538 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2544 +#: user-manual.txt:2548 msgid "" "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 " @@ -4945,13 +4945,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2545 +#: user-manual.txt:2549 #, no-wrap msgid "Merge dives into a single dive" msgstr "" #. type: Plain text -#: user-manual.txt:2555 +#: user-manual.txt:2559 msgid "" "Sometimes a dive is briefly interrupted, for example, if a diver returns to " "the surface for a few minutes. That results in two or more dives being " @@ -4965,19 +4965,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2556 +#: user-manual.txt:2560 #, no-wrap msgid "images/MergedDive.png" msgstr "" #. type: Title ==== -#: user-manual.txt:2558 +#: user-manual.txt:2562 #, no-wrap msgid "Undo dive manipulations" msgstr "" #. type: Plain text -#: user-manual.txt:2564 +#: user-manual.txt:2568 msgid "" "Important actions on dives or trips, described above, can be undone or " "redone. This includes: _delete dives_, _merge dives_, _renumber dives_ and " @@ -4987,13 +4987,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2567 +#: user-manual.txt:2571 #, no-wrap msgid "Filtering the dive list" msgstr "" #. type: Plain text -#: user-manual.txt:2573 +#: user-manual.txt:2577 msgid "" "The dives in the *Dive List* panel can be filtered, so you can select only " "some of the dives based on their attributes, e.g. dive tags, dive site, dive " @@ -5003,7 +5003,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2581 +#: user-manual.txt:2585 msgid "" "To open the filter, select _Log -> Filter divelist_ from the main menu. This " "opens the _Filter Panel_ at the top of the _Subsurface_ window. Three icons " @@ -5017,13 +5017,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2582 +#: user-manual.txt:2586 #, no-wrap msgid "images/Filterpanel.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2591 +#: user-manual.txt:2595 msgid "" "Four filter criteria may be used to filter the dive list: dive tags, person " "(buddy / divemaster), dive site and dive suit. Each of these is represented " @@ -5036,7 +5036,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2599 +#: user-manual.txt:2603 msgid "" "To activate filtering of the dive list, check at least one check box in one " "of the four check lists. The dive list is then shortened to include only the " @@ -5048,36 +5048,36 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2601 +#: user-manual.txt:2605 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2604 +#: user-manual.txt:2608 msgid "There are two ways to export dive information from Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:2606 +#: user-manual.txt:2610 msgid "Export dive information to _Facebook_" msgstr "" #. type: Plain text -#: user-manual.txt:2608 +#: user-manual.txt:2612 msgid "" "xref:S_Export_other[Export dive information to other destinations or " "formats]" msgstr "" #. type: Title === -#: user-manual.txt:2610 +#: user-manual.txt:2614 #, no-wrap msgid "Exporting dive information to _Facebook_" msgstr "" #. type: Plain text -#: user-manual.txt:2619 +#: user-manual.txt:2623 msgid "" "Export of dives to _Facebook_ is handled differently from other types of " "export because a connection to _Facebook_ is required, needing a _Facebook_ " @@ -5089,13 +5089,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2620 +#: user-manual.txt:2624 #, no-wrap msgid "images/facebook1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2625 +#: user-manual.txt:2629 msgid "" "From the _Subsurface_ window it’s easy to determine whether _Subsurface_ has " "a valid connection to _Facebook_ From the *Main Menu*, select _Share on -> " @@ -5105,7 +5105,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2636 +#: user-manual.txt:2640 msgid "" "Having established a login to _Facebook_, transferring a dive profileto a " "_Facebook_ timeline is easy. Be sure the dive to be transferred to the " @@ -5125,7 +5125,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2641 +#: user-manual.txt:2645 msgid "" "Both the album created and the post to your timeline will be marked as " "private. In order for friends to be able to see it, change its permissions " @@ -5133,13 +5133,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2642 +#: user-manual.txt:2646 #, no-wrap msgid "images/facebook2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2646 +#: user-manual.txt:2650 msgid "" "If required, then close the _Facebook_ connection by either closing " "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main " @@ -5147,13 +5147,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2648 +#: user-manual.txt:2652 #, no-wrap msgid "Export dive information to other destinations or formats" msgstr "" #. type: Plain text -#: user-manual.txt:2653 +#: user-manual.txt:2657 msgid "" "For non-_Facebook exports_, the export function can be found by selecting " "_File -> Export_, which brings up the Export dialog. This dialog always " @@ -5163,23 +5163,23 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2654 +#: user-manual.txt:2658 #, no-wrap msgid "images/Export_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2657 +#: user-manual.txt:2661 msgid "A dive log or part of it can be saved in three formats:" msgstr "" #. type: Plain text -#: user-manual.txt:2659 +#: user-manual.txt:2663 msgid "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:2663 +#: user-manual.txt:2667 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -5187,7 +5187,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2667 +#: user-manual.txt:2671 msgid "" "_Divelogs.de_, an Internet-based dive log repository. In order to upload to " "_Divelogs.de_, you need a user-ID as well as a password for " @@ -5196,7 +5196,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2671 +#: user-manual.txt:2675 msgid "" "_DiveShare_ is also a dive log repository on the Internet focusing on " "recreational dives. To upload dives, you need a user ID, so registration " @@ -5204,7 +5204,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2676 +#: user-manual.txt:2680 msgid "" "_CSV dive details_, that includes the most critical information of the dive " "profile. Included information of a dive is: dive number, date, time, buddy, " @@ -5213,7 +5213,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2679 +#: user-manual.txt:2683 msgid "" "_CSV dive profile_, that includes a large amount of detail for each dive, " "including the depth profile, temperature and pressure information of each " @@ -5221,7 +5221,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2692 +#: user-manual.txt:2696 msgid "" "_HTML_ format, in which the dive(s) are stored in HTML files, readable with " "an Internet browser. Most modern web browsers are supported, but JavaScript " @@ -5238,7 +5238,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2697 +#: user-manual.txt:2701 msgid "" "_Worldmap_ format, an HTML file with a world map upon which each dive and " "some information about it are indicated. This map is not editable. If you " @@ -5247,13 +5247,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2698 +#: user-manual.txt:2702 #, no-wrap msgid "images/mapview_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2705 +#: user-manual.txt:2709 msgid "" "_Image depths_, which creates a text file that contains the file names of " "all photos or images attached to any of the selected dives in the _Dive " @@ -5262,12 +5262,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2707 +#: user-manual.txt:2711 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: user-manual.txt:2715 +#: user-manual.txt:2719 #, no-wrap msgid "" "** Subsurface Numbers: if this option is checked, the dive(s) are exported " @@ -5285,27 +5285,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2718 +#: user-manual.txt:2722 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: user-manual.txt:2721 +#: user-manual.txt:2725 msgid "" "Export to other formats can be done through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: user-manual.txt:2723 +#: user-manual.txt:2727 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: user-manual.txt:2733 +#: user-manual.txt:2737 msgid "" "For each diver, dive log information is highly important. Not only is it a " "record of diving activities for one's own pleasure, but it’s important " @@ -5319,7 +5319,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2739 +#: user-manual.txt:2743 msgid "" "_Subsurface_ includes access to a transparently integrated cloud storage " "back end that is available to all Subsurface users. Storing and retrieving a " @@ -5330,13 +5330,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2740 +#: user-manual.txt:2744 #, no-wrap msgid "Create a cloud storage account" msgstr "" #. type: Plain text -#: user-manual.txt:2757 +#: user-manual.txt:2761 #, no-wrap msgid "" "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> " @@ -5364,13 +5364,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2758 +#: user-manual.txt:2762 #, no-wrap msgid "Using _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2768 +#: user-manual.txt:2772 #, no-wrap msgid "" "** Once the cloud storage has been initialized, two new items appear in " @@ -5389,7 +5389,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2773 +#: user-manual.txt:2777 #, no-wrap msgid "" "** _Subsurface_ keeps a local copy of the data and the cloud facility " @@ -5402,13 +5402,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2775 +#: user-manual.txt:2779 #, no-wrap msgid "Web access to _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2785 +#: user-manual.txt:2789 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 " @@ -5421,13 +5421,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2786 +#: user-manual.txt:2790 #, no-wrap msgid "Other cloud services" msgstr "" #. type: Plain text -#: user-manual.txt:2796 +#: user-manual.txt:2800 msgid "" "If you prefers not to use the integrated cloud storage of dive logs (and " "don't need the web access), it’s simple to store dive logs in the cloud " @@ -5438,13 +5438,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2797 +#: user-manual.txt:2801 #, no-wrap msgid "images/Cloud.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2806 +#: user-manual.txt:2810 msgid "" "The _Dropbox_ program creates a copy of the _Dropbox_ Internet Cloud content " "on your desktop computer. When the computer is connected to the Internet, " @@ -5457,7 +5457,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2813 +#: user-manual.txt:2817 msgid "" "In this way a dive log in your _Dropbox_ folder can be accessed seamlessly " "from the Internet and can be accessed anywhere with Internet " @@ -5467,7 +5467,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2819 +#: user-manual.txt:2823 msgid "" "Alternatively you can use _Dropbox_ as a way back up your dive log. To Store " "a dive log on _Dropbox_, select _File -> Save as_ from the _Subsurface_ main " @@ -5478,20 +5478,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2822 +#: user-manual.txt:2826 msgid "" "Several paid services exist on the Internet (e.g. Google, Amazon) where the " "same process could be used for the Cloud-based storage of dive logs." msgstr "" #. type: Title == -#: user-manual.txt:2825 +#: user-manual.txt:2829 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2829 +#: user-manual.txt:2833 #, no-wrap msgid "" "_Subsurface_ provides a simple and flexible way to print a whole dive log or " @@ -5501,19 +5501,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2831 +#: user-manual.txt:2835 msgid "Some decisions need to be made before printing:" msgstr "" #. type: Plain text -#: user-manual.txt:2834 +#: user-manual.txt:2838 msgid "" "Should the whole dive log be printed or only part of it? If only part is " "required, select the required dives from the *Dive List* panel." msgstr "" #. type: Plain text -#: user-manual.txt:2836 +#: user-manual.txt:2840 msgid "" "If the dive profiles are printed, what gas partial pressure information " "should be shown? Select the appropriate toggle-buttons on the button bar to " @@ -5521,7 +5521,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2839 +#: user-manual.txt:2843 msgid "" "If _File -> Print_ is selected from the Main menu, the dialogue below (image " "*A*) appears. Three specifications are needed to get the desired information " @@ -5529,35 +5529,35 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2840 user-manual.txt:4284 +#: user-manual.txt:2844 user-manual.txt:4298 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2843 +#: user-manual.txt:2847 msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: user-manual.txt:2845 +#: user-manual.txt:2849 msgid "" "_Dive list print_: Print dives from the *Dive List* panel with profiles and " "other information." msgstr "" #. type: Plain text -#: user-manual.txt:2846 +#: user-manual.txt:2850 msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: user-manual.txt:2848 +#: user-manual.txt:2852 msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: user-manual.txt:2853 +#: user-manual.txt:2857 msgid "" "Printing only the dives selected from the dive list before activating the " "print dialogue by checking the box _Print only selected dives_. If this " @@ -5565,73 +5565,73 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2855 +#: user-manual.txt:2859 msgid "" "Printing in color, done by checking the box with _Print in color. If this " "check box is not checked, printing is in black and white." msgstr "" #. type: Plain text -#: user-manual.txt:2858 +#: user-manual.txt:2862 msgid "" "Under _Template_ select a template to be used as the page layout. There are " "several choices. (see image *B*, above)." msgstr "" #. type: Plain text -#: user-manual.txt:2860 +#: user-manual.txt:2864 msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:2861 +#: user-manual.txt:2865 #, no-wrap msgid "images/Print_summarylist_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2864 +#: user-manual.txt:2868 msgid "" "_Flow layout_: Print the text associated with each dive without printing the " "dive profiles" msgstr "" #. type: Plain text -#: user-manual.txt:2865 +#: user-manual.txt:2869 msgid "of each dive (see below):" msgstr "" #. type: Target for macro image -#: user-manual.txt:2866 +#: user-manual.txt:2870 #, no-wrap msgid "images/Print_flow_layout_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2869 +#: user-manual.txt:2873 msgid "" "_One Dive_: Print one dive per page, also showing the dive profile (see " "below)" msgstr "" #. type: Target for macro image -#: user-manual.txt:2870 +#: user-manual.txt:2874 #, no-wrap msgid "images/print2_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2874 +#: user-manual.txt:2878 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2875 +#: user-manual.txt:2879 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2879 +#: user-manual.txt:2883 msgid "" "You can _Preview_ the printed page by selecting the _Preview_ button on the " "dialogue (see image *A* at the start of this section). After preview, you " @@ -5640,7 +5640,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2883 +#: user-manual.txt:2887 msgid "" "Next, select the _Print_ button (see image *A* at the start of this " "section). This activates the regular print dialogue used by the operating " @@ -5649,13 +5649,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2884 +#: user-manual.txt:2888 #, no-wrap msgid "images/Print_print_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2889 +#: user-manual.txt:2893 msgid "" "Set the print resolution of the printer to an appropriate value by changing " "the printer _Properties_. Finally, select the _Print_ button to print the " @@ -5664,19 +5664,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2890 +#: user-manual.txt:2894 #, no-wrap msgid "images/Printpreview.jpg" msgstr "" #. type: Title === -#: user-manual.txt:2892 +#: user-manual.txt:2896 #, no-wrap msgid "Writing a custom print template (advanced)" msgstr "" #. type: Plain text -#: user-manual.txt:2898 +#: user-manual.txt:2902 msgid "" "Writing a custom template is an effective way to produce highly customized " "printouts. Subsurface uses HTML templates to render printing. You can create " @@ -5687,13 +5687,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2900 +#: user-manual.txt:2904 #, no-wrap msgid "Configuring a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:2909 +#: user-manual.txt:2913 msgid "" "_Subsurface_ lets you configure a dive computer. Currently the " "Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, " @@ -5708,7 +5708,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2914 +#: user-manual.txt:2918 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Provide the " @@ -5718,20 +5718,20 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2915 +#: user-manual.txt:2919 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2918 +#: user-manual.txt:2922 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be done:" msgstr "" #. type: Plain text -#: user-manual.txt:2921 +#: user-manual.txt:2925 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the " @@ -5740,7 +5740,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2923 +#: user-manual.txt:2927 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -5749,7 +5749,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2925 +#: user-manual.txt:2929 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks " @@ -5758,7 +5758,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2927 +#: user-manual.txt:2931 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays " @@ -5767,7 +5767,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2929 +#: user-manual.txt:2933 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this " @@ -5776,13 +5776,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2932 +#: user-manual.txt:2936 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:2941 +#: user-manual.txt:2945 msgid "" "There are several user-definable settings within _Subsurface_, found by " "selecting _File -> Preferences_. The settings are in seven groups: " @@ -5795,24 +5795,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2942 +#: user-manual.txt:2946 #, no-wrap msgid "Defaults" msgstr "" #. type: Plain text -#: user-manual.txt:2945 +#: user-manual.txt:2949 msgid "There are several settings in the *Defaults* panel:" msgstr "" #. type: Target for macro image -#: user-manual.txt:2946 +#: user-manual.txt:2950 #, no-wrap msgid "images/Pref1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2950 +#: user-manual.txt:2954 #, no-wrap msgid "" " ** *Lists and tables*: Here you can specify the font type and font size of " @@ -5822,7 +5822,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2955 +#: user-manual.txt:2959 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive File_ you need to specify the directory " @@ -5835,7 +5835,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2956 +#: user-manual.txt:2960 #, no-wrap msgid "" "_No default file_: When checked, _Subsurface_ does not automatically load a " @@ -5843,7 +5843,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2958 +#: user-manual.txt:2962 #, no-wrap msgid "" "_Local default file_: When checked, _Subsurface_ automatically loads a dive " @@ -5852,7 +5852,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2960 +#: user-manual.txt:2964 #, no-wrap msgid "" "_Cloud storage default file_: When checked, _Subsurface automatically loads " @@ -5862,7 +5862,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2962 +#: user-manual.txt:2966 #, no-wrap msgid "" "** *Display invalid*: Dives can be marked as invalid (when a user wishes to " @@ -5870,7 +5870,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2965 +#: user-manual.txt:2969 #, no-wrap msgid "" "dives that he/she doesn't consider valid dives, e.g. pool dives, but still " @@ -5881,19 +5881,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2967 +#: user-manual.txt:2971 #, no-wrap msgid "** *Default cylinder*: Specify the default cylinder listed in\n" msgstr "" #. type: Plain text -#: user-manual.txt:2968 +#: user-manual.txt:2972 #, no-wrap msgid "the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2970 +#: user-manual.txt:2974 #, no-wrap msgid "" "** *Animations*: Some actions in showing the dive profile are performed " @@ -5901,7 +5901,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2976 +#: user-manual.txt:2980 #, no-wrap msgid "" "animations. For instance, the axis values for depth and time change from " @@ -5917,7 +5917,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2978 +#: user-manual.txt:2982 #, no-wrap msgid "" "** *Clear all settings*: As indicated in the button below this heading, all " @@ -5925,25 +5925,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2979 +#: user-manual.txt:2983 #, no-wrap msgid "cleared and set to default values.\n" msgstr "" #. type: Title === -#: user-manual.txt:2980 +#: user-manual.txt:2984 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: user-manual.txt:2981 +#: user-manual.txt:2985 #, no-wrap msgid "images/Pref2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2988 +#: user-manual.txt:2992 msgid "" "Here you can choose between metric and imperial units of depth, pressure, " "volume, temperature and mass. By selecting the Metric or Imperial radio " @@ -5954,7 +5954,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2994 +#: user-manual.txt:2998 msgid "" "Regardless of the above settings, dive time measurements can be either in " "seconds or minutes. Choose the appropriate option. GPS coordinates can be " @@ -5963,24 +5963,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2995 +#: user-manual.txt:2999 #, no-wrap msgid "Graph" msgstr "" #. type: Target for macro image -#: user-manual.txt:2997 +#: user-manual.txt:3001 #, no-wrap msgid "images/Pref3_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3001 +#: user-manual.txt:3005 msgid "This panel allows two type of selections:" msgstr "" #. type: Plain text -#: user-manual.txt:3023 +#: user-manual.txt:3027 #, no-wrap msgid "" "*Show*: Here you can specify the amount of information shown as part of\n" @@ -6023,13 +6023,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3025 +#: user-manual.txt:3029 #, no-wrap msgid "*Misc*:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3038 +#: user-manual.txt:3042 #, no-wrap msgid "" "** Gradient Factors (GFLow and GFHigh):* Set the _gradient factors_ used " @@ -6056,7 +6056,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3040 +#: user-manual.txt:3044 #, no-wrap msgid "" " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " @@ -6064,7 +6064,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3042 +#: user-manual.txt:3046 #, no-wrap msgid "" " *** " @@ -6073,7 +6073,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3046 +#: user-manual.txt:3050 #, no-wrap msgid "" " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, " @@ -6085,7 +6085,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3050 +#: user-manual.txt:3054 #, no-wrap msgid "" " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the " @@ -6096,13 +6096,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3052 +#: user-manual.txt:3056 #, no-wrap msgid "*Configuring dive planning using rebreather equipment:*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3054 +#: user-manual.txt:3058 #, no-wrap msgid "" "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for " @@ -6110,7 +6110,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3057 +#: user-manual.txt:3061 #, no-wrap msgid "" "CCR dive plan. This determines the pO~2~ maintained\n" @@ -6120,7 +6120,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3059 +#: user-manual.txt:3063 #, no-wrap msgid "" "** _pSCR O~2~ metabolism rate:_ For a semi-closed rebreather (pSCR) system, " @@ -6128,7 +6128,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3061 +#: user-manual.txt:3065 #, no-wrap msgid "" "volume of oxygen used by a diver during a minute. Set this value for pSCR " @@ -6137,7 +6137,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3063 +#: user-manual.txt:3067 #, no-wrap msgid "" "** _pSCR ratio:_ For pSCR equipment the dump ratio is the ratio of gas " @@ -6145,7 +6145,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3065 +#: user-manual.txt:3069 #, no-wrap msgid "" "environment to that of the gas recirculated to the diver. Set this value for " @@ -6154,24 +6154,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3067 +#: user-manual.txt:3071 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: user-manual.txt:3069 +#: user-manual.txt:3073 msgid "Choose a language that _Subsurface_ will use." msgstr "" #. type: Target for macro image -#: user-manual.txt:3070 +#: user-manual.txt:3074 #, no-wrap msgid "images/Pref4_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3080 +#: user-manual.txt:3084 msgid "" "A checkbox lets you use the _System Default_ language which in most cases " "will be the correct setting; with this _Subsurface_ simply runs in the same " @@ -6183,13 +6183,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3081 +#: user-manual.txt:3085 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: user-manual.txt:3088 +#: user-manual.txt:3092 msgid "" "This panel facilitates communication between _Subsurface_ and data sources " "on the Internet. This is important, for instance, when _Subsurface_ needs " @@ -6201,18 +6201,18 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3089 +#: user-manual.txt:3093 #, no-wrap msgid "images/Pref5_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3092 +#: user-manual.txt:3096 msgid "This dialogue has three sections:" msgstr "" #. type: Plain text -#: user-manual.txt:3100 +#: user-manual.txt:3104 #, no-wrap msgid "" "** _Proxy type_:\n" @@ -6229,7 +6229,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3105 +#: user-manual.txt:3109 #, no-wrap msgid "" "** _Subsurface cloud storage_: To store your dive log in the cloud, a valid " @@ -6242,7 +6242,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3106 +#: user-manual.txt:3110 #, no-wrap msgid "" "_Sync to cloud in the background_: This option allows saving of dive " @@ -6250,13 +6250,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3107 +#: user-manual.txt:3111 #, no-wrap msgid "while you do other things within _Subsurface_.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3108 +#: user-manual.txt:3112 #, no-wrap msgid "" "_Save password locally_: This allows local storage of the cloud storage " @@ -6264,13 +6264,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3109 +#: user-manual.txt:3113 #, no-wrap msgid "information is saved in raw text form, not encoded in any way.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3113 +#: user-manual.txt:3117 #, no-wrap msgid "" "** _Subsurface web service_: When you subscribe to the " @@ -6282,26 +6282,26 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3116 +#: user-manual.txt:3120 #, no-wrap msgid "Facebook Access" msgstr "" #. type: Plain text -#: user-manual.txt:3119 +#: user-manual.txt:3123 msgid "" "This panel lets you log into a Facebook account in order to transfer " "information from Subsurface to Facebook." msgstr "" #. type: Target for macro image -#: user-manual.txt:3120 +#: user-manual.txt:3124 #, no-wrap msgid "images/Pref6_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3128 +#: user-manual.txt:3132 msgid "" "If you provide a valid Facebook userID and password, a connection to " "Facebook is created. That connection is closed when one closing down " @@ -6311,13 +6311,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3129 +#: user-manual.txt:3133 #, no-wrap msgid "Georeference" msgstr "" #. type: Plain text -#: user-manual.txt:3137 +#: user-manual.txt:3141 msgid "" "_Subsurface_ provides a geo-lookup service (that is, given the coordinates " "of a dive site) derived from a click on the *Dive Map panel* at the bottom " @@ -6330,19 +6330,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3138 +#: user-manual.txt:3142 #, no-wrap msgid "images/Pref7_f20.jpg" msgstr "" #. type: Title == -#: user-manual.txt:3141 +#: user-manual.txt:3145 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: user-manual.txt:3146 +#: user-manual.txt:3150 msgid "" "Dive planning is an advanced feature of _Subsurface_, accessed by selecting " "_Log -> Plan Dive_ from the main menu. It allows calculation of nitrogen " @@ -6351,7 +6351,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3154 +#: user-manual.txt:3158 msgid "" "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " "is already familiar with the _Subsurface_ user interface. It is explicitly " @@ -6359,19 +6359,19 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3157 +#: user-manual.txt:3161 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: user-manual.txt:3158 +#: user-manual.txt:3162 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: user-manual.txt:3161 +#: user-manual.txt:3165 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -6379,32 +6379,32 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3162 +#: user-manual.txt:3166 msgid "" "The safety of a dive plan depends heavily on the way in which the planner is " "used." msgstr "" #. type: delimited block * -#: user-manual.txt:3163 +#: user-manual.txt:3167 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: user-manual.txt:3165 +#: user-manual.txt:3169 msgid "" "A user who is not absolutely sure about any of the above requirements should " "not use this feature." msgstr "" #. type: Title === -#: user-manual.txt:3167 +#: user-manual.txt:3171 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: user-manual.txt:3172 +#: user-manual.txt:3176 msgid "" "Like the _Subsurface_ dive log, the planner screen is divided into several " "sections (see image below). The *setup* parameters for a dive are entered " @@ -6413,7 +6413,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3176 +#: user-manual.txt:3180 msgid "" "At the top right hand is a green *design panel* on which the profile of the " "dive can be manipulated directly by dragging and clicking as explained " @@ -6422,7 +6422,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3180 +#: user-manual.txt:3184 msgid "" "At the bottom right is a text panel with a heading of _Dive Plan " "Details_. This is where the details of the dive plan are provided in a way " @@ -6431,26 +6431,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3181 +#: user-manual.txt:3185 #, no-wrap msgid "images/PlannerWindow1_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3184 +#: user-manual.txt:3188 #, no-wrap msgid "Open circuit dives" msgstr "" #. type: Plain text -#: user-manual.txt:3187 +#: user-manual.txt:3191 msgid "" "Towards the center bottom of the planner (circled in blue in the image " "above) is a dropbox with three options. Select the appropriate one of these:" msgstr "" #. type: Plain text -#: user-manual.txt:3190 +#: user-manual.txt:3194 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -6459,12 +6459,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3192 +#: user-manual.txt:3196 msgid "Choose the Open Circuit option." msgstr "" #. type: Plain text -#: user-manual.txt:3196 +#: user-manual.txt:3200 msgid "" "In the top left-hand area of the planning screen, be sure the constant dive " "parameters are appropriate. These are: Start date and time of the intended " @@ -6474,7 +6474,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3205 +#: user-manual.txt:3209 msgid "" "In the table labelled _Available Gases_, add the information of the " "cylinders to be used as well as the gas composition within that " @@ -6482,19 +6482,75 @@ msgid "" "<>. Choose the " "cylinder type by double clicking the cylinder type and using the dropdown " "list, then specify the work pressure of this cylinder. By leaving the oxygen " -"concentration (O2%) filed empty, the cylinder is assumed to contain " +"concentration (O2%) field empty, the cylinder is assumed to contain " "air. Otherwise enter the oxygen and/or helium concentration in the boxes " "provided in this dialogue. Add additional cylinders by using the \"+\" icon " "to the top right-hand of the dialogue." msgstr "" #. type: Plain text -#: user-manual.txt:3207 -msgid "The profile of the planned dive can be created in two ways:" +#: user-manual.txt:3211 +msgid "The _Available Gases_ table includes three gas depth fields, labelled:" msgstr "" #. type: Plain text #: user-manual.txt:3212 +#, no-wrap +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:3213 +#, no-wrap +msgid "" +"automatically calculated based on the Deco pO₂ preference (default 1.6 " +"bar)\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3214 +#, no-wrap +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:3216 +#, no-wrap +msgid "" +"calculated based on the Bottom pO₂ preference (default 1.4 bar). Editing " +"this field will modify the\n" +"O₂% according to the depth set. Set to ''*'' to calculate the best O₂% for " +"the dive maximum depth.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3217 +#, no-wrap +msgid "" +"** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based " +"on the Best Mix END\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3219 +#, no-wrap +msgid "" +"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 "" + +#. type: Plain text +#: user-manual.txt:3221 +msgid "The profile of the planned dive can be created in two ways:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3226 msgid "" "Drag the waypoints (the small white circles) on the existing dive profile to " "represent the dive. Additional waypoints can be created by double-clicking " @@ -6504,7 +6560,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3220 +#: user-manual.txt:3234 msgid "" "The most efficient way to create a dive profile is to enter the appropriate " "values into the table marked _Dive planner points_. The first line of the " @@ -6518,13 +6574,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:3221 +#: user-manual.txt:3235 #, no-wrap msgid "Recreational dives" msgstr "" #. type: Plain text -#: user-manual.txt:3238 +#: user-manual.txt:3252 #, no-wrap msgid "" "Recreational mode is what comes closest to planning a dive based on the " @@ -6555,21 +6611,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3241 +#: user-manual.txt:3255 msgid "" "Ensure the date and time is set to that of the intended dive. This allows " "calculation of the nitrogen load incurred during previous dives." msgstr "" #. type: Plain text -#: user-manual.txt:3244 +#: user-manual.txt:3258 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: user-manual.txt:3248 +#: user-manual.txt:3262 msgid "" "Then define the cylinder size, the gas mixture (air or % oxygen) and the " "starting cylinder pressure in the top left-hand section of the planner under " @@ -6577,7 +6633,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3253 +#: user-manual.txt:3267 msgid "" "The planner calculates whether the specified cylinder contains enough " "air/gas to complete the planned dive. In order for this to be accurate, " @@ -6587,7 +6643,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3262 +#: user-manual.txt:3276 msgid "" "Define the amount of gas the cylinder must have at the end of the bottom " "section of the dive just before ascent. A value of 50 bar is often used. The " @@ -6604,7 +6660,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3270 +#: user-manual.txt:3284 msgid "" "Define the depth of the dive by dragging the waypoints (white dots) on the " "dive profile or (even better) defining the appropriate depths using the " @@ -6617,14 +6673,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3273 +#: user-manual.txt:3287 msgid "" "The ascent speed can be changed. The default ascent speeds are those " "considered safe for recreational divers." msgstr "" #. type: Plain text -#: user-manual.txt:3281 +#: user-manual.txt:3295 msgid "" "The dive profile in the planner shows the maximum dive time within no-deco " "limits using the Bühlmann ZH-L16 algorithm and the gas and depth settings " @@ -6640,7 +6696,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3285 +#: user-manual.txt:3299 msgid "" "Below is an image of a dive plan for a recreational dive at 30 " "meters. Although the no-deco limit (NDL) is 23 minutes, the duration of the " @@ -6650,26 +6706,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3286 +#: user-manual.txt:3300 #, no-wrap msgid "images/rec_diveplan.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:3288 +#: user-manual.txt:3302 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "" #. type: Plain text -#: user-manual.txt:3292 +#: user-manual.txt:3306 msgid "" "Non-recreational dive planning involves exceeding the no-deco limits and/or " "using multiple breathing gases. These dives are planned in three stages:" msgstr "" #. type: Plain text -#: user-manual.txt:3304 +#: user-manual.txt:3318 #, no-wrap msgid "" "*a) Nitrogen management*: This is done by specifying the rates for descent " @@ -6695,7 +6751,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3309 +#: user-manual.txt:3323 msgid "" "If the VPM-B model is selected, the Conservatism_level needs to be specified " "on a scale of 0 (least conservative) to 4 (most conservative). This model " @@ -6706,26 +6762,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3311 +#: user-manual.txt:3325 msgid "For more information external to this manual see:" msgstr "" #. type: Plain text -#: user-manual.txt:3313 +#: user-manual.txt:3327 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:3314 +#: user-manual.txt:3328 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:3316 +#: user-manual.txt:3330 msgid "" "link:http://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: " @@ -6734,7 +6790,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3324 +#: user-manual.txt:3338 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 average (or mean) depth " @@ -6748,7 +6804,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3333 +#: user-manual.txt:3347 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, " @@ -6768,7 +6824,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3350 +#: user-manual.txt:3364 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary\n" @@ -6799,7 +6855,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3362 +#: user-manual.txt:3376 msgid "" "Now you can start the detailed time-depth planning of the dive. _Subsurface_ " "offers an unique graphical interface for doing planning. Themechanics are " @@ -6817,7 +6873,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3374 +#: user-manual.txt:3388 msgid "" "Each waypoint on the dive profile creates a _Dive Planner Point_ in the " "table on the left of the dive planner panel. Be sure the _Used Gas_ value in " @@ -6834,7 +6890,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3382 +#: user-manual.txt:3396 msgid "" "Show any changes in gas cylinder used by indicating gas changes as explained " "in the section <>. These " @@ -6846,7 +6902,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3391 +#: user-manual.txt:3405 msgid "" "A non-zero value in the \"CC set point\" column of the table of dive planner " "points indicates a valid setpoint for oxygen partial pressure and that the " @@ -6859,20 +6915,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3394 +#: user-manual.txt:3408 msgid "" "Below is an example of a dive plan to 45m using EAN26, followed by an ascent " "using EAN50 and using the settings as described above." msgstr "" #. type: Target for macro image -#: user-manual.txt:3395 +#: user-manual.txt:3409 #, no-wrap msgid "images/DivePlanner2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3400 +#: user-manual.txt:3414 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 " @@ -6880,13 +6936,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3402 +#: user-manual.txt:3416 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3410 +#: user-manual.txt:3424 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 " @@ -6899,7 +6955,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3415 +#: user-manual.txt:3429 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 " @@ -6909,13 +6965,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3416 +#: user-manual.txt:3430 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3431 +#: user-manual.txt:3445 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ " @@ -6945,26 +7001,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3432 +#: user-manual.txt:3446 #, no-wrap msgid "images/Planner_pSCR1_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3435 +#: user-manual.txt:3449 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3439 +#: user-manual.txt:3453 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:3443 +#: user-manual.txt:3457 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder " @@ -6975,7 +7031,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3453 +#: user-manual.txt:3467 #, no-wrap msgid "" "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by " @@ -6997,31 +7053,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3455 +#: user-manual.txt:3469 msgid "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:3456 +#: user-manual.txt:3470 #, no-wrap msgid "images/Planner_CCR1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3460 +#: user-manual.txt:3474 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:3462 +#: user-manual.txt:3476 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3469 +#: user-manual.txt:3483 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 " @@ -7032,7 +7088,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3475 +#: user-manual.txt:3489 msgid "" "In addition, there is the option \"Save new\". This keeps the original " "planned dive and adds a (possibly modified) copy to the dive list. If that " @@ -7042,13 +7098,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3476 +#: user-manual.txt:3490 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: user-manual.txt:3483 +#: user-manual.txt:3497 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 " @@ -7057,7 +7113,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3489 +#: user-manual.txt:3503 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 done then " @@ -7067,7 +7123,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3494 +#: user-manual.txt:3508 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 " @@ -7077,13 +7133,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3495 +#: user-manual.txt:3509 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3500 +#: user-manual.txt:3514 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 " @@ -7091,7 +7147,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3510 +#: user-manual.txt:3524 msgid "" "Dive plans have many characteristics in common with dive logs (dive profile, " "dive notes, etc). After a dive plan has been saved, the dive details and " @@ -7107,13 +7163,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3511 +#: user-manual.txt:3525 #, no-wrap msgid "Description of the Subsurface Main Menu items" msgstr "" #. type: Plain text -#: user-manual.txt:3516 +#: user-manual.txt:3530 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 " @@ -7121,293 +7177,293 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3517 +#: user-manual.txt:3531 #, no-wrap msgid "File" msgstr "" #. type: Plain text -#: user-manual.txt:3520 +#: user-manual.txt:3534 msgid "" "<> - Close the currently open dive logbook and " "clear all dive information." msgstr "" #. type: Plain text -#: user-manual.txt:3522 +#: user-manual.txt:3536 msgid "_Open logbook_ - Open the file manager to select a dive logbook to open." msgstr "" #. type: Plain text -#: user-manual.txt:3523 +#: user-manual.txt:3537 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<>." msgstr "" #. type: Plain text -#: user-manual.txt:3524 +#: user-manual.txt:3538 msgid "_Save_ - Save the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:3525 +#: user-manual.txt:3539 msgid "" "_Save to cloud storage_ - Save the current dive log to " "<>." msgstr "" #. type: Plain text -#: user-manual.txt:3526 +#: user-manual.txt:3540 msgid "_Save as_ - Save the current logbook under a different file name." msgstr "" #. type: Plain text -#: user-manual.txt:3527 +#: user-manual.txt:3541 msgid "_Close_ - Close the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:3529 +#: user-manual.txt:3543 msgid "" "<> - 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:3530 +#: user-manual.txt:3544 msgid "<> - Print the currently open logbook." msgstr "" #. type: Plain text -#: user-manual.txt:3531 +#: user-manual.txt:3545 msgid "<> - Set the _Subsurface_ preferences." msgstr "" #. type: Plain text -#: user-manual.txt:3532 +#: user-manual.txt:3546 msgid "" "<> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:3533 +#: user-manual.txt:3547 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:3534 +#: user-manual.txt:3548 msgid "" "<> - Edit the configuration of a dive " "computer." msgstr "" #. type: Plain text -#: user-manual.txt:3535 +#: user-manual.txt:3549 msgid "_Quit_ - Quit _Subsurface_." msgstr "" #. type: Title === -#: user-manual.txt:3536 +#: user-manual.txt:3550 #, no-wrap msgid "Import" msgstr "" #. type: Plain text -#: user-manual.txt:3539 +#: user-manual.txt:3553 msgid "" "<> - Import dive " "information from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3541 +#: user-manual.txt:3555 msgid "" "<> - Import dive information from a file " "in in a _Subsurface_-compatible format." msgstr "" #. type: Plain text -#: user-manual.txt:3543 +#: user-manual.txt:3557 msgid "" "<> - Load GPS " "coordinates from the _Subsurface_ mobile phone app." msgstr "" #. type: Plain text -#: user-manual.txt:3545 +#: user-manual.txt:3559 msgid "" "<> - Import dive " "information from _www.Divelogs.de_." msgstr "" #. type: Title === -#: user-manual.txt:3546 +#: user-manual.txt:3560 #, no-wrap msgid "Log" msgstr "" #. type: Plain text -#: user-manual.txt:3548 +#: user-manual.txt:3562 msgid "" "<> - Manually add a new dive to the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:3549 +#: user-manual.txt:3563 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:3550 +#: user-manual.txt:3564 msgid "<> - Plan dives." msgstr "" #. type: Plain text -#: user-manual.txt:3551 +#: user-manual.txt:3565 msgid "" "<> - Edit a dive plan that has been saved " "into the *Dive List*." msgstr "" #. type: Plain text -#: user-manual.txt:3553 +#: user-manual.txt:3567 msgid "" "<> - Copy information from several " "fields of a dive log onto the clipboard." msgstr "" #. type: Plain text -#: user-manual.txt:3555 +#: user-manual.txt:3569 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:3557 +#: user-manual.txt:3571 msgid "" "<> - Renumber the dives listed in the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:3559 +#: user-manual.txt:3573 msgid "" "<> - Group the dives in the *Dive List* panel into " "dive trips." msgstr "" #. type: Plain text -#: user-manual.txt:3560 +#: user-manual.txt:3574 msgid "" "<> - Edit the names of dive computers to " "coordinate your logs." msgstr "" #. type: Plain text -#: user-manual.txt:3561 +#: user-manual.txt:3575 msgid "" "<> - Select only some dives, based on specific " "tags or dive criteria." msgstr "" #. type: Title === -#: user-manual.txt:3562 +#: user-manual.txt:3576 #, no-wrap msgid "View" msgstr "" #. type: Plain text -#: user-manual.txt:3565 +#: user-manual.txt:3579 msgid "<> - View the four main _Subsurface_ panels all at once." msgstr "" #. type: Plain text -#: user-manual.txt:3566 +#: user-manual.txt:3580 msgid "<> - View only the *Dive List* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3567 +#: user-manual.txt:3581 msgid "<> - View only the *Dive Profile* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3568 +#: user-manual.txt:3582 msgid "<> - View only the *Notes* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3569 +#: user-manual.txt:3583 msgid "<> - View only the *World Map* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3571 +#: user-manual.txt:3585 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." msgstr "" #. type: Plain text -#: user-manual.txt:3572 +#: user-manual.txt:3586 msgid "" "_Prev DC_ - Switch to data from previous dive computer, if a single dive was " "logged from more than one." msgstr "" #. type: Plain text -#: user-manual.txt:3573 +#: user-manual.txt:3587 msgid "_Next DC_ - Switch to next dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3574 +#: user-manual.txt:3588 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "" #. type: Title === -#: user-manual.txt:3575 +#: user-manual.txt:3589 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:3577 +#: user-manual.txt:3591 msgid "" "<> - Share the currently selected dive on your " "Facebook timeline." msgstr "" #. type: Title === -#: user-manual.txt:3579 +#: user-manual.txt:3593 #, no-wrap msgid "Help" msgstr "" #. type: Plain text -#: user-manual.txt:3582 +#: user-manual.txt:3596 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." msgstr "" #. type: Plain text -#: user-manual.txt:3584 +#: user-manual.txt:3598 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the http://subsurface-divelog.org/[_Subsurface_ web site]." msgstr "" #. type: Plain text -#: user-manual.txt:3586 +#: user-manual.txt:3600 msgid "" "<> - Help to make _Subsurface_ even better by " "taking part in our user survey or by completing another survey if your " @@ -7415,12 +7471,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3587 +#: user-manual.txt:3601 msgid "_User manual_ - Open a window showing this user manual." msgstr "" #. type: Title == -#: user-manual.txt:3590 +#: user-manual.txt:3604 #, no-wrap msgid "" "APPENDIX A: Operating system specific information for importing dive " @@ -7428,19 +7484,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3592 +#: user-manual.txt:3606 #, 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:3593 +#: user-manual.txt:3607 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3598 +#: user-manual.txt:3612 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 " @@ -7448,7 +7504,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3604 +#: user-manual.txt:3618 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 " @@ -7457,7 +7513,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3608 +#: user-manual.txt:3622 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 " @@ -7465,7 +7521,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3615 +#: user-manual.txt:3629 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 " @@ -7476,19 +7532,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3617 +#: user-manual.txt:3631 #, 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:3618 +#: user-manual.txt:3632 #, no-wrap msgid "images/icons/usb.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3626 +#: user-manual.txt:3640 msgid "" "When connecting a dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list with the correct device " @@ -7498,61 +7554,61 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3631 +#: user-manual.txt:3645 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." msgstr "" #. type: Title ==== -#: user-manual.txt:3632 user-manual.txt:3730 +#: user-manual.txt:3646 user-manual.txt:3744 #, no-wrap msgid "On MacOS:" msgstr "" #. type: Plain text -#: user-manual.txt:3635 +#: user-manual.txt:3649 msgid "The drop down box should find all connected dive computers." msgstr "" #. type: Block title -#: user-manual.txt:3636 +#: user-manual.txt:3650 #, no-wrap msgid "On Linux:" msgstr "" #. type: Plain text -#: user-manual.txt:3639 +#: user-manual.txt:3653 msgid "There is a definitive way to find the port:" msgstr "" #. type: Plain text -#: user-manual.txt:3641 +#: user-manual.txt:3655 msgid "Disconnect the USB cable from the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3642 +#: user-manual.txt:3656 msgid "Open a terminal" msgstr "" #. type: Plain text -#: user-manual.txt:3643 user-manual.txt:3645 +#: user-manual.txt:3657 user-manual.txt:3659 msgid "Type the command: 'dmesg' and press enter" msgstr "" #. type: Plain text -#: user-manual.txt:3644 +#: user-manual.txt:3658 msgid "Plug in the USB cable of the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3647 +#: user-manual.txt:3661 msgid "A message similar to this one should appear:" msgstr "" #. type: Plain text -#: user-manual.txt:3663 +#: user-manual.txt:3677 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -7573,7 +7629,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3668 +#: user-manual.txt:3682 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 " @@ -7581,12 +7637,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3670 +#: user-manual.txt:3684 msgid "Ensuring the user has write permission to the USB serial port:" msgstr "" #. type: Plain text -#: user-manual.txt:3680 +#: user-manual.txt:3694 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 " @@ -7598,14 +7654,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3684 +#: user-manual.txt:3698 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:3689 +#: user-manual.txt:3703 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -7617,7 +7673,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3691 +#: user-manual.txt:3705 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) " @@ -7626,7 +7682,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3696 +#: user-manual.txt:3710 msgid "" "With the appropriate device name (e.g. +dev/ttyUSB3+) and with write " "permission to the USB port, the dive computer interface can connect and one " @@ -7634,13 +7690,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3699 +#: user-manual.txt:3713 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:3706 +#: user-manual.txt:3720 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a " @@ -7649,7 +7705,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3708 +#: user-manual.txt:3722 #, no-wrap msgid "" "*For the dive computer, after enabling Bluetooth, be sure it is in Upload " @@ -7657,7 +7713,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3712 +#: user-manual.txt:3726 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 -> " @@ -7665,13 +7721,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3714 +#: user-manual.txt:3728 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3723 +#: user-manual.txt:3737 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -7683,21 +7739,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3726 +#: user-manual.txt:3740 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:3729 +#: user-manual.txt:3743 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:3736 +#: user-manual.txt:3750 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 " @@ -7706,20 +7762,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3739 +#: user-manual.txt:3753 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:3740 +#: user-manual.txt:3754 #, no-wrap msgid "On Linux" msgstr "" #. type: Plain text -#: user-manual.txt:3748 +#: user-manual.txt:3762 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 " @@ -7731,7 +7787,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3752 +#: user-manual.txt:3766 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 " @@ -7740,23 +7796,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3754 +#: user-manual.txt:3768 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3755 +#: user-manual.txt:3769 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:3756 user-manual.txt:3896 +#: user-manual.txt:3770 user-manual.txt:3910 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:3762 +#: user-manual.txt:3776 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 " @@ -7767,7 +7823,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3767 +#: user-manual.txt:3781 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 " @@ -7777,23 +7833,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3769 +#: user-manual.txt:3783 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:3771 +#: user-manual.txt:3785 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:3772 +#: user-manual.txt:3786 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3778 +#: user-manual.txt:3792 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 " @@ -7804,7 +7860,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3781 +#: user-manual.txt:3795 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 " @@ -7812,7 +7868,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3788 +#: user-manual.txt:3802 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -7824,7 +7880,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3793 +#: user-manual.txt:3807 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 " @@ -7834,7 +7890,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3801 +#: user-manual.txt:3815 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -7847,25 +7903,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3803 +#: user-manual.txt:3817 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: user-manual.txt:3805 +#: user-manual.txt:3819 msgid "" "If there are multiple controllers running, it's easiest to off the unused " "controller(s). For example, for +hci1+:" msgstr "" #. type: Plain text -#: user-manual.txt:3807 +#: user-manual.txt:3821 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:3810 +#: user-manual.txt:3824 msgid "" "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez " "5, such as Fedora 22, one can use a tool called +blutootctl+, which will " @@ -7873,7 +7929,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3831 +#: user-manual.txt:3845 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -7902,14 +7958,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3834 +#: user-manual.txt:3848 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:3837 +#: user-manual.txt:3851 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 " @@ -7917,7 +7973,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3842 +#: user-manual.txt:3856 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -7927,82 +7983,82 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3844 +#: user-manual.txt:3858 msgid "Once ther dive computer is pired, set up the RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:3845 +#: user-manual.txt:3859 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:3848 +#: user-manual.txt:3862 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:3850 +#: user-manual.txt:3864 msgid "+sudo rfcomm -i connect [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:3852 +#: user-manual.txt:3866 msgid "++ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:3853 +#: user-manual.txt:3867 msgid "++ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:3854 +#: user-manual.txt:3868 msgid "++ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:3855 +#: user-manual.txt:3869 msgid "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:3858 +#: user-manual.txt:3872 msgid "" "If one omits it, channel 1 is assumed. Based on a limited number of user " "reports, the appropriate channel for the dive computer is probably:" msgstr "" #. type: Plain text -#: user-manual.txt:3860 +#: user-manual.txt:3874 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3861 +#: user-manual.txt:3875 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:3862 +#: user-manual.txt:3876 msgid "_Shearwater Nerd_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:3863 +#: user-manual.txt:3877 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3865 +#: user-manual.txt:3879 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:3867 +#: user-manual.txt:3881 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, " @@ -8010,12 +8066,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3869 +#: user-manual.txt:3883 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:3872 +#: user-manual.txt:3886 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -8023,14 +8079,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3874 +#: user-manual.txt:3888 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:3878 +#: user-manual.txt:3892 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, " @@ -8040,7 +8096,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3882 +#: user-manual.txt:3896 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 " @@ -8049,7 +8105,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3892 +#: user-manual.txt:3906 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -8064,7 +8120,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3895 +#: user-manual.txt:3909 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 " @@ -8072,7 +8128,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3898 +#: user-manual.txt:3912 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select " @@ -8082,25 +8138,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3904 +#: user-manual.txt:3918 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:3907 +#: user-manual.txt:3921 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3909 +#: user-manual.txt:3923 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3925 +#: user-manual.txt:3939 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and " @@ -8117,7 +8173,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3940 +#: user-manual.txt:3954 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -8134,19 +8190,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3942 +#: user-manual.txt:3956 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3944 +#: user-manual.txt:3958 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3959 +#: user-manual.txt:3973 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -8162,14 +8218,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3962 +#: user-manual.txt:3976 msgid "" "After executing this command, Subsurface will recognize the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:3968 +#: user-manual.txt:3982 msgid "" "Under Windows, a similar situation exists. Drivers for the MCS7780 are " "available from some Internet web sites e.g. " @@ -8180,26 +8236,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3971 +#: user-manual.txt:3985 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:3973 +#: user-manual.txt:3987 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3975 +#: user-manual.txt:3989 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3985 +#: user-manual.txt:3999 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. " @@ -8212,19 +8268,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3988 +#: user-manual.txt:4002 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3990 +#: user-manual.txt:4004 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3999 +#: user-manual.txt:4013 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 " @@ -8238,19 +8294,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4001 +#: user-manual.txt:4015 #, no-wrap msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4003 +#: user-manual.txt:4017 #, no-wrap msgid "images/icons/predator.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4006 +#: user-manual.txt:4020 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, < Import log files_ to open the " "xref:Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:4048 +#: user-manual.txt:4062 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:4052 +#: user-manual.txt:4066 #, no-wrap msgid "" "On the list of file names select the _.apd_ file created. An import\n" @@ -8390,13 +8446,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4053 +#: user-manual.txt:4067 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4061 +#: user-manual.txt:4075 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 " @@ -8408,12 +8464,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4062 +#: user-manual.txt:4076 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:4067 +#: user-manual.txt:4081 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer- " "generated ceiling provided by the Inspiration can be viewed by selecting the " @@ -8423,13 +8479,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4068 +#: user-manual.txt:4082 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:4077 +#: user-manual.txt:4091 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, " @@ -8439,22 +8495,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4079 +#: user-manual.txt:4093 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:4080 +#: user-manual.txt:4094 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4081 +#: user-manual.txt:4095 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4085 +#: user-manual.txt:4099 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -8462,19 +8518,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4087 +#: user-manual.txt:4101 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4088 +#: user-manual.txt:4102 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4095 +#: user-manual.txt:4109 msgid "" "DiveManager is a MS Windows application for Suunto dive computers. " "Divemanager 3 (DM3) is an older version of the Suunto software. More recent " @@ -8484,64 +8540,64 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4097 +#: user-manual.txt:4111 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4099 +#: user-manual.txt:4113 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:4100 +#: user-manual.txt:4114 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4102 +#: user-manual.txt:4116 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:4103 +#: user-manual.txt:4117 msgid "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:4104 +#: user-manual.txt:4118 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:4106 +#: user-manual.txt:4120 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:4107 +#: user-manual.txt:4121 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:4108 +#: user-manual.txt:4122 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:4109 +#: user-manual.txt:4123 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:4111 +#: user-manual.txt:4125 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -8549,13 +8605,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4112 +#: user-manual.txt:4126 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:4114 +#: user-manual.txt:4128 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -8563,25 +8619,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4115 +#: user-manual.txt:4129 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:4116 +#: user-manual.txt:4130 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:4118 +#: user-manual.txt:4132 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4123 +#: user-manual.txt:4137 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 " @@ -8590,81 +8646,81 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4125 +#: user-manual.txt:4139 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:4127 user-manual.txt:4136 +#: user-manual.txt:4141 user-manual.txt:4150 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:4128 +#: user-manual.txt:4142 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:4129 +#: user-manual.txt:4143 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:4130 +#: user-manual.txt:4144 msgid "Open Windows Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4131 +#: user-manual.txt:4145 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4132 +#: user-manual.txt:4146 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:4134 +#: user-manual.txt:4148 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:4137 +#: user-manual.txt:4151 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:4139 +#: user-manual.txt:4153 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:4140 +#: user-manual.txt:4154 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:4141 +#: user-manual.txt:4155 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:4143 +#: user-manual.txt:4157 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4146 +#: user-manual.txt:4160 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4153 +#: user-manual.txt:4167 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " @@ -8674,19 +8730,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4155 +#: user-manual.txt:4169 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4158 +#: user-manual.txt:4172 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4166 +#: user-manual.txt:4180 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 " @@ -8697,7 +8753,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4171 +#: user-manual.txt:4185 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 " @@ -8705,36 +8761,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4174 +#: user-manual.txt:4188 msgid "" "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganizer.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4175 +#: user-manual.txt:4189 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4176 +#: user-manual.txt:4190 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4178 +#: user-manual.txt:4192 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4180 +#: user-manual.txt:4194 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4187 +#: user-manual.txt:4201 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 " @@ -8744,37 +8800,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4189 +#: user-manual.txt:4203 msgid "To transfer all files from DivingLog to Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:4191 +#: user-manual.txt:4205 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4192 +#: user-manual.txt:4206 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4193 +#: user-manual.txt:4207 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4194 +#: user-manual.txt:4208 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4195 +#: user-manual.txt:4209 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4199 +#: user-manual.txt:4213 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 " @@ -8782,13 +8838,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4200 +#: user-manual.txt:4214 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:4210 +#: user-manual.txt:4224 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 " @@ -8800,7 +8856,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4216 +#: user-manual.txt:4230 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 " @@ -8810,40 +8866,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4218 +#: user-manual.txt:4232 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: user-manual.txt:4219 +#: user-manual.txt:4233 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: user-manual.txt:4220 +#: user-manual.txt:4234 msgid "" "Unit system: only one unit system should be used (no mix of imperial and " "metric units)" msgstr "" #. type: Plain text -#: user-manual.txt:4221 +#: user-manual.txt:4235 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: user-manual.txt:4222 +#: user-manual.txt:4236 msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: user-manual.txt:4222 +#: user-manual.txt:4236 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: user-manual.txt:4226 +#: user-manual.txt:4240 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -8854,13 +8910,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4227 +#: user-manual.txt:4241 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4230 +#: user-manual.txt:4244 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 " @@ -8868,13 +8924,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4231 +#: user-manual.txt:4245 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4234 +#: user-manual.txt:4248 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -8882,13 +8938,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4235 +#: user-manual.txt:4249 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4238 +#: user-manual.txt:4252 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 " @@ -8896,13 +8952,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4239 +#: user-manual.txt:4253 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: user-manual.txt:4245 +#: user-manual.txt:4259 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -8913,19 +8969,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4247 +#: user-manual.txt:4261 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:4248 +#: user-manual.txt:4262 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4251 +#: user-manual.txt:4265 msgid "" "Do one of the following: ** In Windows 7, click the _Formats_ tab, and then " "click _Customize this format_. ** In Windows XP, click the _Regional " @@ -8933,48 +8989,48 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4252 +#: user-manual.txt:4266 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:4253 +#: user-manual.txt:4267 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4255 +#: user-manual.txt:4269 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4256 +#: user-manual.txt:4270 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4259 +#: user-manual.txt:4273 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4261 +#: user-manual.txt:4275 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:4262 +#: user-manual.txt:4276 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4268 +#: user-manual.txt:4282 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 " @@ -8984,13 +9040,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4269 +#: user-manual.txt:4283 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4275 +#: user-manual.txt:4289 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 " @@ -8999,13 +9055,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4276 +#: user-manual.txt:4290 #, no-wrap msgid "APPENDIX E: Writing a custom print template" msgstr "" #. type: Plain text -#: user-manual.txt:4281 +#: user-manual.txt:4295 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 " @@ -9014,12 +9070,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4283 +#: user-manual.txt:4297 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4291 +#: user-manual.txt:4305 msgid "" "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, " "_Import_ and _Export_ templates (see image *A* above). New or modified " @@ -9031,18 +9087,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4293 +#: user-manual.txt:4307 msgid "The Edit Panel has three tabs:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4294 +#: user-manual.txt:4308 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4298 +#: user-manual.txt:4312 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 " @@ -9050,7 +9106,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4302 +#: user-manual.txt:4316 msgid "" "The _Colors_ tab (image *B* above) allows editing the colors used for " "printing the dive log. The colors are highly customizable: the _Edit_ " @@ -9059,7 +9115,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4311 +#: user-manual.txt:4325 msgid "" "The _Template_ tab of the Edit Panel (see image below) allows creating a " "template using HTML as well as a few Grantlee programming " @@ -9075,13 +9131,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4312 +#: user-manual.txt:4326 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4317 +#: user-manual.txt:4331 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 " @@ -9090,33 +9146,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4319 +#: user-manual.txt:4333 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:4320 +#: user-manual.txt:4334 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4322 +#: user-manual.txt:4336 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:4322 user-manual.txt:4387 user-manual.txt:4404 +#: user-manual.txt:4336 user-manual.txt:4401 user-manual.txt:4418 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4327 +#: user-manual.txt:4341 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -9125,13 +9181,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4329 user-manual.txt:4392 user-manual.txt:4411 +#: user-manual.txt:4343 user-manual.txt:4406 user-manual.txt:4425 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4334 +#: user-manual.txt:4348 #, no-wrap msgid "" "\t

1

\n" @@ -9140,25 +9196,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4337 +#: user-manual.txt:4351 msgid "" "Additional information about _Grantlee_ can be found at " "http://www.grantlee.org/apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:4338 +#: user-manual.txt:4352 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:4340 +#: user-manual.txt:4354 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:4369 +#: user-manual.txt:4383 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9192,7 +9248,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4373 +#: user-manual.txt:4387 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -9200,7 +9256,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4385 +#: user-manual.txt:4399 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9219,26 +9275,26 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4390 +#: user-manual.txt:4404 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4395 +#: user-manual.txt:4409 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:4398 +#: user-manual.txt:4412 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:4401 +#: user-manual.txt:4415 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9247,7 +9303,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4409 +#: user-manual.txt:4423 #, no-wrap msgid "" "\tbody {\n" @@ -9256,7 +9312,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4416 +#: user-manual.txt:4430 #, no-wrap msgid "" "\tbody {\n" @@ -9265,13 +9321,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4418 +#: user-manual.txt:4432 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:4421 +#: user-manual.txt:4435 msgid "" "As the dive profile is placed after rendering, _Subsurface_ uses special " "_CSS_ selectors to searche in the HTML output. The _CSS_ selectors in the " @@ -9279,7 +9335,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4428 +#: user-manual.txt:4442 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -9292,20 +9348,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4431 +#: user-manual.txt:4445 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:4432 +#: user-manual.txt:4446 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:4436 +#: user-manual.txt:4450 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 " @@ -9313,55 +9369,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4438 +#: user-manual.txt:4452 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode." msgstr "" #. type: Plain text -#: user-manual.txt:4440 +#: user-manual.txt:4454 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:4443 +#: user-manual.txt:4457 #, no-wrap msgid "\t\n" msgstr "" #. type: Plain text -#: user-manual.txt:4446 +#: user-manual.txt:4460 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:4449 +#: user-manual.txt:4463 #, no-wrap msgid "\t\n" msgstr "" #. type: Plain text -#: user-manual.txt:4452 +#: user-manual.txt:4466 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" #. type: Title == -#: user-manual.txt:4453 +#: user-manual.txt:4467 #, no-wrap msgid "APPENDIX F: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:4455 +#: user-manual.txt:4469 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:4459 +#: user-manual.txt:4473 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_ " @@ -9369,7 +9425,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4465 +#: user-manual.txt:4479 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -9379,7 +9435,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4471 +#: user-manual.txt:4485 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 " @@ -9389,12 +9445,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4473 +#: user-manual.txt:4487 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:4479 +#: user-manual.txt:4493 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 " @@ -9405,12 +9461,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4481 +#: user-manual.txt:4495 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:4486 +#: user-manual.txt:4500 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 " @@ -9420,7 +9476,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4492 +#: user-manual.txt:4506 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 " @@ -9431,7 +9487,7 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4493 +#: user-manual.txt:4507 #, no-wrap msgid "" "Some dive profiles have time discrepancies with the recorded samples from my " @@ -9439,7 +9495,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4497 +#: user-manual.txt:4511 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -9447,7 +9503,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4505 +#: user-manual.txt:4519 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 " @@ -9461,13 +9517,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4506 +#: user-manual.txt:4520 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:4520 +#: user-manual.txt:4534 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 " @@ -9482,7 +9538,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4524 +#: user-manual.txt:4538 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 4293e1e3f..35698cc59 100644 --- a/Documentation/fr/po/subsurface-mobile-manual.fr.po +++ b/Documentation/fr/po/subsurface-mobile-manual.fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: subsurface-manual VERSION\n" "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n" -"POT-Creation-Date: 2016-07-21 10:32+0200\n" +"POT-Creation-Date: 2016-10-11 10:50+0200\n" "PO-Revision-Date: 2016-07-21 11:03+0200\n" "Last-Translator: Guillaume GARDET \n" "Language-Team: French \n" @@ -27,7 +27,9 @@ msgstr "mobile-images/banner.jpg" #. type: Plain text #: mobile-manual.txt:15 -msgid "[big]#Subsurface-mobile for Android: USER MANUAL#" +#, fuzzy +#| msgid "[big]#Subsurface-mobile for Android: USER MANUAL#" +msgid "[big]#Subsurface-mobile USER MANUAL#" msgstr "[big]#Subsurface-mobile pour Android: MANUEL UTILISATEUR#" #. type: Plain text @@ -43,7 +45,9 @@ msgstr "toc::[]" #. type: Plain text #: mobile-manual.txt:21 -msgid "[blue]#_Version 1.0, March 2016_#" +#, fuzzy +#| msgid "[blue]#_Version 1.0, March 2016_#" +msgid "[blue]#_Version 1.1, September 2016_#" msgstr "[blue]#_Version 1.0, Mars 2016_#" #. type: Plain text @@ -53,9 +57,9 @@ msgid "" "extensive infrastructure to describe, organize, interpret and print scuba " "and free dives. _Subsurface_ offers many advantages over other similar " "software solutions, including compatibility with Windows, Mac-OS/X, Linux " -"(many distributions) and Android (iOS under development). In addition, " -"_Subsurface_ is open-source software that allows downloading dive " -"information from most dive computers." +"(many distributions), Android and iOS. In addition, _Subsurface_ is open-" +"source software that allows downloading dive information from most dive " +"computers." msgstr "" #. type: Title - @@ -65,13 +69,21 @@ msgid "Introducing Subsurface-mobile" msgstr "Présentation de Subsurface-mobile" #. type: Plain text -#: mobile-manual.txt:38 +#: mobile-manual.txt:39 +#, fuzzy +#| msgid "" +#| "_Subsurface-mobile_ is an extension of _Subsurface_ on laptop and " +#| "tabletop computers. It 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_ also allows the " +#| "gathering of GPS locations where dives are performed." msgid "" -"_Subsurface-mobile_ is an extension of _Subsurface_ on laptop and tabletop " -"computers. It 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_ also allows the gathering of GPS " -"locations where dives are performed." +"_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)." msgstr "" "_Subsurface-mobile_ est une extension de _Subsurface_ sur ordinateurs. Il " "fonctionne sur les smartphones et les tablettes Android et c'est un outil " @@ -79,31 +91,24 @@ msgstr "" "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." -#. type: Plain text -#: mobile-manual.txt:41 -msgid "" -"Because of the restrictions of iOS, _Subsurface-mobile_ for iOS does not " -"have all the features of the same app for Android." -msgstr "" -"À cause des limitations d'iOS, _Subsurface-mobile_ pour iOS n'inclut pas " -"toutes les fonctionnalités présentes dans la version Android." - #. type: Plain text #: mobile-manual.txt:51 msgid "" -"While _Subsurface-mobile_ allows one to enter and save dive information " -"using an Android device, 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 Android and the desktop versions. 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 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." msgstr "" #. type: Plain text #: mobile-manual.txt:53 -msgid "_Subsurface-mobile_ allows one to:" +msgid "_Subsurface-mobile_ allows you to:" msgstr "" #. type: Plain text @@ -125,17 +130,17 @@ msgstr "" #. type: Plain text #: mobile-manual.txt:59 -msgid "Manually create and add new dive records to one's dive log." +msgid "Manually create and add new dive records to your dive log." msgstr "" #. type: Plain text #: mobile-manual.txt:60 -msgid "Store the updated dive log on the Internet." +msgid "Store the updated dive log in the _Subsurface_ cloud storage." msgstr "" #. type: Plain text #: mobile-manual.txt:61 -msgid "Record, store and apply GPS positions of dives." +msgid "Record, store and apply GPS positions of dives (Android only)." msgstr "" #. type: Plain text @@ -157,14 +162,14 @@ msgstr "" #. type: Title == #: mobile-manual.txt:71 #, no-wrap -msgid "Installing _Subsurface-mobile_ on an Android device" +msgid "Installing _Subsurface-mobile_ on your mobile device" msgstr "" #. type: Plain text #: mobile-manual.txt:75 msgid "" -"Find _Subsurface-mobile_ in the _Google Play Store_. Search for _Subsurface-" -"mobile_ and install it." +"Find _Subsurface-mobile_ in the _Google Play Store_ or the _iTunes Store_ " +"and install it." msgstr "" #. type: Title == @@ -192,39 +197,44 @@ msgstr "" #. type: Title === #: mobile-manual.txt:85 #, no-wrap -msgid "When NOT Using Internet access" +msgid "When NOT Using Cloud Storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:89 +#: mobile-manual.txt:90 msgid "" -"If the striked-out cloud icon is selected, the app will not access the " -"Internet to obtain dive log information. This means that dive log " -"information is manually entered and stored on the mobile device only." +"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." msgstr "" #. type: Title === -#: mobile-manual.txt:90 +#: mobile-manual.txt:91 #, no-wrap -msgid "Using Internet access" +msgid "Using Cloud Storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:93 +#: mobile-manual.txt:95 msgid "" -"Since _Subsurface_ is largely dependent on a dive log saved on the Internet, " -"provide a PIN for access to the _Subsurface Cloud_, obtained in one of two " -"ways:" +"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." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:97 +msgid "You can also create a new account from your mobile device." msgstr "" #. type: Title ==== -#: mobile-manual.txt:94 +#: mobile-manual.txt:98 #, no-wrap msgid "Using the desktop version of _Subsurface_:" msgstr "" #. type: Plain text -#: mobile-manual.txt:105 +#: mobile-manual.txt:109 #, no-wrap msgid "" "Open the desktop version of _Subsurface_ and\n" @@ -232,38 +242,38 @@ msgid "" "https://subsurface-divelog.org/documentation/subsurface-4-user-manual/#\\_create_a_cloud_storage_account[user\n" "manual for the _Subsurface_ desktop version]. Once the account has\n" "been created and verified using the desktop version,\n" -"_Subsurface_ desktop alows one to download dive information from dive computers and store this\n" +"_Subsurface_ desktop alows you to download dive information from dive computers and store this\n" "on the cloud which can, in turn, be downloaded to _Subsurface-mobile_. _Subsurface-mobile_\n" "attempts to download the existing dive log from the _Subsurface_ cloud\n" "server. Appropriate messages are shown onscreen. Finally a list of dives is shown.\n" msgstr "" #. type: Plain text -#: mobile-manual.txt:114 +#: mobile-manual.txt:118 msgid "" "Once the dive list has been downloaded from the Internet, _Subsurface-" -"mobile_ keeps a local copy on the mobile device. This means that, if there " -"is no Internet connection at a dive site, one can still access the local " -"copy and view and manipulate dive information. If there is Internet " +"mobile_ keeps a local copy on the mobile device. This means that even if " +"there is no Internet connection at a dive site, you can still access the " +"local copy and view and manipulate dive information. If there is Internet " "connectivity, _Subsurface-mobile_ accesses the cloud-based dive log to " "verify that the local copy is still the same as the Internet-stored copy. If " "not, the local copy and the copy on the server are synchronised." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:116 +#: mobile-manual.txt:120 #, no-wrap msgid "mobile-images/Credentials.jpg" msgstr "mobile-images/Credentials.jpg" #. type: Title ==== -#: mobile-manual.txt:119 +#: mobile-manual.txt:123 #, no-wrap msgid "Using _Subsurface-mobile_:" msgstr "" #. type: Plain text -#: mobile-manual.txt:127 +#: mobile-manual.txt:131 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 +286,14 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:130 +#: mobile-manual.txt:134 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:133 +#: mobile-manual.txt:137 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,39 +301,21 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:136 +#: mobile-manual.txt:141 msgid "" -"The dive list is initially empty. One can now start entering dives in the " -"dive log or one can download existing dives from the cloud." -msgstr "" - -#. type: Plain text -#: mobile-manual.txt:142 -msgid "" -"The text box to enter the PIN is shown whenever the e-mail address field is " -"empty. One can create a new cloud account by clearing the e-mail address " -"and typing a new e-mail address, upon which a new PIN is sent to the newly-" -"provided e-mail address. On the other hand, one can change to a different " -"existing cloud account by providing an e-mail address and password already " -"registered with the cloud server (image on right, above)" -msgstr "" - -#. type: Plain text -#: mobile-manual.txt:145 -msgid "" -"Once Internet access has been enabled, one can temporarily disable this " -"service when using _Subsurface-mobile_ in areas with no Internet access, e." -"g. remote dive sites (see below)" +"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." msgstr "" #. type: Title == -#: mobile-manual.txt:146 +#: mobile-manual.txt:143 #, no-wrap msgid "A Few Remarks About The User Interface" msgstr "" #. type: Plain text -#: mobile-manual.txt:155 +#: mobile-manual.txt:152 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 " @@ -334,6 +326,13 @@ msgid "" "without saving changes." msgstr "" +#. type: Plain text +#: mobile-manual.txt:155 +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 #, no-wrap @@ -341,160 +340,170 @@ msgid "mobile-images/actionbutton.jpg" msgstr "mobile-images/actionbutton.jpg" #. type: Plain text -#: mobile-manual.txt:163 +#: mobile-manual.txt:164 msgid "" -"Instead of the more traditional \"hamburger\" menu button in the top left or " -"right corner of the screen to open menus, _Subsurface-mobile_ uses a " -"different user interaction philosophy based on the Kirigami framework " -"developed by the Plasma developers. To open the main menu one has three " -"options:" +"In order to have a consistent experience between iOS and Android, " +"_Subsurface-mobile_ on Android does not use the traditional \"hamburger\" " +"menu button in the top left or right corner of the screen to open menus. " +"Instead, _Subsurface-mobile_ uses a different user interaction philosophy " +"based on the Kirigami framework developed by the Plasma developers. There " +"are three ways to open the main menu:" msgstr "" #. type: Plain text -#: mobile-manual.txt:166 +#: mobile-manual.txt:167 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:167 +#: mobile-manual.txt:168 msgid "Swipe towards the right across the left edge of the screen" msgstr "" #. type: Plain text -#: mobile-manual.txt:169 +#: mobile-manual.txt:170 msgid "Drag the action button visible on most screens to the right" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:170 +#: mobile-manual.txt:171 #, no-wrap msgid "mobile-images/menu.jpg" msgstr "mobile-images/menu.jpg" #. type: Plain text -#: mobile-manual.txt:176 +#: mobile-manual.txt:177 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 one taps the _GPS_ option on the " -"main menu. On the right is the menu that opens if one taps the _Manage " -"Dives_ option on the main menu." +"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." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:181 +msgid "" +"All screenshots in this user manual are currently from the Android version. " +"As indicated earlier, the iOS version currently doesn't support _GPS_ " +"features." msgstr "" #. type: Title == -#: mobile-manual.txt:177 +#: mobile-manual.txt:182 #, no-wrap msgid "Viewing the Dive List" msgstr "" #. type: Plain text -#: mobile-manual.txt:185 +#: mobile-manual.txt:190 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 one can scroll up and " +"(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." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:186 +#: mobile-manual.txt:191 #, no-wrap msgid "mobile-images/DiveList.jpg" msgstr "mobile-images/DiveList.jpg" #. type: Plain text -#: mobile-manual.txt:193 +#: mobile-manual.txt:199 msgid "" -"One can view other dives by swiping the _Details view_ to the right (for the " +"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 " "also possible to delete the dive (tap the dustbin on the Action Bar) or to " -"view the dive location on a map viewer (normally Google Maps; tap the GPS " -"icon on the Action Bar.)." +"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.)." msgstr "" #. type: Title == -#: mobile-manual.txt:194 +#: mobile-manual.txt:200 #, no-wrap msgid "Editing dive details" msgstr "" #. type: Plain text -#: mobile-manual.txt:204 +#: mobile-manual.txt:211 msgid "" "At the bottom of the dive details screen the _Action Button_ contains a " -"pencil (image on right, above). Tapping the button brings up a panel with " -"edit boxes that allows one to change the existing dive information, e.g. " -"adding text to the dive notes or changing the names or values of some of the " -"information (see image below). It may be necessary to scroll the window to " -"access all the information. At the bottom of the edit screen is a _Save_ " +"pencil (image on right, above). Tapping the pencil button brings up a panel " +"with edit boxes that allows you to change the existing dive information, e." +"g. adding text to the dive notes or changing the names or values of some of " +"the information (see image below). It may be necessary to scroll the window " +"to access all the information. At the bottom of the edit screen is a _Save_ " "action button. Tap this to save the new information. Having saved the data, " "the dive list screen is updated and shown. To cancel any edits, tap the " -"Android Back Button." +"Android Back Button or swipe the edit screen up (fling it away)." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:205 +#: mobile-manual.txt:212 #, no-wrap msgid "mobile-images/EditDive.jpg" msgstr "mobile-images/EditDive.jpg" #. type: Title == -#: mobile-manual.txt:207 +#: mobile-manual.txt:214 #, no-wrap msgid "Adding a new dive to the dive list" msgstr "" #. type: Plain text -#: mobile-manual.txt:218 +#: mobile-manual.txt:226 msgid "" -"It is also possible to manually add an additional dive to the existing dive " -"list. On the main menu tap _Manage dives -> Add dive manually_. This opens a " -"screen that is identical to the editing screen discussed above. When a dive " -"is added manually, one cannot directly add a dive profile from a dive " -"computer. However, if one does not use a dive computer, the duration, depth " -"and several other bits of information about the new dive can be entered. The " -"_Action button_ at the bottom of the screen contains a disk symbol. Tap this " -"to save the new dive. To cancel any edits, tap the Android Back Button. The " -"left-hand image below shows a screenshot of a dive being created and the " -"right-hand image shows the same dive in _Details View_." +"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 " +"_Manage dives -> Add dive manually_. This opens a screen that is identical " +"to the editing screen discussed above. When a dive is added manually, you " +"cannot directly add a dive profile from a dive computer. However, if you do " +"not use a dive computer, the duration, depth and several other bits of " +"information about the new dive can be entered. The _Action button_ at the " +"bottom of the screen contains a disk symbol. Tap this to save the new dive. " +"To cancel any edits, tap the Android Back Button. The left-hand image below " +"shows a screenshot of a dive being created and the right-hand image shows " +"the same dive in _Details View_." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:219 +#: mobile-manual.txt:227 #, no-wrap msgid "mobile-images/ManuallyEnterDive.jpg" msgstr "mobile-images/ManuallyEnterDive.jpg" #. type: Title == -#: mobile-manual.txt:221 +#: mobile-manual.txt:229 #, no-wrap msgid "Deleting a dive" msgstr "" #. type: Plain text -#: mobile-manual.txt:227 +#: mobile-manual.txt:235 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. One has a brief " +"is tapped, the dive shown in the _Details View_ is deleted. You have a brief " "opportunity to undo the delete by tapping the grey _Undo_ button in the " "message that appears at the bottom of the screen (see image below)." msgstr "" #. type: Target for macro image -#: mobile-manual.txt:228 +#: mobile-manual.txt:236 #, no-wrap msgid "mobile-images/Delete_undo.jpg" msgstr "mobile-images/Delete_undo.jpg" #. type: Plain text -#: mobile-manual.txt:235 +#: mobile-manual.txt:243 msgid "" -"One can also delete a dive from the dive list by long-pressing a specific " +"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). " "Tap the dustbin. The dive is deleted without asking any confirmation because " "_Subsurface-mobile_ assumes that the combination of a long tap on the dive " @@ -503,129 +512,116 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:236 +#: mobile-manual.txt:244 #, no-wrap msgid "mobile-images/RedDustbin.jpg" msgstr "mobile-images/RedDustbin.jpg" #. type: Title == -#: mobile-manual.txt:238 +#: mobile-manual.txt:246 #, no-wrap msgid "Dive log management" msgstr "" #. type: Plain text -#: mobile-manual.txt:248 +#: mobile-manual.txt:256 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 tap the \"Hamburger" -"\" icon at the bottom left of the screen). Tap the option _Manage dives_, " -"enabling a number of options:" +"dragging the Action Button to the right, or alternatively tappping 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:249 +#: mobile-manual.txt:257 #, no-wrap msgid "Add new dive manually" msgstr "" #. type: Plain text -#: mobile-manual.txt:252 +#: mobile-manual.txt:260 msgid "This is described above under the section dealing with the dive list." msgstr "" #. type: Title === -#: mobile-manual.txt:253 +#: mobile-manual.txt:261 #, no-wrap -msgid "Upload dive log to the _Subsurface_ cloud storage" +msgid "Sync the dive log with the _Subsurface_ cloud storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:259 +#: mobile-manual.txt:268 msgid "" -"One can upload the dives contained on the mobile device to the _Subsurface_ " +"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." +"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 " +"cloud storage." msgstr "" #. type: Title === -#: mobile-manual.txt:260 +#: mobile-manual.txt:269 #, no-wrap -msgid "Download dive log from the cloud storage" +msgid "Working offline or online" msgstr "" #. type: Plain text -#: mobile-manual.txt:265 +#: mobile-manual.txt:278 msgid "" -"In the dive management subpanel, tap the option _Manual sync with cloud_, " -"causing the local divelog to be refreshed from the cloud so that the cloud " -"and local versions are synchronised." +"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 " +"to always sync with the cloud servers after every modification of the dive " +"list. This is not recommended unless you are in an area with fast and " +"reliable internet connection, as otherwise _Subsurface-mobile_ might appear " +"to hang between operations as it tries to connect to the cloud server." msgstr "" #. type: Title === -#: mobile-manual.txt:266 -#, no-wrap -msgid "Working offline" -msgstr "" - -#. type: Plain text -#: mobile-manual.txt:273 -msgid "" -"Sometimes one wishes to use the app when an Internet connection is not " -"available, for instance at remote dive sites. In such a case _Subsurface-" -"mobile_ may unnecesarily search for an Internet connection, causing long " -"delays in executing some functions. In the dive management menu, one can " -"turn the Internet access on or off by tapping the _Offline mode_ or _Enable " -"auto cloud sync_ options." -msgstr "" - -#. type: Title === -#: mobile-manual.txt:274 +#: mobile-manual.txt:279 #, no-wrap msgid "Changing the login credentials on the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:280 +#: mobile-manual.txt:285 msgid "" -"It may be necessary to change one's login credentials, for instance if one's " -"email address (initially used as a credential) has changed. To change the " -"credentials, open the main menu and tap _Cloud credentials_. This opens the " -"setup screen for specifying new credentials." +"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." msgstr "" #. type: Title == -#: mobile-manual.txt:282 +#: mobile-manual.txt:287 #, no-wrap -msgid "Recording dive locations using GPS." +msgid "Recording dive locations using GPS (Android only)." msgstr "" #. type: Plain text -#: mobile-manual.txt:288 +#: mobile-manual.txt:294 msgid "" -"The fact that most smartphones have GPS facilities allows one to record the " -"locations of dives. One can 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:" +"The fact that most smartphones have GPS facilities allows _Subsurface-" +"mobile_ on Android to record the locations of dives. You can 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:" msgstr "" #. type: Title === -#: mobile-manual.txt:289 +#: mobile-manual.txt:295 #, no-wrap msgid "Setting up the GPS" msgstr "" #. type: Plain text -#: mobile-manual.txt:297 +#: mobile-manual.txt:304 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). " -"One can specify that data are collected at regular intervals, e.g. every 10 " +"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 " @@ -633,36 +629,36 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:298 +#: mobile-manual.txt:305 #, no-wrap msgid "mobile-images/gpssetup.jpg" msgstr "mobile-images/gpssetup.jpg" #. type: Title === -#: mobile-manual.txt:300 +#: mobile-manual.txt:307 #, no-wrap msgid "Collecting GPS positions" msgstr "" #. type: Plain text -#: mobile-manual.txt:309 +#: mobile-manual.txt:316 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 the dive one can deactivate the collection of GPS data by de-" -"activating the same check box at the bottom of the main menu." +"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:310 +#: mobile-manual.txt:317 #, no-wrap msgid "Storing the GPS data on the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:317 +#: mobile-manual.txt:324 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_ " @@ -673,31 +669,31 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:318 +#: mobile-manual.txt:325 #, no-wrap msgid "Downloading GPS data from the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:322 +#: mobile-manual.txt:330 msgid "" -"Download the GPS data that have been saved on the cloud by selecting " -"_Download GPS Data_ from the GPS subpanel." +"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:323 +#: mobile-manual.txt:331 #, no-wrap msgid "Viewing GPS data" msgstr "" #. type: Plain text -#: mobile-manual.txt:334 +#: mobile-manual.txt:342 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 one taps the handle (the three horisontal stripes on the right, see image " +"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 " @@ -707,22 +703,22 @@ msgid "" msgstr "" #. type: Target for macro image -#: mobile-manual.txt:335 +#: mobile-manual.txt:343 #, no-wrap msgid "mobile-images/gpsmanagement.jpg" msgstr "mobile-images/gpsmanagement.jpg" #. type: Title === -#: mobile-manual.txt:337 +#: mobile-manual.txt:345 #, no-wrap msgid "Applying GPS data to dives in the dive log" msgstr "" #. type: Plain text -#: mobile-manual.txt:345 +#: mobile-manual.txt:353 msgid "" "Assuming that all the dives have been entered into the dive log or have been " -"downloaded from the _Subsurface_ cloud, one can apply the GPS positions to " +"downloaded from the _Subsurface_ cloud, you can apply the GPS positions to " "these dives. GPS positions can therefore only be applied to dives in the " "dive list. From the GPS subpanel, tap _GPS-tag dives_. The dive list " "contains the start and end times of each dive. Now, _Subsurface-mobile_ " @@ -730,3 +726,10 @@ msgid "" "dive. This results in a GPS position for each dive that is saved as part of " "the dive log." msgstr "" + +#~ msgid "" +#~ "Because of the restrictions of iOS, _Subsurface-mobile_ for iOS does not " +#~ "have all the features of the same app for Android." +#~ msgstr "" +#~ "À cause des limitations d'iOS, _Subsurface-mobile_ pour iOS n'inclut pas " +#~ "toutes les fonctionnalités présentes dans la version Android." diff --git a/Documentation/fr/po/subsurface-user-manual.fr.po b/Documentation/fr/po/subsurface-user-manual.fr.po index 25bbc1a0f..972bbea38 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: 2016-07-21 10:32+0200\n" -"PO-Revision-Date: 2016-07-21 10:57+0200\n" +"POT-Creation-Date: 2016-10-11 10:50+0200\n" +"PO-Revision-Date: 2016-10-11 10:53+0200\n" "Last-Translator: Guillaume GARDET \n" "Language-Team: French \n" "Language: fr\n" @@ -734,7 +734,7 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:299 user-manual.txt:661 user-manual.txt:3148 +#: user-manual.txt:299 user-manual.txt:661 user-manual.txt:3152 #, no-wrap msgid "images/icons/warning2.png" msgstr "images/icons/warning2.png" @@ -1039,7 +1039,7 @@ msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:475 user-manual.txt:3700 +#: user-manual.txt:475 user-manual.txt:3714 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "images/icons/bluetooth.jpg" @@ -1170,7 +1170,7 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:552 user-manual.txt:3627 user-manual.txt:3715 +#: user-manual.txt:552 user-manual.txt:3641 user-manual.txt:3729 #, no-wrap msgid "On Windows:" msgstr "Sur Windows :" @@ -4346,35 +4346,35 @@ msgstr "images/ShowCylinders_f20.jpg" #. type: Named 'icon' AttributeList argument for style 'icon' #: user-manual.txt:2214 #, no-wrap -msgid "images/icons/tissues.jpg" -msgstr "images/icons/tissues.jpg" +msgid "images/icons/heatmap.png" +msgstr "images/icons/heatmap.png" #. type: Plain text -#: user-manual.txt:2227 +#: user-manual.txt:2231 msgid "" -"Display inert gas tissue pressures relative to ambient inert gas pressure " -"(horizontal grey line). Tissue pressures are calculated using the Bühlmann " -"ZH-L16 algorithm and are displayed as lines ranging from green (faster " -"tissues) to blue (slower tissues). The black line, graphed above the " -"ambient pressure, is the maximum allowable tissue supersaturation (pressure " -"limit) derived from the gradient factors specified in the *Preferences*. For " -"divers doing planned decompression diving, efficient rates of offgassing are " -"obtained with tissue pressures between the ambient inert gas pressure (grey " -"line) and the pressure limit (black line). This display is a representation " -"of the tissue pressures during the whole dive. In contrast, the xref:" -"S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box* on the " -"*Dive Profile* is an instantaneous reflection of tissue pressures at the " -"moment in time, at the position of the cursor on the dive profile." +"Display that tissue heat-map. This is a representation of the inert gas " +"pressures in the different tissues of a decompression model. Faster tissues " +"are displayed on top while the slower tissues are shown on the bottom. The " +"color is a representation of the inert gas loading of the tissue. Blue " +"colors indicate the tissue's inert gas pressure is below the ambient " +"pressure and the tissue is currently on-gasing. The more red the color is, " +"the higher the pressure is above the ambient pressure and the tissue is off-" +"gassing potentially releasing inert gases to the environment which can be " +"the cause for the formation of inert gas bubbles. This display is a " +"representation of the tissue pressures during the whole dive. In contrast, " +"the xref:S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box* " +"on the *Dive Profile* is an instantaneous reflection of tissue pressures at " +"the moment in time, at the position of the cursor on the dive profile." msgstr "" #. type: Target for macro image -#: user-manual.txt:2228 +#: user-manual.txt:2232 #, no-wrap -msgid "images/tissuesGraph.jpg" -msgstr "images/tissuesGraph.jpg" +msgid "images/tissueHeatmap.jpg" +msgstr "images/tissueHeatmap.jpg" #. type: Plain text -#: user-manual.txt:2236 +#: user-manual.txt:2240 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on " @@ -4387,25 +4387,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2238 +#: user-manual.txt:2242 #, 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" #. type: Plain text -#: user-manual.txt:2240 +#: user-manual.txt:2244 #, 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" #. type: Title === -#: user-manual.txt:2242 +#: user-manual.txt:2246 #, no-wrap msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2261 +#: user-manual.txt:2265 msgid "" "The context menu for the Dive Profile is accessed by right-clicking while " "the mouse cursor is over the Dive Profile panel. The menu lets you create " @@ -4426,13 +4426,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2263 +#: user-manual.txt:2267 #, no-wrap msgid "The *Information Box*" msgstr "" #. type: Plain text -#: user-manual.txt:2272 +#: user-manual.txt:2276 msgid "" "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 " @@ -4445,13 +4445,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2273 +#: user-manual.txt:2277 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "images/InfoBox2.jpg" #. type: Plain text -#: user-manual.txt:2290 +#: user-manual.txt:2294 msgid "" "When the mouse points inside the *Dive Profile* panel, the information box " "expands and shows many data items. In this situation, the data reflect the " @@ -4471,20 +4471,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2293 +#: user-manual.txt:2297 msgid "" "The user has control over the display of some statistics, shown as four " "buttons on the left of the profile panel. These are:" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2294 +#: user-manual.txt:2298 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "images/icons/MOD.jpg" #. type: Plain text -#: user-manual.txt:2303 +#: user-manual.txt:2307 msgid "" "Clicking this button causes the Information Box to display the *Maximum " "Operating Depth (MOD)* of the dive, given the gas mixture used. MOD is " @@ -4496,13 +4496,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2304 +#: user-manual.txt:2308 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "images/icons/NDL.jpg" #. type: Plain text -#: user-manual.txt:2316 +#: user-manual.txt:2320 msgid "" "Clicking this button causes the Information Box to display either the *No-" "deco Limit (NDL)* or the *Total Time to Surface (TTS)*. NDL is the time " @@ -4519,13 +4519,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2317 +#: user-manual.txt:2321 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "images/icons/SAC.jpg" #. type: Plain text -#: user-manual.txt:2326 +#: user-manual.txt:2330 msgid "" "Clicking this button causes the Information Box to display the *Surface Air " "Consumption (SAC)*. SAC is an indication of the surface-normalized " @@ -4538,13 +4538,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2327 +#: user-manual.txt:2331 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "images/icons/EAD.jpg" #. type: Plain text -#: user-manual.txt:2342 +#: user-manual.txt:2346 msgid "" "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox " "dives as well as the *Equivalent Narcotic Depth (END)* for trimix dives. " @@ -4560,20 +4560,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2344 +#: user-manual.txt:2348 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." msgstr "" #. type: Title ==== -#: user-manual.txt:2346 +#: user-manual.txt:2350 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "" #. type: Plain text -#: user-manual.txt:2353 +#: user-manual.txt:2357 msgid "" "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 " @@ -4584,13 +4584,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2354 +#: user-manual.txt:2358 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "images/GasPressureBarGraph.jpg" #. type: Plain text -#: user-manual.txt:2360 +#: user-manual.txt:2364 msgid "" "The light green area indicates the total gas, with the top margin of the " "light green area showing the total gas pressure inhaled by the diver and " @@ -4600,7 +4600,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2366 +#: user-manual.txt:2370 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the inert gases inhaled by the diver, usually " @@ -4611,7 +4611,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2370 +#: user-manual.txt:2374 msgid "" "The dark green area at the bottom of the graph represents the pressures of " "inert gas in each of the 16 tissue compartments, following the Bühlmann " @@ -4619,7 +4619,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2375 +#: user-manual.txt:2379 msgid "" "The top black horizontal line indicates the gradient factor that applies to " "the depth of the diver at the particular point on the *Dive Profile*. The " @@ -4628,7 +4628,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2379 +#: user-manual.txt:2383 msgid "" "The bottom margin of the red area in the graph indicates the Bühlman-derived " "M-value. That is the pressure value of inert gases at which bubble formation " @@ -4636,7 +4636,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2382 +#: user-manual.txt:2386 msgid "" "These five values are shown on the left in the graph above. The way the Gas " "Pressure Bar Graph changes during a dive can be seen on the right hand side " @@ -4644,7 +4644,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2385 +#: user-manual.txt:2389 msgid "" "Graph *A* indicates the start of a dive with the diver at the surface. The " "pressures in all the tissue compartments are still at the equilibrium " @@ -4652,7 +4652,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2388 +#: user-manual.txt:2392 msgid "" "Graph *B* indicates the situation after a descent to 30 meters. Few of the " "tissue compartments have had time to respond to the descent, so their gas " @@ -4660,7 +4660,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2393 +#: user-manual.txt:2397 msgid "" "Graph *C* represents the pressures after 30 minutes at 30 m. The fast " "compartments have attained equilibrium (i.e. they have reached the hight of " @@ -4670,7 +4670,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2399 +#: user-manual.txt:2403 msgid "" "Graph *D* shows the pressures after ascent to a depth of 4.5 meters. Since " "during ascent the total inhaled gas pressure has decreased strongly from 4 " @@ -4681,7 +4681,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2404 +#: user-manual.txt:2408 msgid "" "Graph *E* indicates the situation after remaining at 4.5 meters for 10 " "minutes. The fast compartments have decreased in pressure. As expected, the " @@ -4691,19 +4691,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2407 +#: user-manual.txt:2411 #, no-wrap msgid "Organizing the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: user-manual.txt:2409 +#: user-manual.txt:2413 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2413 +#: user-manual.txt:2417 msgid "" "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 " @@ -4712,30 +4712,30 @@ msgstr "" #. TODO: NEEDS REPLACEMENT #. type: Target for macro image -#: user-manual.txt:2415 +#: user-manual.txt:2419 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "images/ContextMenu.jpg" #. type: Plain text -#: user-manual.txt:2418 +#: user-manual.txt:2422 msgid "The context menu is used in many functions described below." msgstr "" #. type: Title ==== -#: user-manual.txt:2419 +#: user-manual.txt:2423 #, no-wrap msgid "Customizing the columns showed in the *Dive List* panel" msgstr "" #. type: Target for macro image -#: user-manual.txt:2421 +#: user-manual.txt:2425 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "images/DiveListOptions.jpg" #. type: Plain text -#: user-manual.txt:2429 +#: user-manual.txt:2433 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " @@ -4749,13 +4749,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2431 +#: user-manual.txt:2435 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: user-manual.txt:2443 +#: user-manual.txt:2447 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (higher sequence numbers). Numbering of " @@ -4769,7 +4769,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2448 +#: user-manual.txt:2452 msgid "" "You can also renumber a few selected dives in the dive list. Select the " "dives that need renumbering. Right-click on the selected list and use the " @@ -4778,13 +4778,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2450 +#: user-manual.txt:2454 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: user-manual.txt:2458 +#: user-manual.txt:2462 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/" @@ -4795,13 +4795,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2459 +#: user-manual.txt:2463 #, no-wrap msgid "images/Group2.jpg" msgstr "images/Group2.jpg" #. type: Plain text -#: user-manual.txt:2465 +#: user-manual.txt:2469 msgid "" "Grouping into trips allows a rapid way of accessing individual dives without " "having to scan a long lists of dives. To group the dives in a dive list, " @@ -4810,13 +4810,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2466 +#: user-manual.txt:2470 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2479 +#: user-manual.txt:2483 msgid "" "Normally, in the dive list, minimal information is included in the trip " "title. More information about a trip can be added by selecting its trip " @@ -4830,13 +4830,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2480 +#: user-manual.txt:2484 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2485 +#: user-manual.txt:2489 msgid "" "Once the dives have been grouped into trips, you can expand one or more " "trips by clicking the arrow-head on the left of each trip title. This " @@ -4844,13 +4844,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2486 +#: user-manual.txt:2490 #, no-wrap msgid "Collapsing or expanding dive information for different trips" msgstr "" #. type: Plain text -#: user-manual.txt:2491 +#: user-manual.txt:2495 msgid "" "After selecting a particular trip in the dive list, the context menu allows " "several options to expand or collapse dives within trips. This includes " @@ -4858,13 +4858,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2492 +#: user-manual.txt:2496 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "" #. type: Plain text -#: user-manual.txt:2497 +#: user-manual.txt:2501 msgid "" "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 " @@ -4872,13 +4872,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2498 +#: user-manual.txt:2502 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "" #. type: Plain text -#: user-manual.txt:2507 +#: user-manual.txt:2511 msgid "" "If a trip includes ten dives, you can split this trip into two trips (trip " "1: top 4 dives; trip 2: bottom 6 dives) by selecting and right-clicking the " @@ -4889,25 +4889,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2508 +#: user-manual.txt:2512 #, no-wrap msgid "images/SplitDive3a.jpg" msgstr "images/SplitDive3a.jpg" #. type: Title === -#: user-manual.txt:2510 +#: user-manual.txt:2514 #, no-wrap msgid "Manipulating single dives" msgstr "" #. type: Title ==== -#: user-manual.txt:2512 +#: user-manual.txt:2516 #, no-wrap msgid "Delete a dive from the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2519 +#: user-manual.txt:2523 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)*. " @@ -4916,13 +4916,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2520 +#: user-manual.txt:2524 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: user-manual.txt:2527 +#: user-manual.txt:2531 msgid "" "You can unlink dives from the trip to which they belong. To do this, select " "and right-click the relevant dives to bring up the context menu. Then select " @@ -4932,13 +4932,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2528 +#: user-manual.txt:2532 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: user-manual.txt:2533 +#: user-manual.txt:2537 msgid "" "Selected dives can be moved from the trip to which they belong and placed " "within a separate trip. To do this, select and right-click the dive(s) to " @@ -4946,13 +4946,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2534 +#: user-manual.txt:2538 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2544 +#: user-manual.txt:2548 msgid "" "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 " @@ -4964,13 +4964,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2545 +#: user-manual.txt:2549 #, no-wrap msgid "Merge dives into a single dive" msgstr "" #. type: Plain text -#: user-manual.txt:2555 +#: user-manual.txt:2559 msgid "" "Sometimes a dive is briefly interrupted, for example, if a diver returns to " "the surface for a few minutes. That results in two or more dives being " @@ -4984,19 +4984,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2556 +#: user-manual.txt:2560 #, no-wrap msgid "images/MergedDive.png" msgstr "images/MergedDive.png" #. type: Title ==== -#: user-manual.txt:2558 +#: user-manual.txt:2562 #, no-wrap msgid "Undo dive manipulations" msgstr "" #. type: Plain text -#: user-manual.txt:2564 +#: user-manual.txt:2568 msgid "" "Important actions on dives or trips, described above, can be undone or " "redone. This includes: _delete dives_, _merge dives_, _renumber dives_ and " @@ -5006,13 +5006,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2567 +#: user-manual.txt:2571 #, no-wrap msgid "Filtering the dive list" msgstr "" #. type: Plain text -#: user-manual.txt:2573 +#: user-manual.txt:2577 msgid "" "The dives in the *Dive List* panel can be filtered, so you can select only " "some of the dives based on their attributes, e.g. dive tags, dive site, dive " @@ -5022,7 +5022,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2581 +#: user-manual.txt:2585 msgid "" "To open the filter, select _Log -> Filter divelist_ from the main menu. This " "opens the _Filter Panel_ at the top of the _Subsurface_ window. Three icons " @@ -5036,13 +5036,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2582 +#: user-manual.txt:2586 #, no-wrap msgid "images/Filterpanel.jpg" msgstr "images/Filterpanel.jpg" #. type: Plain text -#: user-manual.txt:2591 +#: user-manual.txt:2595 msgid "" "Four filter criteria may be used to filter the dive list: dive tags, person " "(buddy / divemaster), dive site and dive suit. Each of these is represented " @@ -5055,7 +5055,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2599 +#: user-manual.txt:2603 msgid "" "To activate filtering of the dive list, check at least one check box in one " "of the four check lists. The dive list is then shortened to include only the " @@ -5067,23 +5067,23 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2601 +#: user-manual.txt:2605 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2604 +#: user-manual.txt:2608 msgid "There are two ways to export dive information from Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:2606 +#: user-manual.txt:2610 msgid "Export dive information to _Facebook_" msgstr "Exporter les informations de plongée vers _Facebook_" #. type: Plain text -#: user-manual.txt:2608 +#: user-manual.txt:2612 msgid "" "xref:S_Export_other[Export dive information to other destinations or formats]" msgstr "" @@ -5091,13 +5091,13 @@ msgstr "" "destinations ou formats]" #. type: Title === -#: user-manual.txt:2610 +#: user-manual.txt:2614 #, no-wrap msgid "Exporting dive information to _Facebook_" msgstr "Export des informations de plongée vers _Facebook_" #. type: Plain text -#: user-manual.txt:2619 +#: user-manual.txt:2623 msgid "" "Export of dives to _Facebook_ is handled differently from other types of " "export because a connection to _Facebook_ is required, needing a _Facebook_ " @@ -5117,13 +5117,13 @@ msgstr "" "pour fermer la connexion _Facebook_." #. type: Target for macro image -#: user-manual.txt:2620 +#: user-manual.txt:2624 #, no-wrap msgid "images/facebook1_f20.jpg" msgstr "images/facebook1_f20.jpg" #. type: Plain text -#: user-manual.txt:2625 +#: user-manual.txt:2629 msgid "" "From the _Subsurface_ window it’s easy to determine whether _Subsurface_ has " "a valid connection to _Facebook_ From the *Main Menu*, select _Share on -> " @@ -5133,7 +5133,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2636 +#: user-manual.txt:2640 msgid "" "Having established a login to _Facebook_, transferring a dive profileto a " "_Facebook_ timeline is easy. Be sure the dive to be transferred to the " @@ -5168,7 +5168,7 @@ msgstr "" "moment, une fenêtre apparait indiquant le succès du transfert." #. type: Plain text -#: user-manual.txt:2641 +#: user-manual.txt:2645 msgid "" "Both the album created and the post to your timeline will be marked as " "private. In order for friends to be able to see it, change its permissions " @@ -5180,13 +5180,13 @@ msgstr "" "ou l'application Facebook." #. type: Target for macro image -#: user-manual.txt:2642 +#: user-manual.txt:2646 #, no-wrap msgid "images/facebook2_f20.jpg" msgstr "images/facebook2_f20.jpg" #. type: Plain text -#: user-manual.txt:2646 +#: user-manual.txt:2650 msgid "" "If required, then close the _Facebook_ connection by either closing " "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main " @@ -5198,13 +5198,13 @@ msgstr "" "préférences Facebook." #. type: Title === -#: user-manual.txt:2648 +#: user-manual.txt:2652 #, no-wrap msgid "Export dive information to other destinations or formats" msgstr "Exporter des informations de plongée vers d'autres destinations ou formats" #. type: Plain text -#: user-manual.txt:2653 +#: user-manual.txt:2657 msgid "" "For non-_Facebook exports_, the export function can be found by selecting " "_File -> Export_, which brings up the Export dialog. This dialog always " @@ -5214,24 +5214,24 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2654 +#: user-manual.txt:2658 #, no-wrap msgid "images/Export_f20.jpg" msgstr "images/Export_f20.jpg" #. type: Plain text -#: user-manual.txt:2657 +#: user-manual.txt:2661 msgid "A dive log or part of it can be saved in three formats:" msgstr "" #. type: Plain text -#: user-manual.txt:2659 +#: user-manual.txt:2663 msgid "" "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:2663 +#: user-manual.txt:2667 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -5239,7 +5239,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2667 +#: user-manual.txt:2671 msgid "" "_Divelogs.de_, an Internet-based dive log repository. In order to upload to " "_Divelogs.de_, you need a user-ID as well as a password for _Divelogs.de_. " @@ -5248,7 +5248,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2671 +#: user-manual.txt:2675 msgid "" "_DiveShare_ is also a dive log repository on the Internet focusing on " "recreational dives. To upload dives, you need a user ID, so registration " @@ -5256,7 +5256,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2676 +#: user-manual.txt:2680 msgid "" "_CSV dive details_, that includes the most critical information of the dive " "profile. Included information of a dive is: dive number, date, time, buddy, " @@ -5265,7 +5265,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2679 +#: user-manual.txt:2683 msgid "" "_CSV dive profile_, that includes a large amount of detail for each dive, " "including the depth profile, temperature and pressure information of each " @@ -5273,7 +5273,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2692 +#: user-manual.txt:2696 msgid "" "_HTML_ format, in which the dive(s) are stored in HTML files, readable with " "an Internet browser. Most modern web browsers are supported, but JavaScript " @@ -5290,7 +5290,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2697 +#: user-manual.txt:2701 msgid "" "_Worldmap_ format, an HTML file with a world map upon which each dive and " "some information about it are indicated. This map is not editable. If you " @@ -5299,13 +5299,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2698 +#: user-manual.txt:2702 #, no-wrap msgid "images/mapview_f20.jpg" msgstr "images/mapview_f20.jpg" #. type: Plain text -#: user-manual.txt:2705 +#: user-manual.txt:2709 msgid "" "_Image depths_, which creates a text file that contains the file names of " "all photos or images attached to any of the selected dives in the _Dive " @@ -5314,12 +5314,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2707 +#: user-manual.txt:2711 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: user-manual.txt:2715 +#: user-manual.txt:2719 #, no-wrap msgid "" "** Subsurface Numbers: if this option is checked, the dive(s) are exported with the\n" @@ -5332,27 +5332,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2718 +#: user-manual.txt:2722 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: user-manual.txt:2721 +#: user-manual.txt:2725 msgid "" "Export to other formats can be done through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: user-manual.txt:2723 +#: user-manual.txt:2727 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: user-manual.txt:2733 +#: user-manual.txt:2737 msgid "" "For each diver, dive log information is highly important. Not only is it a " "record of diving activities for one's own pleasure, but it’s important " @@ -5366,7 +5366,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2739 +#: user-manual.txt:2743 msgid "" "_Subsurface_ includes access to a transparently integrated cloud storage " "back end that is available to all Subsurface users. Storing and retrieving a " @@ -5376,13 +5376,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2740 +#: user-manual.txt:2744 #, no-wrap msgid "Create a cloud storage account" msgstr "" #. type: Plain text -#: user-manual.txt:2757 +#: user-manual.txt:2761 #, no-wrap msgid "" "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> _Network_.\n" @@ -5403,13 +5403,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2758 +#: user-manual.txt:2762 #, no-wrap msgid "Using _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2768 +#: user-manual.txt:2772 #, no-wrap msgid "" "** Once the cloud storage has been initialized, two new items appear in the\n" @@ -5423,7 +5423,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2773 +#: user-manual.txt:2777 #, no-wrap msgid "" "** _Subsurface_ keeps a local copy of the data and the cloud facility remains fully\n" @@ -5433,13 +5433,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2775 +#: user-manual.txt:2779 #, no-wrap msgid "Web access to _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2785 +#: user-manual.txt:2789 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://" @@ -5452,13 +5452,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2786 +#: user-manual.txt:2790 #, no-wrap msgid "Other cloud services" msgstr "" #. type: Plain text -#: user-manual.txt:2796 +#: user-manual.txt:2800 msgid "" "If you prefers not to use the integrated cloud storage of dive logs (and " "don't need the web access), it’s simple to store dive logs in the cloud " @@ -5469,13 +5469,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2797 +#: user-manual.txt:2801 #, no-wrap msgid "images/Cloud.jpg" msgstr "images/Cloud.jpg" #. type: Plain text -#: user-manual.txt:2806 +#: user-manual.txt:2810 msgid "" "The _Dropbox_ program creates a copy of the _Dropbox_ Internet Cloud content " "on your desktop computer. When the computer is connected to the Internet, " @@ -5488,7 +5488,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2813 +#: user-manual.txt:2817 msgid "" "In this way a dive log in your _Dropbox_ folder can be accessed seamlessly " "from the Internet and can be accessed anywhere with Internet access. " @@ -5498,7 +5498,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2819 +#: user-manual.txt:2823 msgid "" "Alternatively you can use _Dropbox_ as a way back up your dive log. To Store " "a dive log on _Dropbox_, select _File -> Save as_ from the _Subsurface_ main " @@ -5509,20 +5509,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2822 +#: user-manual.txt:2826 msgid "" "Several paid services exist on the Internet (e.g. Google, Amazon) where the " "same process could be used for the Cloud-based storage of dive logs." msgstr "" #. type: Title == -#: user-manual.txt:2825 +#: user-manual.txt:2829 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2829 +#: user-manual.txt:2833 #, no-wrap msgid "" "_Subsurface_ provides a simple and flexible way to print a whole dive log or only a few selected dives.\n" @@ -5530,19 +5530,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2831 +#: user-manual.txt:2835 msgid "Some decisions need to be made before printing:" msgstr "" #. type: Plain text -#: user-manual.txt:2834 +#: user-manual.txt:2838 msgid "" "Should the whole dive log be printed or only part of it? If only part is " "required, select the required dives from the *Dive List* panel." msgstr "" #. type: Plain text -#: user-manual.txt:2836 +#: user-manual.txt:2840 msgid "" "If the dive profiles are printed, what gas partial pressure information " "should be shown? Select the appropriate toggle-buttons on the button bar to " @@ -5550,7 +5550,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2839 +#: user-manual.txt:2843 msgid "" "If _File -> Print_ is selected from the Main menu, the dialogue below (image " "*A*) appears. Three specifications are needed to get the desired information " @@ -5558,35 +5558,35 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2840 user-manual.txt:4284 +#: user-manual.txt:2844 user-manual.txt:4298 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "images/Print1_f22.jpg" #. type: Plain text -#: user-manual.txt:2843 +#: user-manual.txt:2847 msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: user-manual.txt:2845 +#: user-manual.txt:2849 msgid "" "_Dive list print_: Print dives from the *Dive List* panel with profiles and " "other information." msgstr "" #. type: Plain text -#: user-manual.txt:2846 +#: user-manual.txt:2850 msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: user-manual.txt:2848 +#: user-manual.txt:2852 msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: user-manual.txt:2853 +#: user-manual.txt:2857 msgid "" "Printing only the dives selected from the dive list before activating the " "print dialogue by checking the box _Print only selected dives_. If this " @@ -5594,73 +5594,73 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2855 +#: user-manual.txt:2859 msgid "" "Printing in color, done by checking the box with _Print in color. If this " "check box is not checked, printing is in black and white." msgstr "" #. type: Plain text -#: user-manual.txt:2858 +#: user-manual.txt:2862 msgid "" "Under _Template_ select a template to be used as the page layout. There are " "several choices. (see image *B*, above)." msgstr "" #. type: Plain text -#: user-manual.txt:2860 +#: user-manual.txt:2864 msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:2861 +#: user-manual.txt:2865 #, no-wrap msgid "images/Print_summarylist_f22.jpg" msgstr "images/Print_summarylist_f22.jpg" #. type: Plain text -#: user-manual.txt:2864 +#: user-manual.txt:2868 msgid "" "_Flow layout_: Print the text associated with each dive without printing the " "dive profiles" msgstr "" #. type: Plain text -#: user-manual.txt:2865 +#: user-manual.txt:2869 msgid "of each dive (see below):" msgstr "" #. type: Target for macro image -#: user-manual.txt:2866 +#: user-manual.txt:2870 #, no-wrap msgid "images/Print_flow_layout_f22.jpg" msgstr "images/Print_flow_layout_f22.jpg" #. type: Plain text -#: user-manual.txt:2869 +#: user-manual.txt:2873 msgid "" "_One Dive_: Print one dive per page, also showing the dive profile (see " "below)" msgstr "" #. type: Target for macro image -#: user-manual.txt:2870 +#: user-manual.txt:2874 #, no-wrap msgid "images/print2_f22.jpg" msgstr "images/print2_f22.jpg" #. type: Plain text -#: user-manual.txt:2874 +#: user-manual.txt:2878 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2875 +#: user-manual.txt:2879 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2879 +#: user-manual.txt:2883 msgid "" "You can _Preview_ the printed page by selecting the _Preview_ button on the " "dialogue (see image *A* at the start of this section). After preview, you " @@ -5669,7 +5669,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2883 +#: user-manual.txt:2887 msgid "" "Next, select the _Print_ button (see image *A* at the start of this " "section). This activates the regular print dialogue used by the operating " @@ -5678,13 +5678,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2884 +#: user-manual.txt:2888 #, no-wrap msgid "images/Print_print_f22.jpg" msgstr "images/Print_print_f22.jpg" #. type: Plain text -#: user-manual.txt:2889 +#: user-manual.txt:2893 msgid "" "Set the print resolution of the printer to an appropriate value by changing " "the printer _Properties_. Finally, select the _Print_ button to print the " @@ -5693,19 +5693,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2890 +#: user-manual.txt:2894 #, no-wrap msgid "images/Printpreview.jpg" msgstr "images/Printpreview.jpg" #. type: Title === -#: user-manual.txt:2892 +#: user-manual.txt:2896 #, no-wrap msgid "Writing a custom print template (advanced)" msgstr "Créer un modèle d'impression personnalisé (avancé)" #. type: Plain text -#: user-manual.txt:2898 +#: user-manual.txt:2902 msgid "" "Writing a custom template is an effective way to produce highly customized " "printouts. Subsurface uses HTML templates to render printing. You can create " @@ -5716,13 +5716,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2900 +#: user-manual.txt:2904 #, no-wrap msgid "Configuring a dive computer" msgstr "Configurer un ordinateur de plongée" #. type: Plain text -#: user-manual.txt:2909 +#: user-manual.txt:2913 msgid "" "_Subsurface_ lets you configure a dive computer. Currently the Heinrichs-" "Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, Vyper, " @@ -5747,7 +5747,7 @@ msgstr "" "ANNEXE A>> pour plus d'informations sur la manière de procéder." #. type: Plain text -#: user-manual.txt:2914 +#: user-manual.txt:2918 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Provide the " @@ -5762,13 +5762,13 @@ msgstr "" "plongée à partir du panneau à gauche (voir l'image ci-dessous)." #. type: Target for macro image -#: user-manual.txt:2915 +#: user-manual.txt:2919 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "images/Configure_dc_f20.jpg" #. type: Plain text -#: user-manual.txt:2918 +#: user-manual.txt:2922 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be done:" @@ -5777,7 +5777,7 @@ msgstr "" "suivantes peuvent être effectuées :" #. type: Plain text -#: user-manual.txt:2921 +#: user-manual.txt:2925 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the dive computer\n" @@ -5787,7 +5787,7 @@ msgstr "" "dans _Subsurface_, en l'affichant dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2923 +#: user-manual.txt:2927 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -5797,7 +5797,7 @@ msgstr "" "de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2925 +#: user-manual.txt:2929 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n" @@ -5807,7 +5807,7 @@ msgstr "" "l'emplacement et le nom du fichier pour enregistrer les informations.\n" #. type: Plain text -#: user-manual.txt:2927 +#: user-manual.txt:2931 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays it\n" @@ -5817,7 +5817,7 @@ msgstr "" "dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2929 +#: user-manual.txt:2933 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this is\n" @@ -5827,13 +5827,13 @@ msgstr "" "il sera chargé dans l'ordinateur de plongée.\n" #. type: Title == -#: user-manual.txt:2932 +#: user-manual.txt:2936 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:2941 +#: user-manual.txt:2945 msgid "" "There are several user-definable settings within _Subsurface_, found by " "selecting _File -> Preferences_. The settings are in seven groups: " @@ -5846,24 +5846,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2942 +#: user-manual.txt:2946 #, no-wrap msgid "Defaults" msgstr "" #. type: Plain text -#: user-manual.txt:2945 +#: user-manual.txt:2949 msgid "There are several settings in the *Defaults* panel:" msgstr "" #. type: Target for macro image -#: user-manual.txt:2946 +#: user-manual.txt:2950 #, no-wrap msgid "images/Pref1_f20.jpg" msgstr "images/Pref1_f20.jpg" #. type: Plain text -#: user-manual.txt:2950 +#: user-manual.txt:2954 #, no-wrap msgid "" " ** *Lists and tables*: Here you can specify the font type and font size of the\n" @@ -5871,7 +5871,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2955 +#: user-manual.txt:2959 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive File_ you need to specify the directory and\n" @@ -5881,13 +5881,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2956 +#: user-manual.txt:2960 #, no-wrap msgid "_No default file_: When checked, _Subsurface_ does not automatically load a dive log at startup.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2958 +#: user-manual.txt:2962 #, no-wrap msgid "" "_Local default file_: When checked, _Subsurface_ automatically loads a dive log from the local hard disk\n" @@ -5895,7 +5895,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2960 +#: user-manual.txt:2964 #, no-wrap msgid "" "_Cloud storage default file_: When checked, _Subsurface automatically loads the dive log from the cloud\n" @@ -5903,13 +5903,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2962 +#: user-manual.txt:2966 #, no-wrap msgid "** *Display invalid*: Dives can be marked as invalid (when a user wishes to hide\n" msgstr "" #. type: Plain text -#: user-manual.txt:2965 +#: user-manual.txt:2969 #, no-wrap msgid "" "dives that he/she doesn't consider valid dives, e.g. pool dives, but still want to\n" @@ -5918,25 +5918,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2967 +#: user-manual.txt:2971 #, no-wrap msgid "** *Default cylinder*: Specify the default cylinder listed in\n" msgstr "" #. type: Plain text -#: user-manual.txt:2968 +#: user-manual.txt:2972 #, no-wrap msgid "the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2970 +#: user-manual.txt:2974 #, no-wrap msgid "** *Animations*: Some actions in showing the dive profile are performed using\n" msgstr "" #. type: Plain text -#: user-manual.txt:2976 +#: user-manual.txt:2980 #, no-wrap msgid "" "animations. For instance, the axis values for depth and time change from dive to\n" @@ -5948,31 +5948,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2978 +#: user-manual.txt:2982 #, no-wrap msgid "** *Clear all settings*: As indicated in the button below this heading, all settings are\n" msgstr "" #. type: Plain text -#: user-manual.txt:2979 +#: user-manual.txt:2983 #, no-wrap msgid "cleared and set to default values.\n" msgstr "" #. type: Title === -#: user-manual.txt:2980 +#: user-manual.txt:2984 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: user-manual.txt:2981 +#: user-manual.txt:2985 #, no-wrap msgid "images/Pref2_f20.jpg" msgstr "images/Pref2_f20.jpg" #. type: Plain text -#: user-manual.txt:2988 +#: user-manual.txt:2992 msgid "" "Here you can choose between metric and imperial units of depth, pressure, " "volume, temperature and mass. By selecting the Metric or Imperial radio " @@ -5983,7 +5983,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2994 +#: user-manual.txt:2998 msgid "" "Regardless of the above settings, dive time measurements can be either in " "seconds or minutes. Choose the appropriate option. GPS coordinates can be " @@ -5992,24 +5992,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2995 +#: user-manual.txt:2999 #, no-wrap msgid "Graph" msgstr "" #. type: Target for macro image -#: user-manual.txt:2997 +#: user-manual.txt:3001 #, no-wrap msgid "images/Pref3_f20.jpg" msgstr "images/Pref3_f20.jpg" #. type: Plain text -#: user-manual.txt:3001 +#: user-manual.txt:3005 msgid "This panel allows two type of selections:" msgstr "" #. type: Plain text -#: user-manual.txt:3023 +#: user-manual.txt:3027 #, no-wrap msgid "" "*Show*: Here you can specify the amount of information shown as part of\n" @@ -6036,13 +6036,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3025 +#: user-manual.txt:3029 #, no-wrap msgid "*Misc*:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3038 +#: user-manual.txt:3042 #, no-wrap msgid "" "** Gradient Factors (GFLow and GFHigh):* Set the _gradient factors_ used while diving. GF_Low is\n" @@ -6059,19 +6059,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3040 +#: user-manual.txt:3044 #, 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" #. type: Plain text -#: user-manual.txt:3042 +#: user-manual.txt:3046 #, 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" #. type: Plain text -#: user-manual.txt:3046 +#: user-manual.txt:3050 #, no-wrap msgid "" " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, the pO~2~\n" @@ -6080,7 +6080,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3050 +#: user-manual.txt:3054 #, no-wrap msgid "" " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n" @@ -6089,19 +6089,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3052 +#: user-manual.txt:3056 #, no-wrap msgid "*Configuring dive planning using rebreather equipment:*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3054 +#: user-manual.txt:3058 #, no-wrap msgid "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for a\n" msgstr "" #. type: Plain text -#: user-manual.txt:3057 +#: user-manual.txt:3061 #, no-wrap msgid "" "CCR dive plan. This determines the pO~2~ maintained\n" @@ -6110,13 +6110,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3059 +#: user-manual.txt:3063 #, no-wrap msgid "** _pSCR O~2~ metabolism rate:_ For a semi-closed rebreather (pSCR) system, this is the\n" msgstr "" #. type: Plain text -#: user-manual.txt:3061 +#: user-manual.txt:3065 #, no-wrap msgid "" "volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning\n" @@ -6124,13 +6124,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3063 +#: user-manual.txt:3067 #, no-wrap msgid "** _pSCR ratio:_ For pSCR equipment the dump ratio is the ratio of gas released to the\n" msgstr "" #. type: Plain text -#: user-manual.txt:3065 +#: user-manual.txt:3069 #, no-wrap msgid "" "environment to that of the gas recirculated to the diver. Set this value for a\n" @@ -6138,24 +6138,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3067 +#: user-manual.txt:3071 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: user-manual.txt:3069 +#: user-manual.txt:3073 msgid "Choose a language that _Subsurface_ will use." msgstr "" #. type: Target for macro image -#: user-manual.txt:3070 +#: user-manual.txt:3074 #, no-wrap msgid "images/Pref4_f20.jpg" msgstr "images/Pref4_f20.jpg" #. type: Plain text -#: user-manual.txt:3080 +#: user-manual.txt:3084 msgid "" "A checkbox lets you use the _System Default_ language which in most cases " "will be the correct setting; with this _Subsurface_ simply runs in the same " @@ -6167,13 +6167,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3081 +#: user-manual.txt:3085 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: user-manual.txt:3088 +#: user-manual.txt:3092 msgid "" "This panel facilitates communication between _Subsurface_ and data sources " "on the Internet. This is important, for instance, when _Subsurface_ needs " @@ -6184,18 +6184,18 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3089 +#: user-manual.txt:3093 #, no-wrap msgid "images/Pref5_f20.jpg" msgstr "images/Pref5_f20.jpg" #. type: Plain text -#: user-manual.txt:3092 +#: user-manual.txt:3096 msgid "This dialogue has three sections:" msgstr "" #. type: Plain text -#: user-manual.txt:3100 +#: user-manual.txt:3104 #, no-wrap msgid "" "** _Proxy type_:\n" @@ -6208,7 +6208,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3105 +#: user-manual.txt:3109 #, no-wrap msgid "" "** _Subsurface cloud storage_: To store your dive log in the cloud, a valid email address\n" @@ -6218,31 +6218,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3106 +#: user-manual.txt:3110 #, no-wrap msgid "_Sync to cloud in the background_: This option allows saving of dive information to the cloud storage\n" msgstr "" #. type: Plain text -#: user-manual.txt:3107 +#: user-manual.txt:3111 #, no-wrap msgid "while you do other things within _Subsurface_.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3108 +#: user-manual.txt:3112 #, no-wrap msgid "_Save password locally_: This allows local storage of the cloud storage password. Note that this\n" msgstr "" #. type: Plain text -#: user-manual.txt:3109 +#: user-manual.txt:3113 #, no-wrap msgid "information is saved in raw text form, not encoded in any way.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3113 +#: user-manual.txt:3117 #, no-wrap msgid "" "** _Subsurface web service_: When you subscribe to the <>, a very\n" @@ -6251,13 +6251,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3116 +#: user-manual.txt:3120 #, no-wrap msgid "Facebook Access" msgstr "Accès Facebook" #. type: Plain text -#: user-manual.txt:3119 +#: user-manual.txt:3123 msgid "" "This panel lets you log into a Facebook account in order to transfer " "information from Subsurface to Facebook." @@ -6266,13 +6266,13 @@ msgstr "" "transférer des informations de Subsurface vers Facebook." #. type: Target for macro image -#: user-manual.txt:3120 +#: user-manual.txt:3124 #, no-wrap msgid "images/Pref6_f20.jpg" msgstr "images/Pref6_f20.jpg" #. type: Plain text -#: user-manual.txt:3128 +#: user-manual.txt:3132 msgid "" "If you provide a valid Facebook userID and password, a connection to " "Facebook is created. That connection is closed when one closing down " @@ -6288,13 +6288,13 @@ msgstr "" "vers Facebook] pour plus d'informations." #. type: Title === -#: user-manual.txt:3129 +#: user-manual.txt:3133 #, no-wrap msgid "Georeference" msgstr "" #. type: Plain text -#: user-manual.txt:3137 +#: user-manual.txt:3141 msgid "" "_Subsurface_ provides a geo-lookup service (that is, given the coordinates " "of a dive site) derived from a click on the *Dive Map panel* at the bottom " @@ -6307,19 +6307,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3138 +#: user-manual.txt:3142 #, no-wrap msgid "images/Pref7_f20.jpg" msgstr "images/Pref7_f20.jpg" #. type: Title == -#: user-manual.txt:3141 +#: user-manual.txt:3145 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: user-manual.txt:3146 +#: user-manual.txt:3150 msgid "" "Dive planning is an advanced feature of _Subsurface_, accessed by selecting " "_Log -> Plan Dive_ from the main menu. It allows calculation of nitrogen " @@ -6328,7 +6328,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3154 +#: user-manual.txt:3158 msgid "" "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " "is already familiar with the _Subsurface_ user interface. It is explicitly " @@ -6336,19 +6336,19 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3157 +#: user-manual.txt:3161 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: user-manual.txt:3158 +#: user-manual.txt:3162 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: user-manual.txt:3161 +#: user-manual.txt:3165 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -6356,32 +6356,32 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3162 +#: user-manual.txt:3166 msgid "" "The safety of a dive plan depends heavily on the way in which the planner is " "used." msgstr "" #. type: delimited block * -#: user-manual.txt:3163 +#: user-manual.txt:3167 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: user-manual.txt:3165 +#: user-manual.txt:3169 msgid "" "A user who is not absolutely sure about any of the above requirements should " "not use this feature." msgstr "" #. type: Title === -#: user-manual.txt:3167 +#: user-manual.txt:3171 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: user-manual.txt:3172 +#: user-manual.txt:3176 msgid "" "Like the _Subsurface_ dive log, the planner screen is divided into several " "sections (see image below). The *setup* parameters for a dive are entered " @@ -6390,7 +6390,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3176 +#: user-manual.txt:3180 msgid "" "At the top right hand is a green *design panel* on which the profile of the " "dive can be manipulated directly by dragging and clicking as explained " @@ -6399,7 +6399,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3180 +#: user-manual.txt:3184 msgid "" "At the bottom right is a text panel with a heading of _Dive Plan Details_. " "This is where the details of the dive plan are provided in a way that can " @@ -6408,26 +6408,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3181 +#: user-manual.txt:3185 #, no-wrap msgid "images/PlannerWindow1_f20.jpg" msgstr "images/PlannerWindow1_f20.jpg" #. type: Title === -#: user-manual.txt:3184 +#: user-manual.txt:3188 #, no-wrap msgid "Open circuit dives" msgstr "" #. type: Plain text -#: user-manual.txt:3187 +#: user-manual.txt:3191 msgid "" "Towards the center bottom of the planner (circled in blue in the image " "above) is a dropbox with three options. Select the appropriate one of these:" msgstr "" #. type: Plain text -#: user-manual.txt:3190 +#: user-manual.txt:3194 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -6436,12 +6436,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3192 +#: user-manual.txt:3196 msgid "Choose the Open Circuit option." msgstr "" #. type: Plain text -#: user-manual.txt:3196 +#: user-manual.txt:3200 msgid "" "In the top left-hand area of the planning screen, be sure the constant dive " "parameters are appropriate. These are: Start date and time of the intended " @@ -6451,14 +6451,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3205 +#: user-manual.txt:3209 msgid "" "In the table labelled _Available Gases_, add the information of the " "cylinders to be used as well as the gas composition within that cylinder. " "This is done in a similar way as for <>. Choose the cylinder type by double clicking " "the cylinder type and using the dropdown list, then specify the work " -"pressure of this cylinder. By leaving the oxygen concentration (O2%) filed " +"pressure of this cylinder. By leaving the oxygen concentration (O2%) field " "empty, the cylinder is assumed to contain air. Otherwise enter the oxygen " "and/or helium concentration in the boxes provided in this dialogue. Add " "additional cylinders by using the \"+\" icon to the top right-hand of the " @@ -6466,12 +6466,57 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3207 -msgid "The profile of the planned dive can be created in two ways:" +#: user-manual.txt:3211 +msgid "The _Available Gases_ table includes three gas depth fields, labelled:" msgstr "" #. type: Plain text #: user-manual.txt:3212 +#, no-wrap +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:3213 +#, no-wrap +msgid "automatically calculated based on the Deco pO₂ preference (default 1.6 bar)\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3214 +#, no-wrap +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:3216 +#, no-wrap +msgid "" +"calculated based on the Bottom pO₂ preference (default 1.4 bar). Editing this field will modify the\n" +"O₂% according to the depth set. Set to ''*'' to calculate the best O₂% for the dive maximum depth.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3217 +#, no-wrap +msgid "** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based on the Best Mix END\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3219 +#, no-wrap +msgid "" +"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 "" + +#. type: Plain text +#: user-manual.txt:3221 +msgid "The profile of the planned dive can be created in two ways:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3226 msgid "" "Drag the waypoints (the small white circles) on the existing dive profile to " "represent the dive. Additional waypoints can be created by double-clicking " @@ -6481,7 +6526,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3220 +#: user-manual.txt:3234 msgid "" "The most efficient way to create a dive profile is to enter the appropriate " "values into the table marked _Dive planner points_. The first line of the " @@ -6495,13 +6540,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:3221 +#: user-manual.txt:3235 #, no-wrap msgid "Recreational dives" msgstr "" #. type: Plain text -#: user-manual.txt:3238 +#: user-manual.txt:3252 #, no-wrap msgid "" "Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL).\n" @@ -6522,21 +6567,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3241 +#: user-manual.txt:3255 msgid "" "Ensure the date and time is set to that of the intended dive. This allows " "calculation of the nitrogen load incurred during previous dives." msgstr "" #. type: Plain text -#: user-manual.txt:3244 +#: user-manual.txt:3258 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: user-manual.txt:3248 +#: user-manual.txt:3262 msgid "" "Then define the cylinder size, the gas mixture (air or % oxygen) and the " "starting cylinder pressure in the top left-hand section of the planner under " @@ -6544,7 +6589,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3253 +#: user-manual.txt:3267 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 " @@ -6554,7 +6599,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3262 +#: user-manual.txt:3276 msgid "" "Define the amount of gas the cylinder must have at the end of the bottom " "section of the dive just before ascent. A value of 50 bar is often used. The " @@ -6571,7 +6616,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3270 +#: user-manual.txt:3284 msgid "" "Define the depth of the dive by dragging the waypoints (white dots) on the " "dive profile or (even better) defining the appropriate depths using the " @@ -6584,14 +6629,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3273 +#: user-manual.txt:3287 msgid "" "The ascent speed can be changed. The default ascent speeds are those " "considered safe for recreational divers." msgstr "" #. type: Plain text -#: user-manual.txt:3281 +#: user-manual.txt:3295 msgid "" "The dive profile in the planner shows the maximum dive time within no-deco " "limits using the Bühlmann ZH-L16 algorithm and the gas and depth settings " @@ -6607,7 +6652,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3285 +#: user-manual.txt:3299 msgid "" "Below is an image of a dive plan for a recreational dive at 30 meters. " "Although the no-deco limit (NDL) is 23 minutes, the duration of the dive is " @@ -6617,26 +6662,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3286 +#: user-manual.txt:3300 #, no-wrap msgid "images/rec_diveplan.jpg" msgstr "images/rec_diveplan.jpg" #. type: Title ==== -#: user-manual.txt:3288 +#: user-manual.txt:3302 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "" #. type: Plain text -#: user-manual.txt:3292 +#: user-manual.txt:3306 msgid "" "Non-recreational dive planning involves exceeding the no-deco limits and/or " "using multiple breathing gases. These dives are planned in three stages:" msgstr "" #. type: Plain text -#: user-manual.txt:3304 +#: user-manual.txt:3318 #, no-wrap msgid "" "*a) Nitrogen management*: This is done by specifying the rates for descent and ascent,\n" @@ -6653,7 +6698,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3309 +#: user-manual.txt:3323 msgid "" "If the VPM-B model is selected, the Conservatism_level needs to be specified " "on a scale of 0 (least conservative) to 4 (most conservative). This model " @@ -6664,12 +6709,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3311 +#: user-manual.txt:3325 msgid "For more information external to this manual see:" msgstr "" #. type: Plain text -#: user-manual.txt:3313 +#: user-manual.txt:3327 msgid "" "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" @@ -6678,7 +6723,7 @@ msgstr "" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" #. type: Plain text -#: user-manual.txt:3314 +#: user-manual.txt:3328 msgid "" "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-" "articles/5037-gradient-factors-for-dummies.html[Gradient factors for " @@ -6689,7 +6734,7 @@ msgstr "" "dummies, by Kevin Watts]" #. type: Plain text -#: user-manual.txt:3316 +#: user-manual.txt:3330 msgid "" "link:http://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" @@ -6704,7 +6749,7 @@ msgstr "" "traite à la fois des modèles de décompression Bühlmann et VPM-B." #. type: Plain text -#: user-manual.txt:3324 +#: user-manual.txt:3338 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 average (or mean) depth " @@ -6718,7 +6763,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3333 +#: user-manual.txt:3347 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n" @@ -6732,7 +6777,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3350 +#: user-manual.txt:3364 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary\n" @@ -6754,7 +6799,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3362 +#: user-manual.txt:3376 msgid "" "Now you can start the detailed time-depth planning of the dive. _Subsurface_ " "offers an unique graphical interface for doing planning. Themechanics are " @@ -6772,7 +6817,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3374 +#: user-manual.txt:3388 msgid "" "Each waypoint on the dive profile creates a _Dive Planner Point_ in the " "table on the left of the dive planner panel. Be sure the _Used Gas_ value in " @@ -6789,7 +6834,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3382 +#: user-manual.txt:3396 msgid "" "Show any changes in gas cylinder used by indicating gas changes as explained " "in the section <>. These " @@ -6801,7 +6846,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3391 +#: user-manual.txt:3405 msgid "" "A non-zero value in the \"CC set point\" column of the table of dive planner " "points indicates a valid setpoint for oxygen partial pressure and that the " @@ -6814,20 +6859,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3394 +#: user-manual.txt:3408 msgid "" "Below is an example of a dive plan to 45m using EAN26, followed by an ascent " "using EAN50 and using the settings as described above." msgstr "" #. type: Target for macro image -#: user-manual.txt:3395 +#: user-manual.txt:3409 #, no-wrap msgid "images/DivePlanner2_f20.jpg" msgstr "images/DivePlanner2_f20.jpg" #. type: Plain text -#: user-manual.txt:3400 +#: user-manual.txt:3414 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 " @@ -6835,13 +6880,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3402 +#: user-manual.txt:3416 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3410 +#: user-manual.txt:3424 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 " @@ -6854,7 +6899,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3415 +#: user-manual.txt:3429 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 " @@ -6864,13 +6909,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3416 +#: user-manual.txt:3430 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3431 +#: user-manual.txt:3445 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than\n" @@ -6889,26 +6934,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3432 +#: user-manual.txt:3446 #, no-wrap msgid "images/Planner_pSCR1_f20.jpg" msgstr "images/Planner_pSCR1_f20.jpg" #. type: Title === -#: user-manual.txt:3435 +#: user-manual.txt:3449 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3439 +#: user-manual.txt:3453 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:3443 +#: user-manual.txt:3457 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder information for the\n" @@ -6917,7 +6962,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3453 +#: user-manual.txt:3467 #, no-wrap msgid "" "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File -> Preferences -> Graph_ from\n" @@ -6932,32 +6977,32 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3455 +#: user-manual.txt:3469 msgid "" "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:3456 +#: user-manual.txt:3470 #, no-wrap msgid "images/Planner_CCR1_f20.jpg" msgstr "images/Planner_CCR1_f20.jpg" #. type: Plain text -#: user-manual.txt:3460 +#: user-manual.txt:3474 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:3462 +#: user-manual.txt:3476 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3469 +#: user-manual.txt:3483 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 " @@ -6968,7 +7013,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3475 +#: user-manual.txt:3489 msgid "" "In addition, there is the option \"Save new\". This keeps the original " "planned dive and adds a (possibly modified) copy to the dive list. If that " @@ -6978,13 +7023,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3476 +#: user-manual.txt:3490 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: user-manual.txt:3483 +#: user-manual.txt:3497 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 " @@ -6993,7 +7038,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3489 +#: user-manual.txt:3503 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 done then " @@ -7003,7 +7048,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3494 +#: user-manual.txt:3508 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 " @@ -7013,13 +7058,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3495 +#: user-manual.txt:3509 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3500 +#: user-manual.txt:3514 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 " @@ -7027,7 +7072,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3510 +#: user-manual.txt:3524 msgid "" "Dive plans have many characteristics in common with dive logs (dive profile, " "dive notes, etc). After a dive plan has been saved, the dive details and " @@ -7043,13 +7088,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3511 +#: user-manual.txt:3525 #, 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:3516 +#: user-manual.txt:3530 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 " @@ -7060,13 +7105,13 @@ msgstr "" "des sections de ce manuel traitant des opérations relatives." #. type: Title === -#: user-manual.txt:3517 +#: user-manual.txt:3531 #, no-wrap msgid "File" msgstr "Fichier" #. type: Plain text -#: user-manual.txt:3520 +#: user-manual.txt:3534 msgid "" "<> - Close the currently open dive logbook and " "clear all dive information." @@ -7075,7 +7120,7 @@ msgstr "" "actuellement ouvert et supprime toutes les informations de plongées." #. type: Plain text -#: user-manual.txt:3522 +#: user-manual.txt:3536 msgid "" "_Open logbook_ - Open the file manager to select a dive logbook to open." msgstr "" @@ -7083,37 +7128,37 @@ msgstr "" "carnet de plongée à ouvrir." #. type: Plain text -#: user-manual.txt:3523 +#: user-manual.txt:3537 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<>." msgstr "" #. type: Plain text -#: user-manual.txt:3524 +#: user-manual.txt:3538 msgid "_Save_ - Save the dive logbook currently open." msgstr "_Sauvegarder_ - Enregistrer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:3525 +#: user-manual.txt:3539 msgid "" "_Save to cloud storage_ - Save the current dive log to <>." msgstr "" #. type: Plain text -#: user-manual.txt:3526 +#: user-manual.txt:3540 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:3527 +#: user-manual.txt:3541 msgid "_Close_ - Close the dive logbook currently open." msgstr "_Fermer_ - Fermer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:3529 +#: user-manual.txt:3543 msgid "" "<> - Export the currently open dive logbook (or the " "selected dives in the logbook) to one of several formats." @@ -7123,34 +7168,34 @@ msgstr "" "formats." #. type: Plain text -#: user-manual.txt:3530 +#: user-manual.txt:3544 msgid "<> - Print the currently open logbook." msgstr "" "<> - Imprimer le carnet de plongée actuellement " "ouvert." #. type: Plain text -#: user-manual.txt:3531 +#: user-manual.txt:3545 msgid "<> - Set the _Subsurface_ preferences." msgstr "" "<> - Définir les préférences de _Subsurface_." #. type: Plain text -#: user-manual.txt:3532 +#: user-manual.txt:3546 msgid "" "<> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:3533 +#: user-manual.txt:3547 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:3534 +#: user-manual.txt:3548 msgid "" "<> - Edit the configuration of a dive " "computer." @@ -7159,18 +7204,18 @@ msgstr "" "configuration d'un ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3535 +#: user-manual.txt:3549 msgid "_Quit_ - Quit _Subsurface_." msgstr "_Quitter_ - Quitter _Subsurface_." #. type: Title === -#: user-manual.txt:3536 +#: user-manual.txt:3550 #, no-wrap msgid "Import" msgstr "Importer" #. type: Plain text -#: user-manual.txt:3539 +#: user-manual.txt:3553 msgid "" "<> - Import dive " "information from a dive computer." @@ -7179,7 +7224,7 @@ msgstr "" "Importer des informations de plongées à partir de l'ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3541 +#: user-manual.txt:3555 msgid "" "<> - Import dive information from a file " "in in a _Subsurface_-compatible format." @@ -7189,7 +7234,7 @@ msgstr "" "_Subsurface_." #. type: Plain text -#: user-manual.txt:3543 +#: user-manual.txt:3557 msgid "" "<> - Load GPS " "coordinates from the _Subsurface_ mobile phone app." @@ -7199,7 +7244,7 @@ msgstr "" "(téléphones et tablettes)." #. type: Plain text -#: user-manual.txt:3545 +#: user-manual.txt:3559 msgid "" "<> - Import dive " "information from _www.Divelogs.de_." @@ -7208,13 +7253,13 @@ msgstr "" "informations de plongées à partir de _www.Divelogs.de_." #. type: Title === -#: user-manual.txt:3546 +#: user-manual.txt:3560 #, no-wrap msgid "Log" msgstr "Journal (log)" #. type: Plain text -#: user-manual.txt:3548 +#: user-manual.txt:3562 msgid "" "<> - Manually add a new dive to the *Dive List* " "panel." @@ -7223,19 +7268,19 @@ msgstr "" "plongée au panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3549 +#: user-manual.txt:3563 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:3550 +#: user-manual.txt:3564 msgid "<> - Plan dives." msgstr "<> - Planifier des plongées." #. type: Plain text -#: user-manual.txt:3551 +#: user-manual.txt:3565 msgid "" "<> - Edit a dive plan that has been saved " "into the *Dive List*." @@ -7244,7 +7289,7 @@ msgstr "" "plongée planifiée qui a été enregistrée dans la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3553 +#: user-manual.txt:3567 msgid "" "<> - Copy information from several " "fields of a dive log onto the clipboard." @@ -7254,7 +7299,7 @@ msgstr "" "papier." #. type: Plain text -#: user-manual.txt:3555 +#: user-manual.txt:3569 msgid "" "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, " "the information copied using the _Copy dive components_ option." @@ -7264,7 +7309,7 @@ msgstr "" "préalable avec l'option _Copier les composants de la plongée_." #. type: Plain text -#: user-manual.txt:3557 +#: user-manual.txt:3571 msgid "" "<> - Renumber the dives listed in the *Dive List* " "panel." @@ -7273,7 +7318,7 @@ msgstr "" "le panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3559 +#: user-manual.txt:3573 msgid "" "<> - Group the dives in the *Dive List* panel into " "dive trips." @@ -7282,7 +7327,7 @@ msgstr "" "*liste des plongées* dans des voyages de plongées." #. type: Plain text -#: user-manual.txt:3560 +#: user-manual.txt:3574 msgid "" "<> - Edit the names of dive computers to " "coordinate your logs." @@ -7291,7 +7336,7 @@ msgstr "" "les noms des ordinateurs de plongée pour coordonner vos journaux (logs)." #. type: Plain text -#: user-manual.txt:3561 +#: user-manual.txt:3575 msgid "" "<> - Select only some dives, based on specific " "tags or dive criteria." @@ -7300,13 +7345,13 @@ msgstr "" "certaines plongées, à partir de tags ou de critères de plongées." #. type: Title === -#: user-manual.txt:3562 +#: user-manual.txt:3576 #, no-wrap msgid "View" msgstr "Vue" #. type: Plain text -#: user-manual.txt:3565 +#: user-manual.txt:3579 msgid "" "<> - View the four main _Subsurface_ panels all at once." msgstr "" @@ -7314,33 +7359,33 @@ msgstr "" "_Subsurface_ simultanément." #. type: Plain text -#: user-manual.txt:3566 +#: user-manual.txt:3580 msgid "<> - View only the *Dive List* panel." msgstr "" "<> - Affiche uniquement le panneau de la " "*liste des plongées*." #. type: Plain text -#: user-manual.txt:3567 +#: user-manual.txt:3581 msgid "<> - View only the *Dive Profile* panel." msgstr "" "<> - Affiche uniquement le panneau du *profil de la " "plongée*." #. type: Plain text -#: user-manual.txt:3568 +#: user-manual.txt:3582 msgid "<> - View only the *Notes* panel." msgstr "<> - Affiche uniquement le panneau des *notes*." #. type: Plain text -#: user-manual.txt:3569 +#: user-manual.txt:3583 msgid "<> - View only the *World Map* panel." msgstr "" "<> - Affiche uniquement le panneau de la *carte " "mondiale*." #. type: Plain text -#: user-manual.txt:3571 +#: user-manual.txt:3585 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." @@ -7349,30 +7394,30 @@ msgstr "" "plongées effectuées." #. type: Plain text -#: user-manual.txt:3572 +#: user-manual.txt:3586 msgid "" "_Prev DC_ - Switch to data from previous dive computer, if a single dive was " "logged from more than one." msgstr "" #. type: Plain text -#: user-manual.txt:3573 +#: user-manual.txt:3587 msgid "_Next DC_ - Switch to next dive computer." msgstr "_Ordinateur suivant_ - Passer à l'ordinateur de plongée suivant." #. type: Plain text -#: user-manual.txt:3574 +#: user-manual.txt:3588 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "_Plein écran_ - Passer en mode plein écran." #. type: Title === -#: user-manual.txt:3575 +#: user-manual.txt:3589 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:3577 +#: user-manual.txt:3591 msgid "" "<> - Share the currently selected dive on your " "Facebook timeline." @@ -7381,13 +7426,13 @@ msgstr "" "Facebook." #. type: Title === -#: user-manual.txt:3579 +#: user-manual.txt:3593 #, no-wrap msgid "Help" msgstr "Aide" #. type: Plain text -#: user-manual.txt:3582 +#: user-manual.txt:3596 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." @@ -7396,7 +7441,7 @@ msgstr "" "_Subsurface_ ainsi que les informations de licence." #. type: Plain text -#: user-manual.txt:3584 +#: user-manual.txt:3598 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the http://subsurface-divelog.org/[_Subsurface_ web site]." @@ -7406,7 +7451,7 @@ msgstr "" "_Subsurface_ ]." #. type: Plain text -#: user-manual.txt:3586 +#: user-manual.txt:3600 msgid "" "<> - Help to make _Subsurface_ even better by " "taking part in our user survey or by completing another survey if your " @@ -7417,31 +7462,31 @@ msgstr "" "sondage, si vos habitudes de plongées ont changées." #. type: Plain text -#: user-manual.txt:3587 +#: user-manual.txt:3601 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:3590 +#: user-manual.txt:3604 #, no-wrap msgid "APPENDIX A: Operating system specific information for importing dive information from a dive computer." msgstr "ANNEXE A : informations spécifiques au système d'exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée." #. type: Title === -#: user-manual.txt:3592 +#: user-manual.txt:3606 #, 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:3593 +#: user-manual.txt:3607 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "images/icons/drivers.jpg" #. type: Plain text -#: user-manual.txt:3598 +#: user-manual.txt:3612 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 " @@ -7452,7 +7497,7 @@ msgstr "" "l'ordinateur de plongée (Bluetooth, USB, infra-rouge)." #. type: Plain text -#: user-manual.txt:3604 +#: user-manual.txt:3618 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 " @@ -7466,7 +7511,7 @@ msgstr "" "particulièrement pour certaines technologies telles que l'infra-rouge." #. type: Plain text -#: user-manual.txt:3608 +#: user-manual.txt:3622 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 " @@ -7477,7 +7522,7 @@ msgstr "" "port USB de son ordinateur de bureau." #. type: Plain text -#: user-manual.txt:3615 +#: user-manual.txt:3629 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 " @@ -7495,19 +7540,19 @@ msgstr "" "documents et logiciels Silicon Labs]." #. type: Title === -#: user-manual.txt:3617 +#: user-manual.txt:3631 #, no-wrap msgid "How to Find the Device Name for USB devices and set its write permission" msgstr "Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3618 +#: user-manual.txt:3632 #, no-wrap msgid "images/icons/usb.jpg" msgstr "images/icons/usb.jpg" #. type: Plain text -#: user-manual.txt:3626 +#: user-manual.txt:3640 msgid "" "When connecting a dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list with the correct device " @@ -7523,7 +7568,7 @@ msgstr "" "de votre périphérique ;" #. type: Plain text -#: user-manual.txt:3631 +#: user-manual.txt:3645 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." @@ -7532,56 +7577,56 @@ msgstr "" "tous les périphériques COM connectés." #. type: Title ==== -#: user-manual.txt:3632 user-manual.txt:3730 +#: user-manual.txt:3646 user-manual.txt:3744 #, no-wrap msgid "On MacOS:" msgstr "Sur MacOS :" #. type: Plain text -#: user-manual.txt:3635 +#: user-manual.txt:3649 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:3636 +#: user-manual.txt:3650 #, no-wrap msgid "On Linux:" msgstr "Sur Linux :" #. type: Plain text -#: user-manual.txt:3639 +#: user-manual.txt:3653 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:3641 +#: user-manual.txt:3655 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:3642 +#: user-manual.txt:3656 msgid "Open a terminal" msgstr "Ouvrir un terminal" #. type: Plain text -#: user-manual.txt:3643 user-manual.txt:3645 +#: user-manual.txt:3657 user-manual.txt:3659 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:3644 +#: user-manual.txt:3658 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:3647 +#: user-manual.txt:3661 msgid "A message similar to this one should appear:" msgstr "Un message similaire à celui-ci devrait apparaitre :" #. type: Plain text -#: user-manual.txt:3663 +#: user-manual.txt:3677 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -7617,7 +7662,7 @@ msgstr "" "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n" #. type: Plain text -#: user-manual.txt:3668 +#: user-manual.txt:3682 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 " @@ -7629,14 +7674,14 @@ msgstr "" "que Subsurface utilise le bon port USB." #. type: Plain text -#: user-manual.txt:3670 +#: user-manual.txt:3684 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:3680 +#: user-manual.txt:3694 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 " @@ -7656,7 +7701,7 @@ msgstr "" "USB. Admettons que votre nom d'utilisateur est 'johnB'." #. type: Plain text -#: user-manual.txt:3684 +#: user-manual.txt:3698 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." @@ -7666,7 +7711,7 @@ msgstr "" "+dialout+." #. type: Plain text -#: user-manual.txt:3689 +#: user-manual.txt:3703 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -7682,7 +7727,7 @@ msgstr "" "parmi les différents IDs.\n" #. type: Plain text -#: user-manual.txt:3691 +#: user-manual.txt:3705 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n" @@ -7692,7 +7737,7 @@ msgstr "" "puis reconnexion sur l'ordinateur (sous Ubuntu, par exemple).\n" #. type: Plain text -#: user-manual.txt:3696 +#: user-manual.txt:3710 msgid "" "With the appropriate device name (e.g. +dev/ttyUSB3+) and with write " "permission to the USB port, the dive computer interface can connect and one " @@ -7703,13 +7748,13 @@ msgstr "" "vous devriez pouvoir importer vos plongées." #. type: Title === -#: user-manual.txt:3699 +#: user-manual.txt:3713 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:3706 +#: user-manual.txt:3720 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a " @@ -7718,13 +7763,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3708 +#: user-manual.txt:3722 #, no-wrap msgid "*For the dive computer, after enabling Bluetooth, be sure it is in Upload mode.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3712 +#: user-manual.txt:3726 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 -> " @@ -7732,13 +7777,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3714 +#: user-manual.txt:3728 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3723 +#: user-manual.txt:3737 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -7750,21 +7795,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3726 +#: user-manual.txt:3740 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:3729 +#: user-manual.txt:3743 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:3736 +#: user-manual.txt:3750 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. " @@ -7773,20 +7818,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3739 +#: user-manual.txt:3753 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:3740 +#: user-manual.txt:3754 #, no-wrap msgid "On Linux" msgstr "Sur Linux" #. type: Plain text -#: user-manual.txt:3748 +#: user-manual.txt:3762 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 " @@ -7798,7 +7843,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3752 +#: user-manual.txt:3766 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 " @@ -7807,23 +7852,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3754 +#: user-manual.txt:3768 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3755 +#: user-manual.txt:3769 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:3756 user-manual.txt:3896 +#: user-manual.txt:3770 user-manual.txt:3910 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:3762 +#: user-manual.txt:3776 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 " @@ -7834,7 +7879,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3767 +#: user-manual.txt:3781 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 " @@ -7844,23 +7889,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3769 +#: user-manual.txt:3783 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:3771 +#: user-manual.txt:3785 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:3772 +#: user-manual.txt:3786 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3778 +#: user-manual.txt:3792 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 " @@ -7871,14 +7916,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3781 +#: user-manual.txt:3795 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:3788 +#: user-manual.txt:3802 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -7890,7 +7935,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3793 +#: user-manual.txt:3807 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 " @@ -7900,7 +7945,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3801 +#: user-manual.txt:3815 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -7913,25 +7958,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3803 +#: user-manual.txt:3817 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: user-manual.txt:3805 +#: user-manual.txt:3819 msgid "" "If there are multiple controllers running, it's easiest to off the unused " "controller(s). For example, for +hci1+:" msgstr "" #. type: Plain text -#: user-manual.txt:3807 +#: user-manual.txt:3821 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:3810 +#: user-manual.txt:3824 msgid "" "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez " "5, such as Fedora 22, one can use a tool called +blutootctl+, which will " @@ -7939,7 +7984,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3831 +#: user-manual.txt:3845 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -7965,14 +8010,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3834 +#: user-manual.txt:3848 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:3837 +#: user-manual.txt:3851 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-" @@ -7980,7 +8025,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3842 +#: user-manual.txt:3856 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -7990,94 +8035,94 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3844 +#: user-manual.txt:3858 msgid "Once ther dive computer is pired, set up the RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:3845 +#: user-manual.txt:3859 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:3848 +#: user-manual.txt:3862 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:3850 +#: user-manual.txt:3864 msgid "+sudo rfcomm -i connect [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:3852 +#: user-manual.txt:3866 msgid "++ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:3853 +#: user-manual.txt:3867 msgid "++ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:3854 +#: user-manual.txt:3868 msgid "++ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:3855 +#: user-manual.txt:3869 msgid "" "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:3858 +#: user-manual.txt:3872 msgid "" "If one omits it, channel 1 is assumed. Based on a limited number of user " "reports, the appropriate channel for the dive computer is probably:" msgstr "" #. type: Plain text -#: user-manual.txt:3860 +#: user-manual.txt:3874 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3861 +#: user-manual.txt:3875 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:3862 +#: user-manual.txt:3876 msgid "_Shearwater Nerd_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:3863 +#: user-manual.txt:3877 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3865 +#: user-manual.txt:3879 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:3867 +#: user-manual.txt:3881 #, no-wrap msgid "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)\n" msgstr "" #. type: Plain text -#: user-manual.txt:3869 +#: user-manual.txt:3883 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:3872 +#: user-manual.txt:3886 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -8085,14 +8130,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3874 +#: user-manual.txt:3888 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:3878 +#: user-manual.txt:3892 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, probably 0000, when prompted)\n" @@ -8101,7 +8146,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3882 +#: user-manual.txt:3896 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 " @@ -8110,7 +8155,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3892 +#: user-manual.txt:3906 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -8125,7 +8170,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3895 +#: user-manual.txt:3909 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 " @@ -8133,7 +8178,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3898 +#: user-manual.txt:3912 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select _Import-" @@ -8143,25 +8188,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3904 +#: user-manual.txt:3918 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:3907 +#: user-manual.txt:3921 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3909 +#: user-manual.txt:3923 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "images/icons/iumis.jpg" #. type: Plain text -#: user-manual.txt:3925 +#: user-manual.txt:3939 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and equipment. " @@ -8177,7 +8222,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3940 +#: user-manual.txt:3954 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -8194,19 +8239,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3942 +#: user-manual.txt:3956 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3944 +#: user-manual.txt:3958 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "images/icons/Galileo.jpg" #. type: Plain text -#: user-manual.txt:3959 +#: user-manual.txt:3973 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -8222,14 +8267,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3962 +#: user-manual.txt:3976 msgid "" "After executing this command, Subsurface will recognize the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:3968 +#: user-manual.txt:3982 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/" @@ -8239,26 +8284,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3971 +#: user-manual.txt:3985 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:3973 +#: user-manual.txt:3987 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3975 +#: user-manual.txt:3989 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "images/icons/HW_DR5.jpg" #. type: Plain text -#: user-manual.txt:3985 +#: user-manual.txt:3999 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. " @@ -8271,19 +8316,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3988 +#: user-manual.txt:4002 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3990 +#: user-manual.txt:4004 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "images/icons/HW_xdeepblack.jpg" #. type: Plain text -#: user-manual.txt:3999 +#: user-manual.txt:4013 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 " @@ -8297,19 +8342,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4001 +#: user-manual.txt:4015 #, no-wrap msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4003 +#: user-manual.txt:4017 #, no-wrap msgid "images/icons/predator.jpg" msgstr "images/icons/predator.jpg" #. type: Plain text -#: user-manual.txt:4006 +#: user-manual.txt:4020 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, < Import log files_ to open the xref:" "Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:4048 +#: user-manual.txt:4062 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:4052 +#: user-manual.txt:4066 #, no-wrap msgid "" "On the list of file names select the _.apd_ file created. An import\n" @@ -8449,13 +8494,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4053 +#: user-manual.txt:4067 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "images/APD_CSVimportF22.jpg" #. type: Plain text -#: user-manual.txt:4061 +#: user-manual.txt:4075 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 " @@ -8467,12 +8512,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4062 +#: user-manual.txt:4076 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:4067 +#: user-manual.txt:4081 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer- " "generated ceiling provided by the Inspiration can be viewed by selecting the " @@ -8482,13 +8527,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4068 +#: user-manual.txt:4082 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:4077 +#: user-manual.txt:4091 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, " @@ -8498,22 +8543,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4079 +#: user-manual.txt:4093 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:4080 +#: user-manual.txt:4094 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4081 +#: user-manual.txt:4095 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4085 +#: user-manual.txt:4099 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -8521,19 +8566,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4087 +#: user-manual.txt:4101 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4088 +#: user-manual.txt:4102 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "images/icons/suuntologo.jpg" #. type: Plain text -#: user-manual.txt:4095 +#: user-manual.txt:4109 msgid "" "DiveManager is a MS Windows application for Suunto dive computers. " "Divemanager 3 (DM3) is an older version of the Suunto software. More recent " @@ -8543,66 +8588,66 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4097 +#: user-manual.txt:4111 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4099 +#: user-manual.txt:4113 msgid "" "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:4100 +#: user-manual.txt:4114 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4102 +#: user-manual.txt:4116 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:4103 +#: user-manual.txt:4117 msgid "" "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:4104 +#: user-manual.txt:4118 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:4106 +#: user-manual.txt:4120 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:4107 +#: user-manual.txt:4121 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:4108 +#: user-manual.txt:4122 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:4109 +#: user-manual.txt:4123 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:4111 +#: user-manual.txt:4125 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -8610,13 +8655,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4112 +#: user-manual.txt:4126 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:4114 +#: user-manual.txt:4128 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -8624,25 +8669,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4115 +#: user-manual.txt:4129 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:4116 +#: user-manual.txt:4130 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:4118 +#: user-manual.txt:4132 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4123 +#: user-manual.txt:4137 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 " @@ -8651,81 +8696,81 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4125 +#: user-manual.txt:4139 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:4127 user-manual.txt:4136 +#: user-manual.txt:4141 user-manual.txt:4150 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:4128 +#: user-manual.txt:4142 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:4129 +#: user-manual.txt:4143 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:4130 +#: user-manual.txt:4144 msgid "Open Windows Explorer" msgstr "Ouvrir l'explorateur Windows" #. type: Plain text -#: user-manual.txt:4131 +#: user-manual.txt:4145 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4132 +#: user-manual.txt:4146 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:4134 +#: user-manual.txt:4148 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:4137 +#: user-manual.txt:4151 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:4139 +#: user-manual.txt:4153 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:4140 +#: user-manual.txt:4154 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:4141 +#: user-manual.txt:4155 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:4143 +#: user-manual.txt:4157 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4146 +#: user-manual.txt:4160 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "images/icons/atomiclogo.jpg" #. type: Plain text -#: user-manual.txt:4153 +#: user-manual.txt:4167 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " @@ -8735,19 +8780,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4155 +#: user-manual.txt:4169 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4158 +#: user-manual.txt:4172 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "images/icons/mareslogo.jpg" #. type: Plain text -#: user-manual.txt:4166 +#: user-manual.txt:4180 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 " @@ -8758,7 +8803,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4171 +#: user-manual.txt:4185 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 " @@ -8766,36 +8811,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4174 +#: user-manual.txt:4188 msgid "" "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganizer.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4175 +#: user-manual.txt:4189 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4176 +#: user-manual.txt:4190 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4178 +#: user-manual.txt:4192 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4180 +#: user-manual.txt:4194 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "images/icons/divingloglogo.jpg" #. type: Plain text -#: user-manual.txt:4187 +#: user-manual.txt:4201 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 " @@ -8805,37 +8850,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4189 +#: user-manual.txt:4203 msgid "To transfer all files from DivingLog to Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:4191 +#: user-manual.txt:4205 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4192 +#: user-manual.txt:4206 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4193 +#: user-manual.txt:4207 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4194 +#: user-manual.txt:4208 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4195 +#: user-manual.txt:4209 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4199 +#: user-manual.txt:4213 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 " @@ -8843,13 +8888,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4200 +#: user-manual.txt:4214 #, 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:4210 +#: user-manual.txt:4224 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 " @@ -8869,7 +8914,7 @@ msgstr "" "tableur utilisé." #. type: Plain text -#: user-manual.txt:4216 +#: user-manual.txt:4230 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 " @@ -8885,19 +8930,19 @@ msgstr "" "plongées selon quelques règles simples :" #. type: Plain text -#: user-manual.txt:4218 +#: user-manual.txt:4232 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:4219 +#: user-manual.txt:4233 msgid "Duration: the format should be minutes:seconds." msgstr "Durée : le format est minutes:secondes." #. type: Plain text -#: user-manual.txt:4220 +#: user-manual.txt:4234 msgid "" "Unit system: only one unit system should be used (no mix of imperial and " "metric units)" @@ -8906,25 +8951,25 @@ msgstr "" "entre les unités impériales et métriques)" #. type: Plain text -#: user-manual.txt:4221 +#: user-manual.txt:4235 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:4222 +#: user-manual.txt:4236 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:4222 +#: user-manual.txt:4236 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "_LibreOffice Calc_ et _OpenOffice Calc_" #. type: Plain text -#: user-manual.txt:4226 +#: user-manual.txt:4240 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -8935,13 +8980,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4227 +#: user-manual.txt:4241 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "images/LOffice_spreadsheetdata.jpg" #. type: Plain text -#: user-manual.txt:4230 +#: user-manual.txt:4244 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 " @@ -8949,13 +8994,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4231 +#: user-manual.txt:4245 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "images/LOffice_save_as_options.jpg" #. type: Plain text -#: user-manual.txt:4234 +#: user-manual.txt:4248 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -8963,13 +9008,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4235 +#: user-manual.txt:4249 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "images/LOffice_field_options.jpg" #. type: Plain text -#: user-manual.txt:4238 +#: user-manual.txt:4252 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 " @@ -8977,13 +9022,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4239 +#: user-manual.txt:4253 #, no-wrap msgid "Microsoft _Excel_" msgstr "Microsoft _Excel_" #. type: Plain text -#: user-manual.txt:4245 +#: user-manual.txt:4259 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -8994,19 +9039,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4247 +#: user-manual.txt:4261 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:4248 +#: user-manual.txt:4262 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4251 +#: user-manual.txt:4265 msgid "" "Do one of the following: ** In Windows 7, click the _Formats_ tab, and then " "click _Customize this format_. ** In Windows XP, click the _Regional " @@ -9014,48 +9059,48 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4252 +#: user-manual.txt:4266 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:4253 +#: user-manual.txt:4267 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4255 +#: user-manual.txt:4269 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4256 +#: user-manual.txt:4270 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "images/Win_SaveCSV2.jpg" #. type: Plain text -#: user-manual.txt:4259 +#: user-manual.txt:4273 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4261 +#: user-manual.txt:4275 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:4262 +#: user-manual.txt:4276 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "images/Win_SaveCSV1.jpg" #. type: Plain text -#: user-manual.txt:4268 +#: user-manual.txt:4282 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 " @@ -9065,13 +9110,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4269 +#: user-manual.txt:4283 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "images/Win_SaveCSV3.jpg" #. type: Plain text -#: user-manual.txt:4275 +#: user-manual.txt:4289 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 " @@ -9080,13 +9125,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4276 +#: user-manual.txt:4290 #, 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:4281 +#: user-manual.txt:4295 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 " @@ -9095,12 +9140,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4283 +#: user-manual.txt:4297 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4291 +#: user-manual.txt:4305 msgid "" "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, " "_Import_ and _Export_ templates (see image *A* above). New or modified " @@ -9112,18 +9157,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4293 +#: user-manual.txt:4307 msgid "The Edit Panel has three tabs:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4294 +#: user-manual.txt:4308 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "images/Template1_f22.jpg" #. type: Plain text -#: user-manual.txt:4298 +#: user-manual.txt:4312 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. " @@ -9131,7 +9176,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4302 +#: user-manual.txt:4316 msgid "" "The _Colors_ tab (image *B* above) allows editing the colors used for " "printing the dive log. The colors are highly customizable: the _Edit_ " @@ -9140,7 +9185,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4311 +#: user-manual.txt:4325 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. " @@ -9156,13 +9201,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4312 +#: user-manual.txt:4326 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "images/Template2_f22.jpg" #. type: Plain text -#: user-manual.txt:4317 +#: user-manual.txt:4331 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 " @@ -9171,33 +9216,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4319 +#: user-manual.txt:4333 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:4320 +#: user-manual.txt:4334 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4322 +#: user-manual.txt:4336 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:4322 user-manual.txt:4387 user-manual.txt:4404 +#: user-manual.txt:4336 user-manual.txt:4401 user-manual.txt:4418 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4327 +#: user-manual.txt:4341 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -9206,13 +9251,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4329 user-manual.txt:4392 user-manual.txt:4411 +#: user-manual.txt:4343 user-manual.txt:4406 user-manual.txt:4425 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4334 +#: user-manual.txt:4348 #, no-wrap msgid "" "\t

1

\n" @@ -9221,25 +9266,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4337 +#: user-manual.txt:4351 msgid "" "Additional information about _Grantlee_ can be found at http://www.grantlee." "org/apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:4338 +#: user-manual.txt:4352 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:4340 +#: user-manual.txt:4354 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:4369 +#: user-manual.txt:4383 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9273,7 +9318,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4373 +#: user-manual.txt:4387 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -9281,7 +9326,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4385 +#: user-manual.txt:4399 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9298,26 +9343,26 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4390 +#: user-manual.txt:4404 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4395 +#: user-manual.txt:4409 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:4398 +#: user-manual.txt:4412 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:4401 +#: user-manual.txt:4415 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9325,7 +9370,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4409 +#: user-manual.txt:4423 #, no-wrap msgid "" "\tbody {\n" @@ -9334,7 +9379,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4416 +#: user-manual.txt:4430 #, no-wrap msgid "" "\tbody {\n" @@ -9343,13 +9388,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4418 +#: user-manual.txt:4432 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:4421 +#: user-manual.txt:4435 msgid "" "As the dive profile is placed after rendering, _Subsurface_ uses special " "_CSS_ selectors to searche in the HTML output. The _CSS_ selectors in the " @@ -9357,7 +9402,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4428 +#: user-manual.txt:4442 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -9368,20 +9413,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4431 +#: user-manual.txt:4445 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:4432 +#: user-manual.txt:4446 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:4436 +#: user-manual.txt:4450 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 " @@ -9389,55 +9434,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4438 +#: user-manual.txt:4452 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode." msgstr "" #. type: Plain text -#: user-manual.txt:4440 +#: user-manual.txt:4454 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:4443 +#: user-manual.txt:4457 #, no-wrap msgid "\t\n" msgstr "" #. type: Plain text -#: user-manual.txt:4446 +#: user-manual.txt:4460 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:4449 +#: user-manual.txt:4463 #, no-wrap msgid "\t\n" msgstr "" #. type: Plain text -#: user-manual.txt:4452 +#: user-manual.txt:4466 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" #. type: Title == -#: user-manual.txt:4453 +#: user-manual.txt:4467 #, no-wrap msgid "APPENDIX F: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:4455 +#: user-manual.txt:4469 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:4459 +#: user-manual.txt:4473 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_ " @@ -9445,7 +9490,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4465 +#: user-manual.txt:4479 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -9455,7 +9500,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4471 +#: user-manual.txt:4485 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 " @@ -9465,12 +9510,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4473 +#: user-manual.txt:4487 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:4479 +#: user-manual.txt:4493 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 " @@ -9481,12 +9526,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4481 +#: user-manual.txt:4495 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:4486 +#: user-manual.txt:4500 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 " @@ -9496,7 +9541,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4492 +#: user-manual.txt:4506 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 " @@ -9507,13 +9552,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4493 +#: user-manual.txt:4507 #, no-wrap msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..." msgstr "" #. type: Plain text -#: user-manual.txt:4497 +#: user-manual.txt:4511 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -9521,7 +9566,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4505 +#: user-manual.txt:4519 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 " @@ -9535,13 +9580,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4506 +#: user-manual.txt:4520 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:4520 +#: user-manual.txt:4534 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 " @@ -9556,7 +9601,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4524 +#: user-manual.txt:4538 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 " @@ -9564,8 +9609,11 @@ msgid "" "salvaged after being overwritten by new dives." msgstr "" -#~ msgid "images/tissues.jpg" -#~ msgstr "images/tissues.jpg" +#~ msgid "images/icons/tissues.jpg" +#~ msgstr "images/icons/tissues.jpg" + +#~ msgid "images/tissuesGraph.jpg" +#~ msgstr "images/tissuesGraph.jpg" #~ msgid "" #~ "Do you need a way of storing or backing up your dive log on the Internet, " diff --git a/Documentation/mobile-manual_fr.html.git b/Documentation/mobile-manual_fr.html.git index be9c4bdff..d9347e248 100644 --- a/Documentation/mobile-manual_fr.html.git +++ b/Documentation/mobile-manual_fr.html.git @@ -407,39 +407,40 @@ asciidoc.install(3); Banner -

Subsurface-mobile pour Android: MANUEL UTILISATEUR

+

Subsurface-mobile USER MANUAL

Auteur du manuel : Willem Ferguson

Table of Contents
-

Version 1.0, Mars 2016

+

Version 1.1, September 2016

Welcome as a user of Subsurface, advanced dive logging software with extensive infrastructure to describe, organize, interpret and print scuba and free dives. Subsurface offers many advantages over other similar software solutions, including compatibility with Windows, Mac-OS/X, Linux -(many distributions) and Android (iOS under development). In addition, -Subsurface is open-source software that allows downloading dive -information from most dive computers.

+(many distributions), Android and iOS. In addition, Subsurface is +open-source software that allows downloading dive information from most dive +computers.

1. Présentation de Subsurface-mobile

-

Subsurface-mobile est une extension de Subsurface sur ordinateurs. Il -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.

-

À cause des limitations d’iOS, Subsurface-mobile pour iOS n’inclut pas -toutes les fonctionnalités présentes dans la version Android.

-

While Subsurface-mobile allows one to enter and save dive information -using an Android device, 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 Android and the desktop versions. 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 one to:

+

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).

+

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.

+

Subsurface-mobile allows you to:

  • @@ -459,17 +460,17 @@ Edit many of the dive log data fields, e.g. divemaster, buddy, equipment or

  • -Manually create and add new dive records to one’s dive log. +Manually create and add new dive records to your dive log.

  • -Store the updated dive log on the Internet. +Store the updated dive log in the Subsurface cloud storage.

  • -Record, store and apply GPS positions of dives. +Record, store and apply GPS positions of dives (Android only).

  • @@ -487,10 +488,10 @@ devices, but this is not yet ready for testing.

-

2. Installing Subsurface-mobile on an Android device

+

2. Installing Subsurface-mobile on your mobile device

-

Find Subsurface-mobile in the Google Play Store. Search for -Subsurface-mobile and install it.

+

Find Subsurface-mobile in the Google Play Store or the iTunes Store +and install it.

@@ -503,16 +504,17 @@ image below on left).

Select whether Subsurface-mobile should access the Internet for dive log information.

-

3.1. When NOT Using Internet access

-

If the striked-out cloud icon is selected, the app will not access the -Internet to obtain dive log information. This means that dive log -information is manually entered and stored on the mobile device only.

+

3.1. 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.

-

3.2. Using Internet access

-

Since Subsurface is largely dependent on a dive log saved on the Internet, -provide a PIN for access to the Subsurface Cloud, obtained in one of two -ways:

+

3.2. 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.

3.2.1. Using the desktop version of Subsurface:

Open the desktop version of Subsurface and @@ -520,14 +522,14 @@ click File → Preferences → Network, explained in detail user manual for the Subsurface desktop version. Once the account has been created and verified using the desktop version, -Subsurface desktop alows one to download dive information from dive computers and store this +Subsurface desktop alows you to download dive information from dive computers and store this on the cloud which can, in turn, be downloaded to Subsurface-mobile. Subsurface-mobile attempts to download the existing dive log from the Subsurface cloud server. Appropriate messages are shown onscreen. Finally a list of dives is shown.

Once the dive list has been downloaded from the Internet, -Subsurface-mobile keeps a local copy on the mobile device. This means -that, if there is no Internet connection at a dive site, one can still -access the local copy and view and manipulate dive information. If there is +Subsurface-mobile keeps a local copy on the mobile device. This means that +even if there is no Internet connection at a dive site, you can still access +the local copy and view and manipulate dive information. If there is Internet connectivity, Subsurface-mobile accesses the cloud-based dive log to verify that the local copy is still the same as the Internet-stored copy. If not, the local copy and the copy on the server are synchronised.

@@ -552,17 +554,9 @@ e-mail address provided.

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. One can now start entering dives in the -dive log or one can download existing dives from the cloud.

-

The text box to enter the PIN is shown whenever the e-mail address field is -empty. One can create a new cloud account by clearing the e-mail address -and typing a new e-mail address, upon which a new PIN is sent to the -newly-provided e-mail address. On the other hand, one can change to a -different existing cloud account by providing an e-mail address and password -already registered with the cloud server (image on right, above)

-

Once Internet access has been enabled, one can temporarily disable this -service when using Subsurface-mobile in areas with no Internet access, -e.g. remote dive sites (see below)

+

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.

@@ -577,16 +571,19 @@ use the Android Back button for "cancel", "discard" or "back" actions. For example, when editing dive information, tapping the action button saves the changes while the Android back button can be used to cancel the edit without saving changes.

+

On iOS devices, on screens where a "back" action is enabled, a back arrow is +shown in the top left corner of the screen.

FIGURE: Action Button
-

Instead of the more traditional "hamburger" menu button in the top left or -right corner of the screen to open menus, Subsurface-mobile uses a -different user interaction philosophy based on the Kirigami framework -developed by the Plasma developers. To open the main menu one has three -options:

+

In order to have a consistent experience between iOS and Android, +Subsurface-mobile on Android does not use the traditional "hamburger" menu +button in the top left or right corner of the screen to open menus. +Instead, Subsurface-mobile uses a different user interaction philosophy +based on the Kirigami framework developed by the Plasma developers. There +are three ways to open the main menu:

  • @@ -612,9 +609,12 @@ Drag the action button visible on most screens to the right

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 one taps the GPS option on -the main menu. On the right is the menu that opens if one taps the Manage +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.

+

All screenshots in this user manual are currently from the Android +version. As indicated earlier, the iOS version currently doesn’t support +GPS features.

@@ -623,7 +623,7 @@ Dives option on the main menu.

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 one can scroll up and +(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.

@@ -632,25 +632,25 @@ well as additional information and notes.

FIGURE: Dive list screen -

One can view other dives by swiping the Details view to the right (for the +

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 also possible to delete the dive (tap the dustbin on the Action Bar) or to -view the dive location on a map viewer (normally Google Maps; tap the GPS -icon on the Action Bar.).

+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.).

6. Editing dive details

At the bottom of the dive details screen the Action Button contains a -pencil (image on right, above). Tapping the button brings up a panel with -edit boxes that allows one to change the existing dive information, +pencil (image on right, above). Tapping the pencil button brings up a panel +with edit boxes that allows you to change the existing dive information, e.g. adding text to the dive notes or changing the names or values of some of the information (see image below). It may be necessary to scroll the window to access all the information. At the bottom of the edit screen is a Save action button. Tap this to save the new information. Having saved the data, the dive list screen is updated and shown. To cancel any edits, tap -the Android Back Button.

+the Android Back Button or swipe the edit screen up (fling it away).

FIGURE: Dive edit screen @@ -661,16 +661,17 @@ the Android Back Button.

7. Adding a new dive to the dive list

-

It is also possible to manually add an additional dive to the existing dive -list. On the main menu tap Manage dives → Add dive manually. This opens a -screen that is identical to the editing screen discussed above. When a dive -is added manually, one cannot directly add a dive profile from a dive -computer. However, if one does not use a dive computer, the duration, depth -and several other bits of information about the new dive can be entered. The -Action button at the bottom of the screen contains a disk symbol. Tap this -to save the new dive. To cancel any edits, tap the Android Back Button. The -left-hand image below shows a screenshot of a dive being created and the -right-hand image shows the same dive in Details View.

+

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 Manage +dives → Add dive manually. This opens a screen that is identical to the +editing screen discussed above. When a dive is added manually, you cannot +directly add a dive profile from a dive computer. However, if you do not use +a dive computer, the duration, depth and several other bits of information +about the new dive can be entered. The Action button at the bottom of the +screen contains a disk symbol. Tap this to save the new dive. To cancel any +edits, tap the Android Back Button. The left-hand image below shows a +screenshot of a dive being created and the right-hand image shows the same +dive in Details View.

FIGURE: Manual dive entry screen @@ -682,7 +683,7 @@ right-hand image shows the same dive in Details View.

8. Deleting a dive

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. One has a brief +is tapped, the dive shown in the Details View is deleted. You have a brief opportunity to undo the delete by tapping the grey Undo button in the message that appears at the bottom of the screen (see image below).

@@ -690,7 +691,7 @@ message that appears at the bottom of the screen (see image below).

FIGURE: Undo delete dive
-

One can also delete a dive from the dive list by long-pressing a specific +

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). Tap the dustbin. The dive is deleted without asking any confirmation because Subsurface-mobile assumes that the combination of a long tap on @@ -711,7 +712,7 @@ using the Subsurface cloud storage. This provides security against los 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 tap the +dragging the Action Button to the right, or alternatively tappping the "Hamburger" icon at the bottom left of the screen). Tap the option Manage dives, enabling a number of options:

@@ -719,52 +720,47 @@ dives, enabling a number of options:

This is described above under the section dealing with the dive list.

-

9.2. Upload dive log to the Subsurface cloud storage

-

One can upload the dives contained on the mobile device to the Subsurface +

9.2. 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.

+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 +cloud storage.

-

9.3. Download dive log from the cloud storage

-

In the dive management subpanel, tap the option Manual sync with cloud, -causing the local divelog to be refreshed from the cloud so that the cloud -and local versions are synchronised.

+

9.3. Working offline or online

+

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 +to always sync with the cloud servers after every modification of the dive +list. This is not recommended unless you are in an area with fast and +reliable internet connection, as otherwise Subsurface-mobile might appear +to hang between operations as it tries to connect to the cloud server.

-

9.4. Working offline

-

Sometimes one wishes to use the app when an Internet connection is not -available, for instance at remote dive sites. In such a case -Subsurface-mobile may unnecesarily search for an Internet connection, -causing long delays in executing some functions. In the dive management -menu, one can turn the Internet access on or off by tapping the Offline -mode or Enable auto cloud sync options.

-
-
-

9.5. Changing the login credentials on the Subsurface cloud

-

It may be necessary to change one’s login credentials, for instance if one’s -email address (initially used as a credential) has changed. To change the -credentials, open the main menu and tap Cloud credentials. This opens the -setup screen for specifying new credentials.

+

9.4. 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.

-

10. Recording dive locations using GPS.

+

10. Recording dive locations using GPS (Android only).

-

The fact that most smartphones have GPS facilities allows one to record the -locations of dives. One can 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:

+

The fact that most smartphones have GPS facilities allows +Subsurface-mobile on Android to record the locations of dives. You can +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:

10.1. 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). One 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.

+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.

FIGURE: GPS setup screen @@ -777,8 +773,8 @@ button. The program is now ready to collect GPS positions.

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 the dive one can deactivate the collection of GPS data by -de-activating the same check box at the bottom of the main menu.

+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.

10.3. Storing the GPS data on the Subsurface cloud

@@ -791,15 +787,15 @@ or not.

10.4. Downloading GPS data from the Subsurface cloud

-

Download the GPS data that have been saved on the cloud by selecting -Download GPS Data from the GPS subpanel.

+

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.

10.5. 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 one taps the handle (the three horisontal stripes on the right, see image +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 @@ -815,7 +811,7 @@ drawing the GPS record to the right, again using the handle.

10.6. Applying GPS data to dives in the dive log

Assuming that all the dives have been entered into the dive log or have been -downloaded from the Subsurface cloud, one can apply the GPS positions to +downloaded from the Subsurface cloud, you can apply the GPS positions to these dives. GPS positions can therefore only be applied to dives in the dive list. From the GPS subpanel, tap GPS-tag dives. The dive list contains the start and end times of each dive. Now, Subsurface-mobile @@ -829,7 +825,7 @@ the dive log.

diff --git a/Documentation/mobile-manual_fr.txt b/Documentation/mobile-manual_fr.txt index fca3f668a..d93c7a803 100644 --- a/Documentation/mobile-manual_fr.txt +++ b/Documentation/mobile-manual_fr.txt @@ -5,52 +5,52 @@ image::mobile-images/banner.jpg["Banner", align="center"] -[big]#Subsurface-mobile pour Android: MANUEL UTILISATEUR# +[big]#Subsurface-mobile USER MANUAL# *Auteur du manuel* : Willem Ferguson toc::[] -[blue]#_Version 1.0, Mars 2016_# +[blue]#_Version 1.1, September 2016_# Welcome as a user of _Subsurface_, advanced dive logging software with extensive infrastructure to describe, organize, interpret and print scuba and free dives. _Subsurface_ offers many advantages over other similar software solutions, including compatibility with Windows, Mac-OS/X, Linux -(many distributions) and Android (iOS under development). In addition, -_Subsurface_ is open-source software that allows downloading dive -information from most dive computers. +(many distributions), Android and iOS. In addition, _Subsurface_ is +open-source software that allows downloading dive information from most dive +computers. Présentation de Subsurface-mobile --------------------------------- -_Subsurface-mobile_ est une extension de _Subsurface_ sur ordinateurs. Il -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. - -À cause des limitations d'iOS, _Subsurface-mobile_ pour iOS n'inclut pas -toutes les fonctionnalités présentes dans la version Android. - -While _Subsurface-mobile_ allows one to enter and save dive information -using an Android device, 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 Android and the desktop versions. 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 one to: +_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). + +_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. + +_Subsurface-mobile_ allows you to: - Download existing dive log information from the Internet. - View this information on a mobile device. - 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 one's dive log. -- Store the updated dive log on the Internet. -- Record, store and apply GPS positions of dives. +- Manually create and add new dive records to your dive log. +- 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 @@ -60,10 +60,10 @@ _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. -== Installing _Subsurface-mobile_ on an Android device +== Installing _Subsurface-mobile_ on your mobile device -Find _Subsurface-mobile_ in the _Google Play Store_. Search for -_Subsurface-mobile_ and install it. +Find _Subsurface-mobile_ in the _Google Play Store_ or the _iTunes Store_ +and install it. == Using _Subsurface-mobile_ for the first time @@ -75,15 +75,17 @@ image below on left). Select whether _Subsurface-mobile_ should access the Internet for dive log information. -=== When NOT Using Internet access -If the striked-out cloud icon is selected, the app will not access the -Internet to obtain dive log information. This means that dive log -information is manually entered and stored on the mobile device only. +=== 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. -=== Using Internet access -Since _Subsurface_ is largely dependent on a dive log saved on the Internet, -provide a PIN for access to the _Subsurface Cloud_, obtained in one of two -ways: +=== 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. ==== Using the desktop version of _Subsurface_: @@ -92,15 +94,15 @@ click _File -> Preferences -> Network_, explained in detail in the https://subsurface-divelog.org/documentation/subsurface-4-user-manual/#\_create_a_cloud_storage_account[user manual for the _Subsurface_ desktop version]. Once the account has been created and verified using the desktop version, -_Subsurface_ desktop alows one to download dive information from dive computers and store this +_Subsurface_ desktop alows you to download dive information from dive computers and store this on the cloud which can, in turn, be downloaded to _Subsurface-mobile_. _Subsurface-mobile_ attempts to download the existing dive log from the _Subsurface_ cloud server. Appropriate messages are shown onscreen. Finally a list of dives is shown. Once the dive list has been downloaded from the Internet, -_Subsurface-mobile_ keeps a local copy on the mobile device. This means -that, if there is no Internet connection at a dive site, one can still -access the local copy and view and manipulate dive information. If there is +_Subsurface-mobile_ keeps a local copy on the mobile device. This means that +even if there is no Internet connection at a dive site, you can still access +the local copy and view and manipulate dive information. If there is Internet connectivity, _Subsurface-mobile_ accesses the cloud-based dive log to verify that the local copy is still the same as the Internet-stored copy. If not, the local copy and the copy on the server are synchronised. @@ -127,19 +129,10 @@ 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. One can now start entering dives in the -dive log or one can download existing dives from the cloud. - -The text box to enter the PIN is shown whenever the e-mail address field is -empty. One can create a new cloud account by clearing the e-mail address -and typing a new e-mail address, upon which a new PIN is sent to the -newly-provided e-mail address. On the other hand, one can change to a -different existing cloud account by providing an e-mail address and password -already registered with the cloud server (image on right, above) +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. -Once Internet access has been enabled, one can temporarily disable this -service when using _Subsurface-mobile_ in areas with no Internet access, -e.g. remote dive sites (see below) == A Few Remarks About The User Interface @@ -151,13 +144,17 @@ example, when editing dive information, tapping the action button saves the changes while the Android back button can be used to cancel the edit without saving changes. +On iOS devices, on screens where a "back" action is enabled, a back arrow is +shown in the top left corner of the screen. + image::mobile-images/actionbutton.jpg["FIGURE: Action Button", align="center"] -Instead of the more traditional "hamburger" menu button in the top left or -right corner of the screen to open menus, _Subsurface-mobile_ uses a -different user interaction philosophy based on the Kirigami framework -developed by the Plasma developers. To open the main menu one has three -options: +In order to have a consistent experience between iOS and Android, +_Subsurface-mobile_ on Android does not use the traditional "hamburger" menu +button in the top left or right corner of the screen to open menus. +Instead, _Subsurface-mobile_ uses a different user interaction philosophy +based on the Kirigami framework developed by the Plasma developers. There +are three ways to open the main menu: - Tap the "hamburger" symbol in the lower left corner of the screen (easy to reach for hand held devices) @@ -168,67 +165,72 @@ image::mobile-images/menu.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 one taps the _GPS_ option on -the main menu. On the right is the menu that opens if one taps the _Manage +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. +All screenshots in this user manual are currently from the Android +version. As indicated earlier, the iOS version currently doesn't support +_GPS_ features. + == Viewing the Dive List 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 one can scroll up and +(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. image::mobile-images/DiveList.jpg["FIGURE: Dive list screen", align="center"] -One can view other dives by swiping the _Details view_ to the right (for the +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 also possible to delete the dive (tap the dustbin on the Action Bar) or to -view the dive location on a map viewer (normally Google Maps; tap the GPS -icon on the Action Bar.). +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.). == Editing dive details At the bottom of the dive details screen the _Action Button_ contains a -pencil (image on right, above). Tapping the button brings up a panel with -edit boxes that allows one to change the existing dive information, +pencil (image on right, above). Tapping the pencil button brings up a panel +with edit boxes that allows you to change the existing dive information, e.g. adding text to the dive notes or changing the names or values of some of the information (see image below). It may be necessary to scroll the window to access all the information. At the bottom of the edit screen is a _Save_ action button. Tap this to save the new information. Having saved the data, the dive list screen is updated and shown. To cancel any edits, tap -the Android Back Button. +the Android Back Button or swipe the edit screen up (fling it away). image::mobile-images/EditDive.jpg["FIGURE: Dive edit screen", align="center"] == Adding a new dive to the dive list -It is also possible to manually add an additional dive to the existing dive -list. On the main menu tap _Manage dives -> Add dive manually_. This opens a -screen that is identical to the editing screen discussed above. When a dive -is added manually, one cannot directly add a dive profile from a dive -computer. However, if one does not use a dive computer, the duration, depth -and several other bits of information about the new dive can be entered. The -_Action button_ at the bottom of the screen contains a disk symbol. Tap this -to save the new dive. To cancel any edits, tap the Android Back Button. The -left-hand image below shows a screenshot of a dive being created and the -right-hand image shows the same dive in _Details View_. +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 _Manage +dives -> Add dive manually_. This opens a screen that is identical to the +editing screen discussed above. When a dive is added manually, you cannot +directly add a dive profile from a dive computer. However, if you do not use +a dive computer, the duration, depth and several other bits of information +about the new dive can be entered. The _Action button_ at the bottom of the +screen contains a disk symbol. Tap this to save the new dive. To cancel any +edits, tap the Android Back Button. The left-hand image below shows a +screenshot of a dive being created and the right-hand image shows the same +dive in _Details View_. image::mobile-images/ManuallyEnterDive.jpg["FIGURE: Manual dive entry screen", align="center"] == Deleting a dive 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. One has a brief +is tapped, the dive shown in the _Details View_ is deleted. You have a brief opportunity to undo the delete by tapping the grey _Undo_ button in the message that appears at the bottom of the screen (see image below). image::mobile-images/Delete_undo.jpg["FIGURE: Undo delete dive", align="center"] -One can also delete a dive from the dive list by long-pressing a specific +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). Tap the dustbin. The dive is deleted without asking any confirmation because _Subsurface-mobile_ assumes that the combination of a long tap on @@ -244,7 +246,7 @@ 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 tap the +dragging the Action Button to the right, or alternatively tappping the "Hamburger" icon at the bottom left of the screen). Tap the option _Manage dives_, enabling a number of options: @@ -252,52 +254,47 @@ dives_, enabling a number of options: This is described above under the section dealing with the dive list. -=== Upload dive log to the _Subsurface_ cloud storage +=== Sync the dive log with the _Subsurface_ cloud storage -One can upload the dives contained on the mobile device to the _Subsurface_ +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. - -=== Download dive log from the cloud storage - -In the dive management subpanel, tap the option _Manual sync with cloud_, -causing the local divelog to be refreshed from the cloud so that the cloud -and local versions are synchronised. +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 +cloud storage. -=== Working offline +=== Working offline or online -Sometimes one wishes to use the app when an Internet connection is not -available, for instance at remote dive sites. In such a case -_Subsurface-mobile_ may unnecesarily search for an Internet connection, -causing long delays in executing some functions. In the dive management -menu, one can turn the Internet access on or off by tapping the _Offline -mode_ or _Enable auto cloud sync_ options. +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 +to always sync with the cloud servers after every modification of the dive +list. This is not recommended unless you are in an area with fast and +reliable internet connection, as otherwise _Subsurface-mobile_ might appear +to hang between operations as it tries to connect to the cloud server. === Changing the login credentials on the _Subsurface_ cloud -It may be necessary to change one's login credentials, for instance if one's -email address (initially used as a credential) has changed. To change the -credentials, open the main menu and tap _Cloud credentials_. This opens the -setup screen for specifying new credentials. +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. -== Recording dive locations using GPS. +== Recording dive locations using GPS (Android only). -The fact that most smartphones have GPS facilities allows one to record the -locations of dives. One can 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: +The fact that most smartphones have GPS facilities allows +_Subsurface-mobile_ on Android to record the locations of dives. You can +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: === 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). One 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. +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"] @@ -307,8 +304,8 @@ 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 the dive one can deactivate the collection of GPS data by -de-activating the same check box at the bottom of the main menu. +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 @@ -321,15 +318,15 @@ or not. === Downloading GPS data from the _Subsurface_ cloud -Download the GPS data that have been saved on the cloud by selecting -_Download GPS Data_ from the GPS subpanel. +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. === 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 one taps the handle (the three horisontal stripes on the right, see image +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 @@ -342,7 +339,7 @@ image::mobile-images/gpsmanagement.jpg["FIGURE: GPS management", align="center"] === Applying GPS data to dives in the dive log Assuming that all the dives have been entered into the dive log or have been -downloaded from the _Subsurface_ cloud, one can apply the GPS positions to +downloaded from the _Subsurface_ cloud, you can apply the GPS positions to these dives. GPS positions can therefore only be applied to dives in the dive list. From the GPS subpanel, tap _GPS-tag dives_. The dive list contains the start and end times of each dive. Now, _Subsurface-mobile_ diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git index 0101e2373..67866fee2 100644 --- a/Documentation/user-manual_fr.html.git +++ b/Documentation/user-manual_fr.html.git @@ -3238,26 +3238,26 @@ after 23 minutes. Cylinders with air are shown as a light blue bar.
- +
-Note +Note Display inert gas tissue pressures relative to ambient inert gas pressure -(horizontal grey line). Tissue pressures are calculated using the Bühlmann -ZH-L16 algorithm and are displayed as lines ranging from green (faster -tissues) to blue (slower tissues). The black line, graphed above the -ambient pressure, is the maximum allowable tissue supersaturation (pressure -limit) derived from the gradient factors specified in the Preferences. For -divers doing planned decompression diving, efficient rates of offgassing are -obtained with tissue pressures between the ambient inert gas pressure (grey -line) and the pressure limit (black line). This display is a representation -of the tissue pressures during the whole dive. In contrast, the -Gas Pressure Graph in the Information Box on -the Dive Profile is an instantaneous reflection of tissue pressures at the -moment in time, at the position of the cursor on the dive profile.Display that tissue heat-map. This is a representation of the inert gas +pressures in the different tissues of a decompression model. Faster tissues +are displayed on top while the slower tissues are shown on the bottom. The +color is a representation of the inert gas loading of the tissue. Blue +colors indicate the tissue’s inert gas pressure is below the ambient +pressure and the tissue is currently on-gasing. The more red the color is, +the higher the pressure is above the ambient pressure and the tissue is +off-gassing potentially releasing inert gases to the environment which can +be the cause for the formation of inert gas bubbles. This display is a +representation of the tissue pressures during the whole dive. In contrast, +the Gas Pressure Graph in the Information Box +on the Dive Profile is an instantaneous reflection of tissue pressures at +the moment in time, at the position of the cursor on the dive profile.
-Figure: Inert gas tissue pressure graph +Figure: Inert gas tissue pressure heat-map

Gradient Factor settings strongly affect the calculated ceilings and their @@ -4714,7 +4714,7 @@ In the table labelled Available Gases, add the information of the providing cylinder data for dive logs. Choose the cylinder type by double clicking the cylinder type and using the dropdown list, then specify the work pressure of this cylinder. By leaving the oxygen - concentration (O2%) filed empty, the cylinder is assumed to contain + concentration (O2%) field empty, the cylinder is assumed to contain air. Otherwise enter the oxygen and/or helium concentration in the boxes provided in this dialogue. Add additional cylinders by using the "+" icon to the top right-hand of the dialogue. @@ -4722,6 +4722,33 @@ In the table labelled Available Gases, add the information of the

  • +The Available Gases table includes three gas depth fields, labelled: +

    +
      +
    • +

      +Deco switch at: the switch depth for deco gases. Unless overridden by the user, this will be + automatically calculated based on the Deco pO₂ preference (default 1.6 bar) +

      +
      • +
    • +

      +Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom mix. Automatically + calculated based on the Bottom pO₂ preference (default 1.4 bar). Editing this field will modify the + O₂% according to the depth set. Set to '*' to calculate the best O₂% for the dive maximum depth. +

      +
      • +
    • +

      +MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based on the Best Mix END + preference (default 30m / 98 ft). Editing this field will modify the He% according to the depth set. + Set to '*' to calculate the best He% for the dive maximum depth. +

      +
      • +
    +
    • +
  • +

    The profile of the planned dive can be created in two ways:

      @@ -6951,7 +6978,7 @@ salvaged after being overwritten by new dives.

    diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt index e48b5aa4e..274acee05 100644 --- a/Documentation/user-manual_fr.txt +++ b/Documentation/user-manual_fr.txt @@ -2286,24 +2286,24 @@ after 23 minutes. Cylinders with air are shown as a light blue bar. image::images/ShowCylinders_f20.jpg["Figure: Cylinder use graph", align="center"] -[icon="images/icons/tissues.jpg"] +[icon="images/icons/heatmap.png"] [NOTE] -Display inert gas tissue pressures relative to ambient inert gas pressure -(horizontal grey line). Tissue pressures are calculated using the Bühlmann -ZH-L16 algorithm and are displayed as lines ranging from green (faster -tissues) to blue (slower tissues). The black line, graphed above the -ambient pressure, is the maximum allowable tissue supersaturation (pressure -limit) derived from the gradient factors specified in the *Preferences*. For -divers doing planned decompression diving, efficient rates of offgassing are -obtained with tissue pressures between the ambient inert gas pressure (grey -line) and the pressure limit (black line). This display is a representation -of the tissue pressures during the whole dive. In contrast, the -xref:S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box* on -the *Dive Profile* is an instantaneous reflection of tissue pressures at the -moment in time, at the position of the cursor on the dive profile. - -image::images/tissuesGraph.jpg["Figure: Inert gas tissue pressure graph", align="center"] +Display that tissue heat-map. This is a representation of the inert gas +pressures in the different tissues of a decompression model. Faster tissues +are displayed on top while the slower tissues are shown on the bottom. The +color is a representation of the inert gas loading of the tissue. Blue +colors indicate the tissue's inert gas pressure is below the ambient +pressure and the tissue is currently on-gasing. The more red the color is, +the higher the pressure is above the ambient pressure and the tissue is +off-gassing potentially releasing inert gases to the environment which can +be the cause for the formation of inert gas bubbles. This display is a +representation of the tissue pressures during the whole dive. In contrast, +the xref:S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box* +on the *Dive Profile* is an instantaneous reflection of tissue pressures at +the moment in time, at the position of the cursor on the dive profile. + +image::images/tissueHeatmap.jpg["Figure: Inert gas tissue pressure heat-map", align="center"] Gradient Factor settings strongly affect the calculated ceilings and their depths. For more information about Gradient factors, see the section on @@ -3330,11 +3330,21 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig <>. Choose the cylinder type by double clicking the cylinder type and using the dropdown list, then specify the work pressure of this cylinder. By leaving the oxygen - concentration (O2%) filed empty, the cylinder is assumed to contain + concentration (O2%) field empty, the cylinder is assumed to contain air. Otherwise enter the oxygen and/or helium concentration in the boxes provided in this dialogue. Add additional cylinders by using the "+" icon to the top right-hand of the dialogue. +- The _Available Gases_ table includes three gas depth fields, labelled: + ** Deco switch at: the switch depth for deco gases. Unless overridden by the user, this will be + automatically calculated based on the Deco pO₂ preference (default 1.6 bar) + ** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom mix. Automatically + calculated based on the Bottom pO₂ preference (default 1.4 bar). Editing this field will modify the + O₂% according to the depth set. Set to ''*'' to calculate the best O₂% for the dive maximum depth. + ** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based on the Best Mix END + preference (default 30m / 98 ft). Editing this field will modify the He% according to the depth set. + Set to ''*'' to calculate the best He% for the dive maximum depth. + - The profile of the planned dive can be created in two ways: * Drag the waypoints (the small white circles) on the existing dive profile to represent the dive. Additional waypoints can be created by double-clicking -- cgit v1.2.3-70-g09d2