diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-10-28 17:02:30 +0200 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-10-28 17:02:30 +0200 |
| commit | 6efb357249d757732af7f2f31d03cf82b946fce0 (patch) | |
| tree | 09cd4a318d5de9cb363325fef3814fd67eaddb41 /translations/subsurface_fr_FR.ts | |
| parent | 9fabb50040d73d35a1ff2714330ea58a34ec7cf7 (diff) | |
| download | subsurface-6efb357249d757732af7f2f31d03cf82b946fce0.tar.gz | |
Pull latest translations
Fixes #740
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_fr_FR.ts')
| -rw-r--r-- | translations/subsurface_fr_FR.ts | 511 |
1 files changed, 272 insertions, 239 deletions
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index c141dc6bb..89c28acb2 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -1785,27 +1785,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="260"/> <source>Clicking here will remove this cylinder.</source> <translation>Retirer ce bloc.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="272"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Profondeur de changement pour le gaz de déco. Calculé en utilisant les préférences de pO2 de déco, à moins qu'elle ne soit définie manuellement.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="275"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Calculé en utilisant les préférences de pO2 de fond. La modification du MOD ajuste le taux d'O₂ sur '*' permettant un meilleur taux à la profondeur max.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="278"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Calculé en utilisant les préférences du Meilleur Mélange du END. La modification du MND ajuste le taux d'He sur '*' permettant un meilleur taux à la profondeur max.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="258"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Ce gaz est utilisé. Seuls les blocs qui ne sont pas utilisés dans la plongée peuvent être retirés.</translation> </message> @@ -2052,67 +2052,67 @@ GPS actuelle :</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Aucun profile à afficher</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Combinaison :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Température de l'air :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Bloc :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Température de l'eau :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>Ajouter à la Carte</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Évaluation :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation>Visibilité :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Moniteur / Guide de palanquée :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Poids:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Équipier :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -2120,23 +2120,23 @@ GPS actuelle :</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation>(Bloc. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Passer manuellement sur OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> début</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> fin</translation> @@ -2174,23 +2174,23 @@ GPS actuelle :</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="288"/> <source>Dive list</source> <translation>Liste de plongée</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="278"/> <source>Cloud credentials</source> <translation>Informations de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="284"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Veuillez cliquer sur le bouton '+' pour ajouter une plongée (ou télécharger des plongées depuis un ordinateur supporté)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="309"/> <source>No dives in dive list</source> <translation>Aucune plongée dans la liste de plongée</translation> </message> @@ -2301,12 +2301,12 @@ GPS actuelle :</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Créer un nouveau site de plongée, en copiant les informations pertinentes de la plongée actuelle.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Créer un nouveau site de plongée avec ce nom</translation> </message> @@ -2966,27 +2966,33 @@ GPS actuelle :</translation> <translation>inconnu</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation>bloc</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Prof. finale</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Durée de plongée</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Gaz utilisés</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>Setpoint CC</translation> </message> @@ -3022,112 +3028,107 @@ GPS actuelle :</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Profondeur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Heure</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Pression</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Température</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Couleur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Entré par l'utilisateur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Index du bloc</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Pression S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Pression I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Plafond</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Consigne</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Capteur 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Capteur 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Capteur 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Pression ambiante</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Freq. cardiaque</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Facteur de gradient (GF)</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Prof. moyenne @ s</translation> </message> @@ -3447,33 +3448,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Télécharger</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Choisir le mode de téléchargement Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation>Connexion vers l'ordinateur de plongée</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Trouver l'ordinateur de plongée Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Annuler le téléchargement</translation> </message> @@ -3580,7 +3581,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Télécharger</translation> </message> @@ -3606,7 +3607,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Annuler</translation> </message> @@ -3621,52 +3622,52 @@ p, li { white-space: pre-wrap; } <translation>Le Bluetooth n'est pas activé</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Nom du fournisseur :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Ordinateur de plongée :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation>Connexion :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Réessayer</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Quitter</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Plongées téléchargées</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation>Info :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="254"/> <source>Accept</source> <translation>Accepter</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> <source>Select All</source> <translation>Tout sélectionner</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="279"/> <source>Unselect All</source> <translation>Tout désélectionner</translation> </message> @@ -3697,12 +3698,12 @@ p, li { white-space: pre-wrap; } <translation>Se connecter à Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="324"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Déconnectez-vous de Facebook en utilisant le menu 'Partager sur'.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Identifiez-vous à Facebook afin de publier vos plongées sur votre profil</translation> </message> @@ -3710,22 +3711,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="187"/> <source>Facebook logged in successfully</source> <translation>Connexion à Facebook réussie</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="190"/> <source>Error, unknown user id, cannot login.</source> <translation>Erreur, identifiant inconnu, impossible de se connecter.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> <source>Dive uploaded successfully to Facebook</source> <translation>Plongée envoyée avec succès à Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="290"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Échec de l'envoi de la plongée. Veuillez vérifier les informations de débogage et les envoyer à liste de diffusion de Subsurface</translation> </message> @@ -3976,7 +3977,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Gestion des sites de plongée</translation> </message> @@ -3998,7 +3999,7 @@ p, li { white-space: pre-wrap; } cette opération. Voulez-vous vraiment continuer ?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Vous modifiez un site de plongée</translation> </message> @@ -4226,12 +4227,12 @@ cette opération. Voulez-vous vraiment continuer ?</translation> <translation>Nouveau site de plongée</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Abandonner les modifications ?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Vous perdrez les modifications non enregistrées.</translation> </message> @@ -4645,7 +4646,7 @@ cette opération. Voulez-vous vraiment continuer ?</translation> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1586"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d'ouvrir un nouveau fichier.</translation> </message> @@ -4656,34 +4657,39 @@ cette opération. Voulez-vous vraiment continuer ?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Annuler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="586"/> + <source>Don't save an empty log to the cloud</source> + <translation>Ne pas enregistrer un journal vide dans le cloud</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> <source>Traverse image directories</source> <translation>Traverser les dossiers d'images</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> <source>Scan</source> <translation>Scanner</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Scanning images...(this can take a while)</source> <translation>Analyse des images ... (merci de patienter)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="814"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1009"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1015"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Warning</source> <translation>Avertissement</translation> </message> @@ -4693,105 +4699,105 @@ cette opération. Voulez-vous vraiment continuer ?</translation> <translation>Tentative de fusion des plongées compris dans un intervalle de temps de %1 minutes</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="693"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant de fermer le fichier.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="814"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d'ajouter une nouvelle plongée.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="866"/> <source>Print runtime table</source> <translation>Imprimer le tableau de runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="924"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Tentative de replanification d'une plongée qui n'est pas une plongée planifiée.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1009"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Merci de finir l'édition en cours avant d'en commencer une autre.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1015"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Tentative de modification d'une plongée qui n'a pas été ajoutée manuellement.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1062"/> <source>Yearly statistics</source> <translation>Statistiques annuelles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Voulez-vous enregistrer les modifications du fichier %1 ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Voulez-vous enregistrer les modifications du fichier de données ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> <source>Save changes?</source> <translation>Enregistrer les modifications ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1294"/> <source>Changes will be lost if you don't save them.</source> <translation>Les modifications seront perdues si vous ne les enregistrez pas.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1613"/> <source>Save file as</source> <translation>Enregistrer le fichier sous</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1614"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> <source>[local cache for] %1</source> <translation>[cache local pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1713"/> <source>[cloud storage for] %1</source> <translation>[stockage dans le cloud pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1829"/> <source>Opening datafile from older version</source> <translation>Ouverture du fichier de données à partir d'une version antérieure</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Vous avez ouvert un fichier de données d'une version plus ancienne de Subsurface. Nous vous recommandons de lire le manuel à propos des modifications apportées par la nouvelle version, particulièrement à propos de la gestion des sites de plongées qui a été grandement modifiée. Subsurface a déjà essayé de pré-remplir les données mais il est préférable que vous regardiez le nouveau système de gestion des sites de plongées pour vous assurer que tout est correct.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1841"/> <source>Open dive log file</source> <translation>Ouvrir le fichier de carnet de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Fichiers log de plongée (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Contact du service cloud...</translation> </message> @@ -4799,7 +4805,7 @@ Subsurface a déjà essayé de pré-remplir les données mais il est préférabl <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="256"/> <source>Drag the selected dive location</source> <translation>Déplacer le lieu de plongée sélectionné</translation> </message> @@ -5137,8 +5143,8 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Disposition des sites de plongées</translation> + <source>Dive site layout</source> + <translation>Structure des sites de plongées</translation> </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> @@ -5797,28 +5803,28 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Importer</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Importer un fichier modèle</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>Fichiers HTML (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Exporter le fichier modèle</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Cette action ne peut être annulée !</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Supprimer le modèle : %1 ?</translation> </message> @@ -5826,12 +5832,12 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (n°%1 sur %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Ordinateur de plongée inconnu</translation> </message> @@ -5856,12 +5862,12 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Choisir comme odinateur principale</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>Plongée planifiée</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>Plongée ajoutée manuellement </translation> </message> @@ -5950,147 +5956,147 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Démarrage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation>Ouvrir les données de plongée local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation>L'ouverture du fichier local de données a échoué</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 plongées chargées depuis le fichier local de données de plongées</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>Travail hors-ligne</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation>Erreur d'analyse du fichier de stockage local, abandon</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>Pas d'information de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Entrez vos informations de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>L'e-mail et le mot de passe du stockage dans le cloud peuvent uniquement comporter des lettres, nombres et '.', '-', '_' et '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation>Format invalide pour l'adresse e-mail</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Essais d'ouverture du stockage dans le cloud avec les nouvelles informations de connexion</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Test des informations de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>Pas de réponses du serveur pour la validation des informations de connexion</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation>Informations de connexion au cloud incorrectes</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Impossible de se connecter au cloud, compte non vérifié</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Informations de connexion pour le cloud invalides</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Impossible de se connecter au cloud: Erreur à la création de la connexion https</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Impossible d'ouvrir le stockage dans le cloud: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Impossible de se connecter au cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation>Informations de connexion au cloud valides, chargement des plongées...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Erreur cloud : %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Chargement des plongées depuis le stockage local (mode 'no cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Echec de la connexion vers le serveur cloud, retour vers l'état sans cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Stockage cloud ouvert avec succès. Aucune plongée dans la liste.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Location GPS inconnue</translation> </message> @@ -6248,6 +6254,16 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Malformed XML response. Line %1: %2</source> <translation>Réponse XML mal formée. Ligne %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Aucune catégorie de structure des sites de plongées définie dans les préférences !</translation> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Étiquettes</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6663,64 +6679,64 @@ Fichiers avec dates/heures incorrectes</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="364"/> <source>Small</source> <translation>Petit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="365"/> <source>Medium</source> <translation>Moyen</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="385"/> <source>Dive date: %1 </source> <translation>Date de plongée : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> <source>Duration: %1 </source> <translation>Durée : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="389"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="390"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="393"/> <source>Dive location: %1 </source> <translation>Lieu de plongée : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Buddy: %1 </source> <translation>Équipier(s) : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Divemaster: %1 </source> <translation>Guide/Moniteur : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source> %1</source> <translation> @@ -6813,12 +6829,12 @@ Fichiers avec dates/heures incorrectes</translation> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation>Pour utiliser Subsurface-mobile avec le stockage cloud de Subsurface, veuillez entrer vos identifiants cloud. <br/><br/>Si c'est la première fois que vous utilisez le stockage cloud de Subsurface, entrez un e-mail valide (en minuscules) et un mot de passe de votre choix (lettres et nombres).<br/><br/> Pour utiliser Subsurface-mobile uniquement avec des données locales, sur ce périphérique, cliquez sur le bouton Pas de cloud.</translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation>Merci de vous être enregistré avec Subsurface. Nous vous avons envoyé <b>%1</b> un code PIN pour terminer l'enregistrement. Si vous n'avez pas reçu d'e-mail de notre part dans les 15 minutes, veuillez vérifier l'adresse e-mail fournie et votre dossier spam. <br/><br/>En cas de problème avec la configuration du compte cloud, contactez-nous sur notre forum utilisateur (https://subsurface-divelog.org/user-forum/).<br/></translation> </message> @@ -8401,8 +8417,8 @@ Maximum</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>oxygène</translation> </message> @@ -8487,15 +8503,15 @@ Maximum</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>air</translation> </message> @@ -8893,7 +8909,7 @@ Maximum</translation> <message> <location filename="../core/libdivecomputer.c" line="958"/> <source>model=%s firmware=%u serial=%u</source> - <translation>modèle=%s firmware=%s port série=%s</translation> + <translation>modèle=%s firmware=%u port série=%u</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="1020"/> @@ -9000,21 +9016,21 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Avertissement :</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, GF effectif = %d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>Changer SP</translation> @@ -9030,195 +9046,211 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation>Planification de la plongée</b>(Chevauchement de plongées détecté)</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime : %dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>profondeur</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>durée</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gaz</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Transition de %.*f %s en %d:%02d min - runtime %d:%02u sur %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transition de %.*f %s en %d:%02d min - runtime %d:%02u sur %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Rester à %.*f %s pendant %d:%02d min - runtime %d:%02u sur %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Rester à %.*f %s pendant %d:%02d min - runtime %d:%02u sur %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Changer de gaz vers %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Changer de gaz vers %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>SNC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Modèle de déco : VPM-B au conservatisme nominal</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation>Gaz minimum</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation>basé sur</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>Consommation d'air (SAC)</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>Plannification de la plongée</b> (intervalle de surface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>crée le</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>Plannification de la plongée </b> crée le</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> + <location filename="../core/plannernotes.c" line="114"/> <source>Runtime: %dmin VARIATIONS<br></div></source> <translation>Runtime : %dmin VARIATIONS<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modèle de déco : Bühlmann ZHL-16C avec GF Low = %d%% et GF High = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Modèle de déco : VPM-B au conservatisme +%d</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modèle de déco : Mode loisir basé sur Bühlmann ZHL-16B avec GF Low = %d%% et GF High = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Pression ATM : %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consommation de gaz (segments CCR exclus) :</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Consommation de gaz (basé sur un SAC de</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>C'est plus de gaz que ce qui est disponible dans le bloc spécifié !</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Réserve insuffisant pour un échange lors de la remontée !</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum de gaz</span> (basé sur %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>La quantité de gaz minimum nécessaire pour une remontée dépasse la quantité initialement disponible dans le bloc !</translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s en remontée planifiée)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s pendant la remontée planifiée) de %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valeur pO₂ haute %.2f à %d:%02u avec le gaz %s à la profondeur de %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valeur pO₂ basse %.2f à %d:%02u avec le gaz %s à la profondeur de %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Impossible de trouver le gaz %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>nitrox</translation> </message> @@ -10175,6 +10207,7 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <translation>Durée :</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10280,7 +10313,7 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <translation>Profondeur</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>Points de cheminement prévu au-dessus du plafond</translation> </message> |