diff options
| -rw-r--r-- | translations/subsurface_de_CH.ts | 883 | ||||
| -rw-r--r-- | translations/subsurface_el_GR.ts | 24 | ||||
| -rw-r--r-- | translations/subsurface_fi_FI.ts | 482 | ||||
| -rw-r--r-- | translations/subsurface_fr_FR.ts | 489 | ||||
| -rw-r--r-- | translations/subsurface_ru_RU.ts | 491 | ||||
| -rw-r--r-- | translations/subsurface_sv_SE.ts | 2 | ||||
| -rw-r--r-- | translations/subsurface_zh_TW.ts | 510 |
7 files changed, 1486 insertions, 1395 deletions
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index 35eba2694..838df2b89 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -5,18 +5,18 @@ <location filename="../mobile-widgets/qml/About.qml" line="10"/> <location filename="../mobile-widgets/qml/About.qml" line="19"/> <source>About Subsurface-mobile</source> - <translation type="unfinished"/> + <translation>Über Subsurface-mobile</translation> </message> <message> <location filename="../mobile-widgets/qml/About.qml" line="36"/> <source>A mobile version of the free Subsurface divelog software. </source> - <translation type="unfinished"/> + <translation>Eine mobile Version des freien Subsurface Tauch-Logbuchs </translation> </message> <message> <location filename="../mobile-widgets/qml/About.qml" line="37"/> <source>View your dive logs while on the go.</source> - <translation type="unfinished"/> + <translation>Das Logbuch zum Mitnehmen</translation> </message> <message> <location filename="../mobile-widgets/qml/About.qml" line="48"/> @@ -24,7 +24,10 @@ © Subsurface developer team 2011-2017</source> - <translation type="unfinished"/> + <translation>Version: %1 + +© Subsurface Entwickler Team +2011-2017</translation> </message> </context> <context> @@ -309,12 +312,12 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/> <source>Cloud credentials</source> - <translation type="unfinished"/> + <translation>Cloud Benutzerdaten</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/> <source>Email</source> - <translation type="unfinished"/> + <translation>EMail</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/> @@ -324,12 +327,12 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/> <source>Show password</source> - <translation type="unfinished"/> + <translation>Passwort anzeigen</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/> <source>PIN</source> - <translation type="unfinished"/> + <translation>PIN</translation> </message> </context> <context> @@ -916,31 +919,31 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/> <source>End Depth</source> - <translation type="unfinished"/> + <translation>Tiefe am Ende</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/> <source> s</source> - <translation type="unfinished"/> + <translation> s</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/> <source>Length</source> - <translation type="unfinished"/> + <translation>Länge</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/> <source>Start Depth</source> - <translation type="unfinished"/> + <translation>Starttiefe</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/> <source>Reset Depth</source> - <translation type="unfinished"/> + <translation>Tiefe zurücksetzen</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/> @@ -1106,12 +1109,12 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/> <source>Temperature sensor offset</source> - <translation type="unfinished"/> + <translation>Temperatursensoroffset</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1172"/> <source>°C</source> - <translation type="unfinished"/> + <translation>°C</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1192"/> @@ -1541,9 +1544,9 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> <source>Actions</source> - <translation type="unfinished"/> + <translation>Aktionen</translation> </message> </context> <context> @@ -1586,17 +1589,17 @@ <message> <location filename="../qt-models/cylindermodel.cpp" line="17"/> <source>Deco switch at</source> - <translation type="unfinished"/> + <translation>Gaswechsel bei</translation> </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="17"/> <source>Bot. MOD</source> - <translation type="unfinished"/> + <translation>Grund MOD</translation> </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="17"/> <source>MND</source> - <translation type="unfinished"/> + <translation>MND</translation> </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="17"/> @@ -1604,42 +1607,42 @@ <translation>Verwenden</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="44"/> + <location filename="../qt-models/cylindermodel.cpp" line="43"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="48"/> + <location filename="../qt-models/cylindermodel.cpp" line="47"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="229"/> + <location filename="../qt-models/cylindermodel.cpp" line="235"/> <source>Clicking here will remove this cylinder.</source> <translation>Hier klicken entfernt diese Flasche.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="239"/> + <location filename="../qt-models/cylindermodel.cpp" line="247"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> - <translation type="unfinished"/> + <translation>Tiefe für Gaswechsel, berechnet mittels Deko-pO₂ Voreinstellung, falls nicht explizit gesetzt.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="242"/> + <location filename="../qt-models/cylindermodel.cpp" line="250"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</source> - <translation type="unfinished"/> + <translation>Berechnet mittels pO₂ Voreinstellung. Setzen der MOD verändert O₂%. '*' als Wert wählt Best Mix O₂% bei maximaler Tiefe.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="245"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</source> - <translation type="unfinished"/> + <translation>Berechnet mittels Best Mix END Voreinstellung. Setzen der MND verändert He%, '*' als Wert verwendet besten He-Anteil bei Maximaltiefe.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="503"/> + <location filename="../qt-models/cylindermodel.cpp" line="522"/> <source>Cylinder cannot be removed</source> <translation>Flasche kann nicht entfernt werden</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="504"/> + <location filename="../qt-models/cylindermodel.cpp" line="523"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation> </message> @@ -1754,7 +1757,7 @@ <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/> <source>Dive details</source> - <translation type="unfinished"/> + <translation>Tauchgangsdetails</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/> @@ -1764,7 +1767,12 @@ <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/> <source>Show on map</source> - <translation type="unfinished"/> + <translation>Kartenansicht</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <source>Multiple Buddies</source> + <translation>mehrere Tauchpartner</translation> </message> </context> <context> @@ -1772,7 +1780,7 @@ <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/> <source>Dive %1</source> - <translation type="unfinished"/> + <translation>Tauchgang %1</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/> @@ -1787,13 +1795,14 @@ <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/> <source>Coordinates:</source> - <translation type="unfinished"/> + <translation>Koordinaten:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/> <source>Use current GPS location:</source> - <translation type="unfinished"/> + <translation>Momentante GPS- +Position verwenden</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/> @@ -1828,7 +1837,7 @@ GPS location:</source> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/> <source>Dive Master:</source> - <translation type="unfinished"/> + <translation>Divemaster:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/> @@ -1838,22 +1847,22 @@ GPS location:</source> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Cylinder:</source> - <translation type="unfinished"/> + <translation>Flasche:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/> <source>Gas mix:</source> - <translation type="unfinished"/> + <translation>Gemisch:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/> <source>Start Pressure:</source> - <translation type="unfinished"/> + <translation>Anfangsdruck:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/> <source>End Pressure:</source> - <translation type="unfinished"/> + <translation>Enddruck:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/> @@ -1866,27 +1875,27 @@ GPS location:</source> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Date: </source> - <translation type="unfinished"/> + <translation>Datum:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/> <source>Depth: </source> - <translation type="unfinished"/> + <translation>Tiefe:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/> <source>Duration: </source> - <translation type="unfinished"/> + <translation>Dauer:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/> <source>No profile to show</source> - <translation type="unfinished"/> + <translation>Kein Profil vorhanden</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/> <source>Dive Details</source> - <translation type="unfinished"/> + <translation>Tauchgangsdetails</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/> @@ -1901,7 +1910,7 @@ GPS location:</source> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/> <source>Cylinder:</source> - <translation type="unfinished"/> + <translation>Flasche:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/> @@ -1911,7 +1920,7 @@ GPS location:</source> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/> <source>Dive Master:</source> - <translation type="unfinished"/> + <translation>Divemaster:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/> @@ -1989,32 +1998,32 @@ GPS location:</source> <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/> <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/> <source>Dive list</source> - <translation type="unfinished"/> + <translation>Tauchgangliste</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/> <source>Depth: </source> - <translation type="unfinished"/> + <translation>Tiefe:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/> <source>Duration: </source> - <translation type="unfinished"/> + <translation>Dauer:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/> <source>Cloud credentials</source> - <translation type="unfinished"/> + <translation>Cloud Benutzerdaten</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/> <source>Please tap the '+' button to add a dive</source> - <translation type="unfinished"/> + <translation>Bitte tippe den '+' Knopf, um einen Tauchgang hinzuzufügen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> <source>No dives in dive list</source> - <translation type="unfinished"/> + <translation>Keine Tauchgänge in der Tauchgangsliste.</translation> </message> </context> <context> @@ -2102,12 +2111,12 @@ GPS location:</source> <message> <location filename="../desktop-widgets/divelistview.cpp" line="897"/> <source>Load image from web</source> - <translation type="unfinished"/> + <translation>Bild aus Web laden</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="974"/> <source>%1 does not appear to be an image</source> - <translation type="unfinished"/> + <translation>%1 scheint kein Bild zu sein</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="919"/> @@ -2188,7 +2197,7 @@ GPS location:</source> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/> <source>TeX</source> - <translation type="unfinished"/> + <translation>TeX</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/> @@ -2370,7 +2379,7 @@ GPS location:</source> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/> <source>Write dive as TeX macros to file.</source> - <translation type="unfinished"/> + <translation>Schreibe den Tauchgang als TeX-Makros in Datei.</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/> @@ -2423,12 +2432,12 @@ GPS location:</source> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/> <source>Export to TeX file</source> - <translation type="unfinished"/> + <translation>Export in TeX-Datei</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/> <source>TeX files (*.tex)</source> - <translation type="unfinished"/> + <translation>TeX Dateien (*.tex)</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/> @@ -2746,7 +2755,12 @@ GPS location:</source> <message> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/> <source>%1 dive(s)</source> - <translation type="unfinished"/> + <translation>%1 Tauchgänge</translation> + </message> + <message> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <source>Multiple Buddies</source> + <translation>mehrere Tauchpartner</translation> </message> </context> <context> @@ -2790,32 +2804,32 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="137"/> + <location filename="../qt-models/diveplannermodel.cpp" line="142"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="327"/> + <location filename="../qt-models/diveplannermodel.cpp" line="332"/> <source>Final depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="329"/> + <location filename="../qt-models/diveplannermodel.cpp" line="334"/> <source>Run time</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="331"/> + <location filename="../qt-models/diveplannermodel.cpp" line="336"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="333"/> + <location filename="../qt-models/diveplannermodel.cpp" line="338"/> <source>Used gas</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="335"/> + <location filename="../qt-models/diveplannermodel.cpp" line="340"/> <source>CC setpoint</source> <translation>CC Sollwert</translation> </message> @@ -3147,7 +3161,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-models/divetripmodel.cpp" line="523"/> <source>Photos before/during/after dive</source> - <translation type="unfinished"/> + <translation>Fotos vor/während/nach dem Tauchgang</translation> </message> </context> <context> @@ -3160,7 +3174,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> <source>stylesheet to export to divelogs.de is not found</source> - <translation type="unfinished"/> + <translation>Formatvorlage zum Exportieren auf divelogs.de nicht gefunden</translation> </message> <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/> @@ -3175,12 +3189,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/> <source>Conversion of dive %1 to divelogs.de format failed</source> - <translation type="unfinished"/> + <translation>Konvertierung von Tauchgang %1 in divelogs.de-Format ist fehlgeschlagen</translation> </message> <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> - <translation type="unfinished"/> + <translation>Fehler beim Schreiben der ZIP-Datei: %s ZIP-Fehler %d Systemfehler %d - %s</translation> </message> <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/> @@ -3425,12 +3439,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="38"/> <source> Vendor name : </source> - <translation type="unfinished"/> + <translation>Hersteller:</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="42"/> <source> Dive Computer:</source> - <translation type="unfinished"/> + <translation>Tauchcomputer:</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="54"/> @@ -3446,12 +3460,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Downloaded dives</source> - <translation type="unfinished"/> + <translation>Ausgelesene Tauchgänge</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="79"/> <source>Date / Time</source> - <translation type="unfinished"/> + <translation>Datum / Zeit</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="84"/> @@ -3476,7 +3490,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="115"/> <source>Unselect All</source> - <translation type="unfinished"/> + <translation>Alle abwählen</translation> </message> </context> <context> @@ -3507,7 +3521,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="254"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> - <translation type="unfinished"/> + <translation>Die Facebook-Verbindung kann mit dem "Teilen" Menüeintrag beendet werden.</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="263"/> @@ -3602,9 +3616,9 @@ bitte sende Folgendes an die Entwickler. <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> <source>Back</source> - <translation type="unfinished"/> + <translation>Zurück</translation> </message> </context> <context> @@ -3620,12 +3634,12 @@ bitte sende Folgendes an die Entwickler. <message> <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/> <source>GPS Fixes</source> - <translation type="unfinished"/> + <translation>GPS Positionen</translation> </message> <message> <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/> <source>Date: </source> - <translation type="unfinished"/> + <translation>Datum:</translation> </message> <message> <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/> @@ -3635,17 +3649,17 @@ bitte sende Folgendes an die Entwickler. <message> <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/> <source>Latitude: </source> - <translation type="unfinished"/> + <translation>Länge:</translation> </message> <message> <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/> <source>Longitude: </source> - <translation type="unfinished"/> + <translation>Breite:</translation> </message> <message> <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/> <source>List of stored GPS fixes</source> - <translation type="unfinished"/> + <translation>Liste der GPS-Positionen</translation> </message> </context> <context> @@ -3653,7 +3667,7 @@ bitte sende Folgendes an die Entwickler. <message> <location filename="../core/gpslocation.cpp" line="121"/> <source>Unknown GPS location</source> - <translation type="unfinished"/> + <translation>Unbekannte GPS-Position</translation> </message> </context> <context> @@ -3692,7 +3706,7 @@ bitte sende Folgendes an die Entwickler. <message numerus="yes"> <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>, %n dive(s) here)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>, %n Tauchgang hier)</numerusform><numerusform>, %n Tauchgänge hier)</numerusform></translation> </message> <message> <location filename="../desktop-widgets/modeldelegates.cpp" line="508"/> @@ -3821,7 +3835,7 @@ Möchtest Du fortfahren?</translation> <location filename="../mobile-widgets/qml/Log.qml" line="15"/> <location filename="../mobile-widgets/qml/Log.qml" line="23"/> <source>Application Log</source> - <translation type="unfinished"/> + <translation>Applikationslog</translation> </message> </context> <context> @@ -4099,7 +4113,7 @@ Möchtest Du fortfahren?</translation> <message> <location filename="../desktop-widgets/maintab.cpp" line="97"/> <source>Freedive</source> - <translation type="unfinished"/> + <translation>Freitauchgang</translation> </message> <message> <location filename="../desktop-widgets/maintab.cpp" line="303"/> @@ -4232,12 +4246,12 @@ den folgenden Gasen gemischt werden: <message> <location filename="../desktop-widgets/maintab.cpp" line="1594"/> <source>Deleting Images</source> - <translation type="unfinished"/> + <translation>Bilder löschen</translation> </message> <message> <location filename="../desktop-widgets/maintab.cpp" line="1594"/> <source>Are you sure you want to delete all images?</source> - <translation type="unfinished"/> + <translation>Wirklich alle Bilder löschen?</translation> </message> <message> <location filename="../desktop-widgets/maintab.cpp" line="1653"/> @@ -4252,12 +4266,12 @@ den folgenden Gasen gemischt werden: <message> <location filename="../desktop-widgets/maintab.cpp" line="1656"/> <source>Delete selected images</source> - <translation type="unfinished"/> + <translation>Ausgewählte Bilder löschen</translation> </message> <message> <location filename="../desktop-widgets/maintab.cpp" line="1657"/> <source>Delete all images</source> - <translation type="unfinished"/> + <translation>Alle Bilder Löschen</translation> </message> </context> <context> @@ -4746,7 +4760,7 @@ den folgenden Gasen gemischt werden: <message> <location filename="../desktop-widgets/mainwindow.ui" line="688"/> <source>Toggle tissue heat-map</source> - <translation type="unfinished"/> + <translation>Gewebe-Heatmap</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="693"/> @@ -4808,23 +4822,23 @@ den folgenden Gasen gemischt werden: <message> <location filename="../desktop-widgets/mainwindow.ui" line="744"/> <source>Take cloud storage online</source> - <translation type="unfinished"/> + <translation>Verbinden zum Cloud-Dienst</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="332"/> <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> <source>Connect to</source> - <translation type="unfinished"/> + <translation>Verbinden mit</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="358"/> <source>Disconnect from</source> - <translation type="unfinished"/> + <translation>Trennen von</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="506"/> <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1562"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor eine neue Datei geöffnet wird.</translation> </message> @@ -4836,7 +4850,7 @@ den folgenden Gasen gemischt werden: <message> <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -4859,9 +4873,9 @@ den folgenden Gasen gemischt werden: <location filename="../desktop-widgets/mainwindow.cpp" line="662"/> <location filename="../desktop-widgets/mainwindow.cpp" line="809"/> <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="998"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <source>Warning</source> <translation>Warnung</translation> </message> @@ -4886,85 +4900,85 @@ den folgenden Gasen gemischt werden: <translation>Es wird versucht, einen Tauchgang, der ursprünglich nicht im Planer erstellt wurde, im Planer zu öffnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Bitte zuerst die aktuelle Bearbeitung abschliessen um eine neue zu beginnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="998"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Versuche einenTauchgang zu bearbeiten der nicht manuell angelegt wurde.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1045"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1262"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Möchtest Du Deine Änderungen in der Datendatei speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> <source>Changes will be lost if you don't save them.</source> <translation>Änderungen gehen verloren, wenn Du sie nicht speicherst.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> <source>[local cache for] %1</source> - <translation type="unfinished"/> + <translation>[Lokaler Zwischenspeicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/> <source>[cloud storage for] %1</source> <translation>[Cloud Speicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1803"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/> <source>Opening datafile from older version</source> <translation>Datendatei von älterer Version wird geöffnet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1804"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/> <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>Es wurde eine Datei von einer älteren Subsurface-Version geöffnet. Wir empfehlen das Handbuch zu lesen, um die Unterschiede der neuen Version insbesondere in der Tauchplatzverwaltung kennen zu lernen. Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die neue Tauchplatzverwaltung anzuschauen und sicher zu stellen, dass alles richtig aussieht. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1817"/> <source>Open dive log file</source> <translation>Tauchprotokolldatei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1816"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <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 type="unfinished"/> + <translation>Logbuchdateien (*.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 Dateien (*.dld *.DLD);;JDiveLog Dateien (*.jlb *.JLB);;Liquivision Dateien (*.lvd *.LVD);;MkVI Dateien (*.txt *.TXT);;Suunto Dateien (*.sde *.db *.SDE *.DB);;Divesoft Dateien (*.dlf *.DLF);;UDDF/UDCF Dateien (*.uddf *.udcf *.UDDF *.UDCF);;XML Dateien (*.xml *.XML);;APD log Betrachter (*.apd *.APD);;Datatrak/WLog Dateien (*.log *.LOG);;OSTCtools Dateien (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Alle Dateien (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Contacting cloud service...</source> <translation>Kontaktiere Cloud Service...</translation> </message> @@ -4989,7 +5003,9 @@ Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> - <translation type="unfinished"/> + <translation> + +Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen wie für ein Logbuch-Download treffen, bevor mit dem Update fortgefahren wird.</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="293"/> @@ -5014,7 +5030,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="315"/> <source>Firmware files (*.hex *.bin)</source> - <translation type="unfinished"/> + <translation>Firmware Dateien (*.hex *.bin)</translation> </message> </context> <context> @@ -5123,17 +5139,17 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../mobile-widgets/qml/Preferences.qml" line="43"/> <source>Subsurface GPS data webservice</source> - <translation type="unfinished"/> + <translation>Subsurface GPS Webdienst</translation> </message> <message> <location filename="../mobile-widgets/qml/Preferences.qml" line="51"/> <source>Distance threshold (meters)</source> - <translation type="unfinished"/> + <translation>Entfernungsschwellwert</translation> </message> <message> <location filename="../mobile-widgets/qml/Preferences.qml" line="62"/> <source>Time threshold (minutes)</source> - <translation type="unfinished"/> + <translation>Zeitschwellwert</translation> </message> </context> <context> @@ -5303,52 +5319,52 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/> <source>Gas pressure display setup</source> - <translation type="unfinished"/> + <translation>Gasdruck-Anzeigen-Einstellung</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> <source>Threshold for pO₂ (bar)</source> - <translation type="unfinished"/> + <translation>Schwelle für pO₂ (bar)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> <source>Threshold for pN₂ (bar)</source> - <translation type="unfinished"/> + <translation>Schwelle für pN₂ (bar)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/> <source>Threshold for pHe (bar)</source> - <translation type="unfinished"/> + <translation>Schwelle für pHe (bar)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> <source>pO₂ in calculating MOD (bar)</source> - <translation type="unfinished"/> + <translation>pO₂ für MOD-Berechnung (bar)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/> <source>CCR options:</source> - <translation type="unfinished"/> + <translation>CCR Einstellungen:</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/> <source>Dive planner default setpoint (bar)</source> - <translation type="unfinished"/> + <translation>Setpoint-Vorgabe für Tauchplaner (bar)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/> <source>Show setpoints when viewing pO₂</source> - <translation type="unfinished"/> + <translation>Setpoints in pO₂-Ansicht anzeigen </translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/> <source>Show individual O₂ sensor values when viewing pO₂</source> - <translation type="unfinished"/> + <translation>Zeige einzelne O₂-Sensoren in pO₂-Darstellung</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/> <source>Ceiling display setup</source> - <translation type="unfinished"/> + <translation>Einstellung Auftauchgrenzen</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/> @@ -5358,27 +5374,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/> <source>Algorithm for calculated ceiling:</source> - <translation type="unfinished"/> + <translation>Algorithmus für Auftauchgrenze</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/> <source>VPM-B</source> - <translation type="unfinished"/> + <translation>VPM-B</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/> <source>VPM-B Conservatism</source> - <translation type="unfinished"/> + <translation>VPM-B Konservatismus</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/> <source>+</source> - <translation type="unfinished"/> + <translation>+</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/> <source>Bühlmann</source> - <translation type="unfinished"/> + <translation>Bühlmann</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/> @@ -5398,17 +5414,17 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/> <source>pSCR options:</source> - <translation type="unfinished"/> + <translation>pSCR-Einstellungen:</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/> <source>Metabolic rate (ℓ O₂/min)</source> - <translation type="unfinished"/> + <translation>Metabolismusrate (ℓ O₂/min)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> <source>Dilution ratio</source> - <translation type="unfinished"/> + <translation>Verdünnungsverhältnis</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/> @@ -5428,7 +5444,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/> <source>Show mean depth in Profile</source> - <translation type="unfinished"/> + <translation>Mittlere Tiefe im Profil anzeigen</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> @@ -5451,7 +5467,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/preferences/prefs_language.ui" line="32"/> <source>Use system default</source> - <translation type="unfinished"/> + <translation>Verwende Standardeinstellungen</translation> </message> <message> <location filename="../desktop-widgets/preferences/prefs_language.ui" line="55"/> @@ -5466,23 +5482,23 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Bevorzugtes Datumsformat. Gebräuchliche Felder sind </p><p>d (Tag im Monat)</p><p>ddd (Wochentagsabkürzung)</p><p>M (Monatszahl)</p><p>MMM (Abkürzung Monatsname)</p><p>yy/yyyy (2/4-stelliges Jahr)</p></body></html></translation> </message> <message> <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> <source>Use UI language default</source> - <translation type="unfinished"/> + <translation>Verwende Standardsprache</translation> </message> <message> <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> <source>This is used in places where there is less space to show the full date</source> - <translation type="unfinished"/> + <translation>Wird verwendet, wenn nicht genug Platz ist, das volle Datum zu zeigen</translation> </message> <message> <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> <source>Short format</source> - <translation type="unfinished"/> + <translation>Kurzformat</translation> </message> <message> <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> @@ -5492,7 +5508,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p>Bevorzugtes Zeitformat</p><p>Übliche Felder sind</p><p>h (Stunden im 12h-Format)</p><p>H (Stunden im 24h-Format)</p><p>mm (zweistellige Minuten)</p><p>ss (zweistellige Sekunden)</p><p>t/tt (a/p oder am/pm)</p></body></html></translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="12"/> @@ -5513,7 +5529,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> <source>Literal characters</source> - <translation type="unfinished"/> + <translation>Unübersetzte Zeichen</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/> @@ -5521,7 +5537,9 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <source>Non-special character(s) in time format. These will be used as is. This might not be what you intended. See http://doc.qt.io/qt-5/qdatetime.html#toString</source> - <translation type="unfinished"/> + <translation>Zeichen ohne Bedeutung im Zeitformat. +Diese werden direkt übernommen, dies könnte nicht das beabsichtigte Verhalten sein, +siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> </context> <context> @@ -5914,113 +5932,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="730"/> + <location filename="../profile-widget/profilewidget2.cpp" line="750"/> <source> (#%1 of %2)</source> <translation> (#%1 von %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="733"/> + <location filename="../profile-widget/profilewidget2.cpp" line="753"/> <source>Unknown dive computer</source> <translation>Unbekannter Tauchcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1339"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1359"/> <source>Make first divecomputer</source> <translation>Primärer Tauchcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1341"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1361"/> <source>Delete this divecomputer</source> <translation>Lösche diesen Tauchcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1355"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1375"/> <source>Add gas change</source> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1358"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1366"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> <source>Add set-point change</source> <translation>Set-Point-Wechsel hinzufügen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1368"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> <source>Add bookmark</source> <translation>Markierung setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1372"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> <source>Edit the profile</source> <translation>Profil bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1376"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> <source>Remove event</source> <translation>Entferne Ereignis</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1381"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Hide similar events</source> <translation>Ähnliche Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> <source>Edit name</source> <translation>Name bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1424"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Druck in Flasche %1 (momentan zu %2 interpoliert)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1459"/> <source>Unhide all events</source> <translation>Alle Ereignisse einblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide events</source> <translation>Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide all %1 events?</source> <translation>Alle %1 Ereignisse ausblenden?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1509"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> <source>Remove the selected event?</source> <translation>Ausgewähltes Ereignis entfernen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1510"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>Edit name of bookmark</source> <translation>Name der Markierung bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1634"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> <source>Custom name:</source> <translation>Benutzerdefinierter Name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1639"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> <source>Name is too long!</source> <translation>Der Name ist zu lang!</translation> </message> @@ -6030,101 +6048,101 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/> <source>Starting...</source> - <translation type="unfinished"/> + <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> <source>working in no-cloud mode</source> - <translation type="unfinished"/> + <translation>ohne Cloud-Anbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> <source>no cloud credentials</source> - <translation type="unfinished"/> + <translation>Keine Cloud-Benutzerdaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> <source>Please enter valid cloud credentials.</source> - <translation type="unfinished"/> + <translation>Bitte gültige Cloud-Benutzerdaten eingeben.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> <source>Attempting to open cloud storage with new credentials</source> - <translation type="unfinished"/> + <translation>Versuche Cloud mit neuen Benutzerdaten zu öffnen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> <source>Testing cloud credentials</source> - <translation type="unfinished"/> + <translation>Überprüfe Could-Benutzerdaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> <source>No response from cloud server to validate the credentials</source> - <translation type="unfinished"/> + <translation>Keine Antwort vom Cloud-Server zur Überprüfung der Benutzerdaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> <source>Cannot connect to cloud storage - cloud account not verified</source> - <translation type="unfinished"/> + <translation>Keine Verbindung zum Cloud-Server - Cloud-Account nicht bestätigt</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> <source>Cloud credentials are invalid</source> - <translation type="unfinished"/> + <translation>Cloud-Benutzerdaten ungültig</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Cannot open cloud storage: Error creating https connection</source> - <translation type="unfinished"/> + <translation>Kann den Cloud-Speicher nicht öffnen: Fehler beim Erstellen der https-Verbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> <source>Cannot open cloud storage: %1</source> - <translation type="unfinished"/> + <translation>Kann den Cloud-Speicher nicht öffnen: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> <source>Cannot connect to cloud storage</source> - <translation type="unfinished"/> + <translation>Kann nicht zum Cloud-Speicher verbinden</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> <source>Cloud storage error: %1</source> - <translation type="unfinished"/> + <translation>Cloud-Speicher-Fehler: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> - <translation type="unfinished"/> + <translation>Verbindung zum Cloud-Server fehlgeschlagen, Fortsetzung ohne Cloud-Verbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/> <source>Cloud storage open successfully. No dives in dive list.</source> - <translation type="unfinished"/> + <translation>Cloudspeicher erfolgreich geöffnet. Keine Tauchgänge in der Tauchgangsliste.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> <source>h</source> - <translation type="unfinished"/> + <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> <source>sec</source> - <translation type="unfinished"/> + <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> <source>Unknown GPS location</source> - <translation type="unfinished"/> + <translation>Unbekannte GPS-Position</translation> </message> </context> <context> @@ -6132,7 +6150,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../core/gpslocation.h" line="13"/> <source>Waiting to aquire GPS location</source> - <translation type="unfinished"/> + <translation>Erwarte GPS-Position</translation> </message> <message> <location filename="../core/qthelper.cpp" line="766"/> @@ -6189,12 +6207,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../core/qthelper.cpp" line="873"/> <source>EAN</source> - <translation type="unfinished"/> + <translation>EAN</translation> </message> <message numerus="yes"> <location filename="../core/qthelper.cpp" line="962"/> <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>(%n Tauchgang)</numerusform><numerusform>(%n Tauchgänge)</numerusform></translation> </message> <message> <location filename="../core/qthelper.cpp" line="1232"/> @@ -6291,7 +6309,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../desktop-widgets/renumber.ui" line="43"/> <source>Renumbering all dives</source> - <translation type="unfinished"/> + <translation>Alle Tauchgänge werden umnummeriert</translation> </message> <message> <location filename="../desktop-widgets/renumber.ui" line="61"/> @@ -6307,12 +6325,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="145"/> <source>Renumber selected dives</source> - <translation type="unfinished"/> + <translation>Angewählte Tauchgänge umnummerieren</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="147"/> <source>Renumber all dives</source> - <translation type="unfinished"/> + <translation>Alle Tauchgänge umnummerieren</translation> </message> </context> <context> @@ -6469,28 +6487,28 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="20"/> <source>SmartTrak files importer</source> - <translation type="unfinished"/> + <translation>SmartTrak Datei-Importer</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="79"/> <source><html><head/><body><p><span style=" color:#6ebeb9;">Subsurface divelog</span></p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p><span style=" color:#6ebeb9;">Subsurface Tauchlogbuch</span></p></body></html></translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="111"/> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="177"/> <source>Choose</source> - <translation type="unfinished"/> + <translation>Auswählen</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="133"/> <source><html><head/><body><p><span style=" color:#6ebeb9;">Smartrak divelog</span></p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p><span style=" color:#6ebeb9;">Smartrak Logbuch</span></p></body></html></translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="242"/> <source>Exit</source> - <translation type="unfinished"/> + <translation>Beenden</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="270"/> @@ -6500,32 +6518,32 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="295"/> <source><html><head/><body><p><span style=" font-weight:600; color:#6ebeb9;">Select the .slg file(s) you want to import to Subsurface format, and the exported .xml file. It's advisable to use a new output file, as its actual content will be erased.</span></p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p><span style=" font-weight:600; color:#6ebeb9;">Ins Subsurface-Format zu importierende .slg Datei(en) auswählen und die zu exportierende .xml-Datei. Bitte eine neue Datei auswählen, da ein vorhandener Inhalt überschrieben würde.</span></p></body></html></translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> <source>Import messages (Errors, warnings, etc)</source> - <translation type="unfinished"/> + <translation>Nachrichten (Fehlermeldungen, Warnungen usw.) importieren</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="50"/> <source>Open SmartTrak files</source> - <translation type="unfinished"/> + <translation>SmartTrak Dateien öffnen</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> - <translation type="unfinished"/> + <translation>SmartTrak Dateien (*.slg *.SLG);;Alle Dateien (*)</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> <source>Open Subsurface files</source> - <translation type="unfinished"/> + <translation>Subsurface Dateien öffnen</translation> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> - <translation type="unfinished"/> + <translation>Subsurface Dateien (*.ssrf *SSRF *.xml *.XML);;Alle Dateien (*)</translation> </message> </context> <context> @@ -6654,19 +6672,22 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials. </source> - <translation type="unfinished"/> + <translation>Um Subsurface-mobile mit Subsurface-Cloud-Speicher zu verwenden bitte Cloud-Benutzerdaten eingeben. +</translation> </message> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/> <source>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). The server will send a PIN to the email address provided that you will have to enter here. </source> - <translation type="unfinished"/> + <translation>Wenn dies die Erstbenutzung des Subsurface-Cloud-Speichers ist, bitte eine gültige Emailadresse (in Kleinbuchstaben) sowie ein Passwort nach Wahl eingeben (Buchstaben und Ziffern). Der Server wird dann eine PIN an die Emailadresse senden, die hier eingetragen werden muss. + +</translation> </message> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/> <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source> - <translation type="unfinished"/> + <translation>Um Subsurface-module nur mit lokalen Daten auf diesem Gerät zu verwenden auf das "no cloud"-Ikon tippen.</translation> </message> </context> <context> @@ -6694,7 +6715,7 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der <message> <location filename="../desktop-widgets/about.cpp" line="19"/> <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2017</span></source> - <translation type="unfinished"/> + <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform Divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Cancerava und weitere, 2011-2017</span></translation> </message> </context> <context> @@ -6975,62 +6996,62 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="308"/> + <location filename="../tests/testparse.cpp" line="313"/> <source>Sample time</source> <translation>Segment Dauer</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="310"/> + <location filename="../tests/testparse.cpp" line="315"/> <source>Sample depth</source> <translation>Segment Tiefe</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="312"/> + <location filename="../tests/testparse.cpp" line="317"/> <source>Sample temperature</source> <translation>Segment Temperatur</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="314"/> + <location filename="../tests/testparse.cpp" line="319"/> <source>Sample pO₂</source> <translation>Segment pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="316"/> + <location filename="../tests/testparse.cpp" line="321"/> <source>Sample sensor1 pO₂</source> <translation>Segment Sensor1 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="318"/> + <location filename="../tests/testparse.cpp" line="323"/> <source>Sample sensor2 pO₂</source> <translation>Segment Sensor2 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="320"/> + <location filename="../tests/testparse.cpp" line="325"/> <source>Sample sensor3 pO₂</source> <translation>Segment Sensor3 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="322"/> + <location filename="../tests/testparse.cpp" line="327"/> <source>Sample CNS</source> <translation>Segment CNS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="324"/> + <location filename="../tests/testparse.cpp" line="329"/> <source>Sample NDL</source> <translation>Segment Nullzeit</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="326"/> + <location filename="../tests/testparse.cpp" line="331"/> <source>Sample TTS</source> <translation>Segment Aufstiegszeit</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="328"/> + <location filename="../tests/testparse.cpp" line="333"/> <source>Sample stopdepth</source> <translation>Segment Stopptiefe</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="330"/> + <location filename="../tests/testparse.cpp" line="335"/> <source>Sample pressure</source> <translation>Segment Flaschendruck</translation> </message> @@ -7040,7 +7061,7 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="821"/> <source>%1click to visit %2</source> - <translation type="unfinished"/> + <translation>%1 klicken, um zu %2 gehen</translation> </message> </context> <context> @@ -7151,7 +7172,7 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der <message> <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Photos before/during/after dive</source> - <translation type="unfinished"/> + <translation>Fotos vor/während/nach dem Tauchgang</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="255"/> @@ -7228,7 +7249,8 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> - <translation type="unfinished"/> + <translation>Subsurface prüft alle zwei Wochen, ob eine neue Version zur Verfügung steht. +Wenn Subsurface dies nicht tun soll, bitte ablehnen.</translation> </message> <message> <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> @@ -7648,7 +7670,7 @@ Durchschnitt</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="737"/> + <location filename="../core/libdivecomputer.c" line="776"/> <source>Error parsing the header</source> <translation>Fehler beim Lesen der Kopfdaten</translation> </message> @@ -7659,7 +7681,7 @@ Durchschnitt</translation> <location filename="../core/cochran.c" line="309"/> <location filename="../core/cochran.c" line="315"/> <location filename="../core/cochran.c" line="385"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="232"/> <source>deco stop</source> <translation>Deko-Stopp</translation> </message> @@ -7667,7 +7689,7 @@ Durchschnitt</translation> <location filename="../core/cochran.c" line="336"/> <location filename="../core/cochran.c" line="390"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>ascent</source> <translation>Aufstieg</translation> </message> @@ -7679,20 +7701,20 @@ Durchschnitt</translation> </message> <message> <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>maxdepth</source> <translation>Max. Tiefe</translation> </message> <message> <location filename="../core/cochran.c" line="358"/> <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>pO₂</source> <translation>pO₂</translation> </message> @@ -7701,28 +7723,28 @@ Durchschnitt</translation> <location filename="../core/cochran.c" line="414"/> <location filename="../core/cochran.c" line="421"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="225"/> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="242"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>gaschange</source> <translation>Gaswechsel</translation> </message> <message> <location filename="../core/cochran.c" line="370"/> <location filename="../core/cochran.c" line="409"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="233"/> <source>rbt</source> <translation>Nullzeit</translation> </message> <message> <location filename="../core/cochran.c" line="379"/> <location filename="../core/cochran.c" line="426"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>ceiling</source> <translation>Tiefster Deko-Stopp</translation> </message> <message> <location filename="../core/cochran.c" line="395"/> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>transmitter</source> <translation>Sender</translation> </message> @@ -7984,12 +8006,17 @@ Durchschnitt</translation> <message> <location filename="../core/dive.c" line="33"/> <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1447"/> - <location filename="../core/planner.c" line="1450"/> + <location filename="../core/planner.c" line="1476"/> + <location filename="../core/planner.c" line="1479"/> <source>oxygen</source> <translation>Sauerstoff</translation> </message> <message> + <location filename="../core/dive.c" line="33"/> + <source>not used</source> + <translation>unbenutzt</translation> + </message> + <message> <location filename="../core/dive.c" line="181"/> <source>pascal</source> <translation>Pa</translation> @@ -8070,10 +8097,10 @@ Durchschnitt</translation> <translation>(%s) oder (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="490"/> + <location filename="../core/divelist.c" line="491"/> <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1443"/> - <location filename="../core/planner.c" line="1446"/> + <location filename="../core/planner.c" line="1472"/> + <location filename="../core/planner.c" line="1475"/> <source>air</source> <translation>Luft</translation> </message> @@ -8110,7 +8137,7 @@ Durchschnitt</translation> <message> <location filename="../core/file.c" line="111"/> <source>No dives in the input file '%s'</source> - <translation type="unfinished"/> + <translation>Keine Tauchgänge in der Datei '%s'</translation> </message> <message> <location filename="../core/file.c" line="121"/> @@ -8236,205 +8263,200 @@ Durchschnitt</translation> <translation>GIT Clone von %s ist gescheitert (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="210"/> + <location filename="../core/libdivecomputer.c" line="218"/> <location filename="../core/parse-xml.c" line="3317"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="231"/> <source>none</source> <translation>keine</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="236"/> <source>workload</source> <translation>Arbeit</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>violation</source> <translation>Verletzung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>bookmark</source> <translation>Markierung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>surface</source> <translation>Oberfläche</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>safety stop</source> <translation>Sicherheitsstopp</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>safety stop (voluntary)</source> <translation>Sicherheitsstopp (freiwillig)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop (mandatory)</source> <translation>Sicherheitsstopp (obligatorisch)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="245"/> <source>deepstop</source> <translation>Tiefen-Stopp</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>ceiling (safety stop)</source> <translation>Sicherheits-Stopp</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>unterhalb Dekotiefe</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>divetime</source> <translation>Tauchgangsdauer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>airtime</source> <translation>verbleibende Atemzeit</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>heading</source> <translation>Richtung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>tissue level warning</source> <translation>Gewebewarnung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> - <source>non stop time</source> - <translation>Nullzeit</translation> - </message> - <message> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/libdivecomputer.c" line="265"/> <source>invalid event number</source> <translation>ungültige Ereignisnummer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="553"/> + <location filename="../core/libdivecomputer.c" line="592"/> <source>Error parsing the datetime</source> <translation>Fehler beim Lesen des Datums</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="571"/> + <location filename="../core/libdivecomputer.c" line="610"/> <source>Dive %d: %s</source> <translation>Tauchgang %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="577"/> + <location filename="../core/libdivecomputer.c" line="616"/> <source>Error parsing the divetime</source> <translation>Fehler beim Lesen der Dauer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="587"/> + <location filename="../core/libdivecomputer.c" line="626"/> <source>Error parsing the maxdepth</source> <translation>Fehler beim Lesen der maximalen Tiefe</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="606"/> + <location filename="../core/libdivecomputer.c" line="645"/> <source>Error parsing temperature</source> <translation>Fehler beim Lesen der Temperatur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the gas mix count</source> <translation>Fehler beim Lesen der Gasgemischszahl</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="638"/> + <location filename="../core/libdivecomputer.c" line="677"/> <source>Error obtaining water salinity</source> <translation>Fehler beim Lesen des Salzgehalts</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="647"/> + <location filename="../core/libdivecomputer.c" line="686"/> <source>Error obtaining surface pressure</source> <translation>Kein Oberflächendruck erhalten</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="672"/> + <location filename="../core/libdivecomputer.c" line="711"/> <source>Error obtaining divemode</source> <translation>Fehler beim Auslesen des Modus des Tauchcomputers</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="692"/> + <location filename="../core/libdivecomputer.c" line="731"/> <source>Error parsing the gas mix</source> <translation>Fehler beim Lesen des Gasgemischs</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="717"/> + <location filename="../core/libdivecomputer.c" line="756"/> <source>Unable to create parser for %s %s</source> <translation>Nicht in der Lage, einen Parser für %s %s zu erstellen</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="723"/> + <location filename="../core/libdivecomputer.c" line="762"/> <source>Error registering the data</source> <translation>Fehler beim Registrieren der Daten</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="744"/> + <location filename="../core/libdivecomputer.c" line="783"/> <source>Error parsing the samples</source> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="882"/> + <location filename="../core/libdivecomputer.c" line="921"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="890"/> + <location filename="../core/libdivecomputer.c" line="929"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="954"/> + <location filename="../core/libdivecomputer.c" line="993"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="959"/> + <location filename="../core/libdivecomputer.c" line="998"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="980"/> + <location filename="../core/libdivecomputer.c" line="1019"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1058"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1026"/> + <location filename="../core/libdivecomputer.c" line="1065"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1048"/> + <location filename="../core/libdivecomputer.c" line="1087"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Unzureichende Privilegien zum Öffnen von Gerät %s %s (%s)</translation> </message> @@ -8494,177 +8516,182 @@ Durchschnitt</translation> </message> <message> <location filename="../core/planner.c" line="574"/> - <location filename="../core/planner.c" line="840"/> - <location filename="../core/planner.c" line="845"/> - <location filename="../core/planner.c" line="871"/> - <location filename="../core/planner.c" line="881"/> + <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="874"/> + <location filename="../core/planner.c" line="900"/> + <location filename="../core/planner.c" line="910"/> <source>Warning:</source> <translation>Warnung:</translation> </message> <message> - <location filename="../core/planner.c" line="584"/> - <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/planner.c" line="589"/> - <source>based on VPM-B at nominal conservatism</source> - <translation>basierend auf VPM-B bei nominalem Sicherheitslevel</translation> - </message> - <message> - <location filename="../core/planner.c" line="591"/> - <source>based on VPM-B at +%d conservatism</source> - <translation>basierend auf VPM-B bei +%d Sicherheitslevel</translation> - </message> - <message> - <location filename="../core/planner.c" line="593"/> + <location filename="../core/planner.c" line="812"/> <source>, effective GF=%d/%d</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/planner.c" line="597"/> - <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation>Sporttauchmodus basierend auf Bühlmann ZHL-16B mit GFlow = %d und GFhigh = %d</translation> + <translation>, effektive GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="602"/> + <location filename="../core/planner.c" line="586"/> <source>Subsurface dive plan (surface interval </source> - <translation type="unfinished"/> + <translation>Subsurface Plan (Oberflächenpause </translation> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="590"/> <source>Subsurface dive plan</source> <translation>Subsurface Tauchplan</translation> </message> <message> - <location filename="../core/planner.c" line="610"/> - <source><div>Runtime: %dmin</div><br></source> - <translation type="unfinished"/> + <location filename="../core/planner.c" line="593"/> + <source>Runtime: %dmin<br></div></source> + <translation>Runtime: %dmin<br></div></translation> </message> <message> - <location filename="../core/planner.c" line="615"/> + <location filename="../core/planner.c" line="598"/> <source>depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../core/planner.c" line="618"/> + <location filename="../core/planner.c" line="601"/> <source>duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../core/planner.c" line="621"/> + <location filename="../core/planner.c" line="604"/> <source>runtime</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../core/planner.c" line="624"/> + <location filename="../core/planner.c" line="607"/> <source>gas</source> <translation>Gas</translation> </message> <message> - <location filename="../core/planner.c" line="667"/> + <location filename="../core/planner.c" line="650"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Auf-/Abstieg bis %.*f %s in %d:%02d min - Runtime %d:%02u mit %s (Setpoint = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="675"/> + <location filename="../core/planner.c" line="658"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Aufstieg auf %.*f %s in %d:%02d min - Laufzeit %d:%02u mit %s</translation> </message> <message> - <location filename="../core/planner.c" line="688"/> + <location filename="../core/planner.c" line="671"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Auf %.*f %s bleiben für %d:%02d min - Runtime %d:%02u mit %s (Setpoint = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="695"/> + <location filename="../core/planner.c" line="678"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s</translation> </message> <message> - <location filename="../core/planner.c" line="740"/> + <location filename="../core/planner.c" line="723"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/planner.c" line="743"/> - <location filename="../core/planner.c" line="747"/> + <location filename="../core/planner.c" line="726"/> + <location filename="../core/planner.c" line="730"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/planner.c" line="756"/> - <location filename="../core/planner.c" line="768"/> + <location filename="../core/planner.c" line="739"/> + <location filename="../core/planner.c" line="751"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="791"/> + <location filename="../core/planner.c" line="774"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Wechsle Gas auf %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="793"/> + <location filename="../core/planner.c" line="776"/> <source>Switch gas to %s</source> <translation>Gaswechsel zu %s</translation> </message> <message> - <location filename="../core/planner.c" line="812"/> + <location filename="../core/planner.c" line="796"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/planner.c" line="814"/> + <location filename="../core/planner.c" line="798"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/planner.c" line="818"/> + <location filename="../core/planner.c" line="803"/> + <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> + <translation>Dekomodell: Bühlmann ZHL-16C mit GFlow = %d und GFhigh = %d</translation> + </message> + <message> + <location filename="../core/planner.c" line="808"/> + <source>Deco model: VPM-B at nominal conservatism</source> + <translation>Dekomodell: VPM-B ohne Konservatismus</translation> + </message> + <message> + <location filename="../core/planner.c" line="810"/> + <source>Deco model: VPM-B at +%d conservatism</source> + <translation>Dekomodell: VPM-B mit Konservatismus +%d</translation> + </message> + <message> + <location filename="../core/planner.c" line="816"/> + <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> + <translation>Dekomodell: Sporttauchmodus basierend auf Bühlmann ZHL-16B mit GFlow = %d und GFhigh = %d</translation> + </message> + <message> + <location filename="../core/planner.c" line="824"/> + <source>ATM pressure: %dmbar (%d%s)<br></div></source> + <translation>Oberflächendruck: %dmbar (%d%s)<br></div></translation> + </message> + <message> + <location filename="../core/planner.c" line="842"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gasverbrauch (ohne CCR Segmente):</translation> </message> <message> - <location filename="../core/planner.c" line="820"/> - <source>Gas consumption:</source> - <translation>Gasverbrauch:</translation> + <location filename="../core/planner.c" line="844"/> + <source>Gas consumption (based on SAC</source> + <translation>Gasverbrauch (basierend auf SAC</translation> </message> <message> - <location filename="../core/planner.c" line="841"/> + <location filename="../core/planner.c" line="869"/> <source>this is more gas than available in the specified cylinder!</source> <translation>Dies ist mehr Gas, als in der Flasche verfügbar ist!</translation> </message> <message> - <location filename="../core/planner.c" line="846"/> + <location filename="../core/planner.c" line="875"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Keine ausreichende Reserve für Aufstieg unter Wechselatmung!</translation> </message> <message> - <location filename="../core/planner.c" line="848"/> + <location filename="../core/planner.c" line="877"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s im berechneten Aufstieg)</translation> </message> <message> - <location filename="../core/planner.c" line="850"/> + <location filename="../core/planner.c" line="879"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s im berechneten Aufstiegs) von %s</translation> </message> <message> - <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="897"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>hoher pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="878"/> + <location filename="../core/planner.c" line="907"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>niedriger pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="1205"/> + <location filename="../core/planner.c" line="1234"/> <source>Can't find gas %s</source> <translation>Kann Gas %s nicht finden</translation> </message> <message> - <location filename="../core/planner.c" line="1451"/> + <location filename="../core/planner.c" line="1480"/> <source>ean</source> <translation>ean</translation> </message> @@ -8929,7 +8956,7 @@ EADD: %d%s <message> <location filename="../core/profile.c" line="1576"/> <source>%s SAC:%.*f %s</source> - <translation type="unfinished"/> + <translation>%s SAC:%.*f %s</translation> </message> <message> <location filename="../core/qthelper.cpp" line="67"/> @@ -9089,8 +9116,8 @@ EADD: %d%s </message> <message> <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="251"/> - <location filename="../smtk-import/smartrak.c" line="321"/> + <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="318"/> <source>Notes</source> <translation>Notizen</translation> </message> @@ -9273,7 +9300,7 @@ EADD: %d%s <message> <location filename="../core/statistics.c" line="252"/> <source>%dmin %dsecs</source> - <translation type="unfinished"/> + <translation>%dmin %dsek</translation> </message> <message> <location filename="../core/statistics.c" line="254"/> @@ -9661,77 +9688,77 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Notizen:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Built</source> - <translation type="unfinished"/> + <translation>Erstellt</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Sank</source> - <translation type="unfinished"/> + <translation>Gesunken</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>SankTime</source> - <translation type="unfinished"/> + <translation>Sinkzeitpunkt</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Reason</source> - <translation type="unfinished"/> + <translation>Grund</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Nationality</source> - <translation type="unfinished"/> + <translation>Nationalität</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Shipyard</source> - <translation type="unfinished"/> + <translation>Werft</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>ShipType</source> - <translation type="unfinished"/> + <translation>Schiffstyp</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Length</source> - <translation type="unfinished"/> + <translation>Länge</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Beam</source> - <translation type="unfinished"/> + <translation>Schiffsbreite</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Draught</source> - <translation type="unfinished"/> + <translation>Tiefgang</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Displacement</source> - <translation type="unfinished"/> + <translation>Verdrängung</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Cargo</source> - <translation type="unfinished"/> + <translation>Ladung</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="263"/> + <location filename="../smtk-import/smartrak.c" line="260"/> <source>Wreck Data</source> - <translation type="unfinished"/> + <translation>Wrackdaten</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Altitude</source> <translation>Meereshöhe</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Depth</source> <translation>Tiefe</translation> </message> @@ -9741,7 +9768,7 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="13"/> <source>Subsurface-mobile</source> - <translation type="unfinished"/> + <translation>Subsurface-mobile</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="105"/> @@ -9751,37 +9778,37 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="112"/> <source>Dive list</source> - <translation type="unfinished"/> + <translation>Tauchgangliste</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="127"/> <source>Cloud credentials</source> - <translation type="unfinished"/> + <translation>Cloud Benutzerdaten</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="141"/> <source>Manage dives</source> - <translation type="unfinished"/> + <translation>Tauchgänge verwalten</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="143"/> <source>Add dive manually</source> - <translation type="unfinished"/> + <translation>Tauchgang hinzufügen</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="151"/> <source>Manual sync with cloud</source> - <translation type="unfinished"/> + <translation>Manuelle Cloud-Synchronisation</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="169"/> <source>Offline mode</source> - <translation type="unfinished"/> + <translation>Offline-Modus</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="169"/> <source>Enable auto cloud sync</source> - <translation type="unfinished"/> + <translation>Automatische Synchronisation</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="189"/> @@ -9791,27 +9818,27 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="192"/> <source>GPS-tag dives</source> - <translation type="unfinished"/> + <translation>Tauchgänge mit GPS-Daten versehen</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="199"/> <source>Upload GPS data</source> - <translation type="unfinished"/> + <translation>GPS-Daten hochladen</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="206"/> <source>Download GPS data</source> - <translation type="unfinished"/> + <translation>GPS-Daten herunterladen</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="213"/> <source>Show GPS fixes</source> - <translation type="unfinished"/> + <translation>GPS-Positionen anzeigen</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="222"/> <source>Clear GPS cache</source> - <translation type="unfinished"/> + <translation>GPS-Speicher löschen</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="228"/> @@ -9821,17 +9848,17 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="239"/> <source>Developer</source> - <translation type="unfinished"/> + <translation>Entwickler</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="241"/> <source>App log</source> - <translation type="unfinished"/> + <translation>App-Protokoll</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="248"/> <source>Theme information</source> - <translation type="unfinished"/> + <translation>Theme-Information</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="255"/> @@ -9841,22 +9868,22 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="261"/> <source>About</source> - <translation type="unfinished"/> + <translation>Über</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="306"/> <source>Run location service</source> - <translation type="unfinished"/> + <translation>Ortungsdienst starten</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="306"/> <source>No GPS source available</source> - <translation type="unfinished"/> + <translation>Keine GPS-Quelle gefunden</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="318"/> <source>Actions</source> - <translation type="unfinished"/> + <translation>Aktionen</translation> </message> </context> <context> @@ -10063,7 +10090,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plannerSettings.ui" line="606"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> - <translation type="unfinished"/> + <translation>Wird zur Best-Mix-Berechnung verwendet. Best-Mix kann in der "Verfügbare Gase"-Tabelle ausgewählt werden, indem hinter der Tiefe "B" (für Trimix-Best-Mix) oder "BN" (für Nitro-Best-Mix) angegeben wird.</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="613"/> @@ -10078,7 +10105,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plannerSettings.ui" line="627"/> <source>Best mix END</source> - <translation type="unfinished"/> + <translation>Best-Mix END</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="634"/> diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts index 04a886328..b0b265507 100644 --- a/translations/subsurface_el_GR.ts +++ b/translations/subsurface_el_GR.ts @@ -422,22 +422,22 @@ <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/> <source>Air temp.</source> - <translation type="unfinished"/> + <translation>Θερμοκρασία Ατμόσφαιρας</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/> <source>Water temp.</source> - <translation type="unfinished"/> + <translation>Θερμοκρασία Νερού</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> <source>O₂</source> - <translation type="unfinished"/> + <translation>O₂ (Οξυγόνο)</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> <source>He</source> - <translation type="unfinished"/> + <translation>He ('Ηλιο)</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -2647,13 +2647,13 @@ GPS location:</source> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="978"/> <source>Air temp.</source> - <translation type="unfinished"/> + <translation>Θερμοκρασία Ατμόσφαιρας</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="980"/> <source>Water temp.</source> - <translation type="unfinished"/> + <translation>Θερμοκρασία Νερού</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/> @@ -2677,13 +2677,13 @@ GPS location:</source> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="974"/> <source>O₂</source> - <translation type="unfinished"/> + <translation>O₂ (Οξυγόνο)</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="976"/> <source>He</source> - <translation type="unfinished"/> + <translation>He ('Ηλιο)</translation> </message> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/> @@ -3855,14 +3855,14 @@ p, li { white-space: pre-wrap; } <location filename="../desktop-widgets/maintab.ui" line="836"/> <location filename="../desktop-widgets/maintab.cpp" line="306"/> <source>Air temp.</source> - <translation type="unfinished"/> + <translation>Θερμοκρασία Ατμόσφαιρας</translation> </message> <message> <location filename="../desktop-widgets/maintab.ui" line="122"/> <location filename="../desktop-widgets/maintab.ui" line="855"/> <location filename="../desktop-widgets/maintab.cpp" line="307"/> <source>Water temp.</source> - <translation type="unfinished"/> + <translation>Θερμοκρασία Νερού</translation> </message> <message> <location filename="../desktop-widgets/maintab.ui" line="184"/> @@ -8970,12 +8970,12 @@ EADD: %d%s <message> <location filename="../core/save-html.c" line="492"/> <source>Air temp.</source> - <translation type="unfinished"/> + <translation>Θερμοκρασία Ατμόσφαιρας</translation> </message> <message> <location filename="../core/save-html.c" line="493"/> <source>Water temp.</source> - <translation type="unfinished"/> + <translation>Θερμοκρασία Νερού</translation> </message> <message> <location filename="../core/save-html.c" line="494"/> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index 45136bdc4..bdbd336c4 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -1544,7 +1544,7 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> <source>Actions</source> <translation>Tapahtumat</translation> </message> @@ -1607,42 +1607,42 @@ <translation>Käyttö</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="44"/> + <location filename="../qt-models/cylindermodel.cpp" line="43"/> <source>cuft</source> <translation>ft³</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="48"/> + <location filename="../qt-models/cylindermodel.cpp" line="47"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="229"/> + <location filename="../qt-models/cylindermodel.cpp" line="235"/> <source>Clicking here will remove this cylinder.</source> <translation>Poista säiliö.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="239"/> + <location filename="../qt-models/cylindermodel.cpp" line="247"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Dekokaasun vaihtosyvyys. Lasketaan käyttäen dekon pO₂ -asetusta, ellei arvoa ole asetettu käsin.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="242"/> + <location filename="../qt-models/cylindermodel.cpp" line="250"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</source> <translation>Lasketaan käyttäen pO₂:n pohja-asetusta. MOD:n muutos päivittää O₂%:a ja arvo '*' valitsee maksimisyvyyden mukaisen O₂%:n.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="245"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</source> <translation>Lasketaan käyttäen parasta seosta END -asetuksen mukaan. MND:n muutos muuttaa He%:a ja arvo '*' valitsee maksimisyvyyden mukaisen He%:n.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="503"/> + <location filename="../qt-models/cylindermodel.cpp" line="522"/> <source>Cylinder cannot be removed</source> <translation>Säiliötä ei voida poistaa</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="504"/> + <location filename="../qt-models/cylindermodel.cpp" line="523"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa.</translation> </message> @@ -1770,6 +1770,11 @@ poistaa valitun sukellustietokoneen?</translation> <source>Show on map</source> <translation>Näytä kartalla</translation> </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <source>Multiple Buddies</source> + <translation>Useita sukelluspareja</translation> + </message> </context> <context> <name>DiveDetailsEdit</name> @@ -2016,7 +2021,7 @@ GPS location:</source> <translation>Napauta '+' -painiketta lisätäksesi sukelluksen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> <source>No dives in dive list</source> <translation>Ei sukelluksia lokissa</translation> </message> @@ -2752,6 +2757,11 @@ GPS location:</source> <source>%1 dive(s)</source> <translation>%1 sukellusta</translation> </message> + <message> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <source>Multiple Buddies</source> + <translation>Useita sukelluspareja</translation> + </message> </context> <context> <name>DivePlanner</name> @@ -2794,32 +2804,32 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="137"/> + <location filename="../qt-models/diveplannermodel.cpp" line="142"/> <source>unknown</source> <translation>tuntematon</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="327"/> + <location filename="../qt-models/diveplannermodel.cpp" line="332"/> <source>Final depth</source> <translation>Lopullinen syvyys</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="329"/> + <location filename="../qt-models/diveplannermodel.cpp" line="334"/> <source>Run time</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="331"/> + <location filename="../qt-models/diveplannermodel.cpp" line="336"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="333"/> + <location filename="../qt-models/diveplannermodel.cpp" line="338"/> <source>Used gas</source> <translation>Käytetty kaasuseos</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="335"/> + <location filename="../qt-models/diveplannermodel.cpp" line="340"/> <source>CC setpoint</source> <translation>CC -asetuspiste</translation> </message> @@ -3606,7 +3616,7 @@ ole hyvä ja lähetä seuraava tieto kehittäjille. <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> <source>Back</source> <translation>Takaisin</translation> </message> @@ -4827,7 +4837,7 @@ sekoittaa ilmasta ja käyttäen: <message> <location filename="../desktop-widgets/mainwindow.cpp" line="506"/> <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1562"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen kuin avaat uuden lokin.</translation> </message> @@ -4839,7 +4849,7 @@ sekoittaa ilmasta ja käyttäen: <message> <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Cancel</source> <translation>Peruuta</translation> </message> @@ -4862,9 +4872,9 @@ sekoittaa ilmasta ja käyttäen: <location filename="../desktop-widgets/mainwindow.cpp" line="662"/> <location filename="../desktop-widgets/mainwindow.cpp" line="809"/> <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="998"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <source>Warning</source> <translation>Varoitus</translation> </message> @@ -4889,85 +4899,85 @@ sekoittaa ilmasta ja käyttäen: <translation>Yritetään muokata sukellusta, joka ei ole sukellussuunnitelma.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Ole hyvä ja lopeta nykyinen muokkaus ennen kuin aloitat uuden.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="998"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Yrität muokata sukellusta, joka ei ole syötetty käsin.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1045"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> <source>Yearly statistics</source> <translation>Vuositilastot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1262"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/> <source>Save changes?</source> <translation>Tallenna muutokset?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> <source>Changes will be lost if you don't save them.</source> <translation>Muutokset hylätään, jos et tallenna niitä.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/> <source>Save file as</source> <translation>Tallenna nimellä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> <source>[local cache for] %1</source> <translation>[paikallinen cache] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/> <source>[cloud storage for] %1</source> <translation>[pilvitallennus] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1803"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/> <source>Opening datafile from older version</source> <translation>Avataan vanhan tiedostomuodon loki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1804"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/> <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>Avasit vanhan tiedostomuodon lokitiedoston. Suosittelemme, että luet uuden version muutoksista käyttöohjeesta, etenkin sukelluskohteiden hallinnasta, sillä se on muuttunut huomattavasti. Subsurface on jo yrittänyt esi-täyttää sijaintitiedot, mutta kannattaa vielä tarkistaa uudesta sukelluskohteiden hallinnasta, että kaikki tiedot ovat oikein.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1817"/> <source>Open dive log file</source> <translation>Avaa sukellusloki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1816"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <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>Sukellusloki -tiedostot (*.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 -tiedostot (*.can *.CAN);;CSV -tiedostot (*.csv *.CSV);;DiveLog.de -tiedostot (*.dld *.DLD);;JDiveLog -tiedostot (*.jlb *.JLB);;Liquivision -tiedostot (*.lvd *.LVD);;MkVI -tiedostot (*.txt *.TXT);;Suunto -tiedostot (*.sde *.db *.SDE *.DB);;Divesoft -tiedostot (*.dlf *.DLF);;UDDF/UDCF -tiedostot (*.uddf *.udcf *.UDDF *.UDCF);;XML -tiedostot (*.xml *.XML);;APD log -tiedostot (*.apd *.APD);;Datatrak/WLog -tiedostot (*.log *.LOG);;OSTCtools -tiedostot (*.dive *.DIVE);;DAN DL7 -tiedostot (*.zxu *.zxl *.ZXU *.ZXL);;Kaikki tiedostot (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Contacting cloud service...</source> <translation>Otetaan yhteyttä pilvipalveluun...</translation> </message> @@ -5920,113 +5930,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="730"/> + <location filename="../profile-widget/profilewidget2.cpp" line="750"/> <source> (#%1 of %2)</source> <translation> (#%1 / %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="733"/> + <location filename="../profile-widget/profilewidget2.cpp" line="753"/> <source>Unknown dive computer</source> <translation>Tuntematon sukellustietokone</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Suoranousu-/pintautumisaikaa ei näytetä, koska niiden laskemiseen kuluu liikaa aikaa</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1339"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1359"/> <source>Make first divecomputer</source> <translation>Aseta ensisijaiseksi sukellustietokoneeksi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1341"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1361"/> <source>Delete this divecomputer</source> <translation>Poista tämä sukellustietokone</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1355"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1375"/> <source>Add gas change</source> <translation>Lisää kaasun vaihto</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1358"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> <source> (Tank %1)</source> <translation>(Säiliö %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1366"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> <source>Add set-point change</source> <translation>Aseta setpointin vaihto</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1368"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> <source>Add bookmark</source> <translation>Lisää kirjanmerkki</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1372"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> <source>Edit the profile</source> <translation>Muokkaa profiilia</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1376"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> <source>Remove event</source> <translation>Poista tapahtuma</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1381"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Hide similar events</source> <translation>Piilota samankaltaiset tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> <source>Edit name</source> <translation>Muokkaa nimeä</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1424"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Muuta säiliön %1 painetta (tällä hetkellä %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1459"/> <source>Unhide all events</source> <translation>Näytä kaikki tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide events</source> <translation>Piilota tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide all %1 events?</source> <translation>Piilota kaikki %1 tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1509"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> <source>Remove the selected event?</source> <translation>Poistetaanko valitut tapahtumat?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1510"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>Edit name of bookmark</source> <translation>Muokkaa kirjanmerkin nimeä</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1634"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> <source>Custom name:</source> <translation>Valinnainen nimi:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1639"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> <source>Name is too long!</source> <translation>Nimi on liian pitkä!</translation> </message> @@ -6039,96 +6049,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Ladataan...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> <source>working in no-cloud mode</source> <translation>käytä off-line -tilassa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> <source>no cloud credentials</source> <translation>Ei pilvipalvelun tunnuksia</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> <source>Please enter valid cloud credentials.</source> <translation>Syötä pilvipalvelun tunnuksent.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Yritetään avata yhteyttä pilvipalveluun uusilla tunnuksilla</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> <source>Testing cloud credentials</source> <translation>Testataan pilvipalvelun tunnuksia</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> <source>No response from cloud server to validate the credentials</source> <translation>Käyttäjätunnusta ei voitu vahvistaa, koska pilvipalvelin ei vastaa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Yhteys pilvipalveluun epäonnistui - käyttäjätunnusta ei voida vahvistaa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> <source>Cloud credentials are invalid</source> <translation>Virheelliset pilvipalvelun tunnukset</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Yhteys pivlipalveluun epäonnistui: Virhe luotaessa HTTPS -yhteyttä</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> <source>Cannot open cloud storage: %1</source> <translation>Pilvitallennuksen yhteyden avaus epäonnistui: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> <source>Cannot connect to cloud storage</source> <translation>Yhteys pilvitallennukseen epäonnistui</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> <source>Cloud storage error: %1</source> <translation>Virhe pilvitallennuksessa: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Yhteysvirhe pilvipalveluun, käytetään off-line -tilassa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Yhteys muodostettu pilvipalveluun. Sukelluslista on tyhjä.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> <source>Unknown GPS location</source> <translation>Tuntemattomat GPS -sijainnit</translation> </message> @@ -6200,7 +6210,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message numerus="yes"> <location filename="../core/qthelper.cpp" line="962"/> <source>(%n dive(s))</source> - <translation><numerusform>(%n sukellus)</numerusform><numerusform>(%n sukellusta)</numerusform></translation> + <translation><numerusform>(%n sukellus)</numerusform><numerusform>(%n sukelluksia)</numerusform></translation> </message> <message> <location filename="../core/qthelper.cpp" line="1232"/> @@ -6984,62 +6994,62 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="308"/> + <location filename="../tests/testparse.cpp" line="313"/> <source>Sample time</source> <translation>Näytteen aika</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="310"/> + <location filename="../tests/testparse.cpp" line="315"/> <source>Sample depth</source> <translation>Näytteen syvyys</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="312"/> + <location filename="../tests/testparse.cpp" line="317"/> <source>Sample temperature</source> <translation>Näytteen lämpötila</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="314"/> + <location filename="../tests/testparse.cpp" line="319"/> <source>Sample pO₂</source> <translation>Näytteen </translation> </message> <message> - <location filename="../tests/testparse.cpp" line="316"/> + <location filename="../tests/testparse.cpp" line="321"/> <source>Sample sensor1 pO₂</source> <translation>Näytesensori1 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="318"/> + <location filename="../tests/testparse.cpp" line="323"/> <source>Sample sensor2 pO₂</source> <translation>Näytesensori2 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="320"/> + <location filename="../tests/testparse.cpp" line="325"/> <source>Sample sensor3 pO₂</source> <translation>Näytesensori3 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="322"/> + <location filename="../tests/testparse.cpp" line="327"/> <source>Sample CNS</source> <translation>Näytteen CNS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="324"/> + <location filename="../tests/testparse.cpp" line="329"/> <source>Sample NDL</source> <translation>Näytteen NDL</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="326"/> + <location filename="../tests/testparse.cpp" line="331"/> <source>Sample TTS</source> <translation>Näytteen TTS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="328"/> + <location filename="../tests/testparse.cpp" line="333"/> <source>Sample stopdepth</source> <translation>Näytteen pysähdyssyvyys</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="330"/> + <location filename="../tests/testparse.cpp" line="335"/> <source>Sample pressure</source> <translation>Näytteen säiliöpaine</translation> </message> @@ -7657,7 +7667,7 @@ Keski</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="737"/> + <location filename="../core/libdivecomputer.c" line="776"/> <source>Error parsing the header</source> <translation>Virhe otsaketietojen tulkinnassa</translation> </message> @@ -7668,7 +7678,7 @@ Keski</translation> <location filename="../core/cochran.c" line="309"/> <location filename="../core/cochran.c" line="315"/> <location filename="../core/cochran.c" line="385"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="232"/> <source>deco stop</source> <translation>deko-pysähdys</translation> </message> @@ -7676,7 +7686,7 @@ Keski</translation> <location filename="../core/cochran.c" line="336"/> <location filename="../core/cochran.c" line="390"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>ascent</source> <translation>nousu</translation> </message> @@ -7688,20 +7698,20 @@ Keski</translation> </message> <message> <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>OLF</source> <translation>Happikertymä</translation> </message> <message> <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>maxdepth</source> <translation>Suurin syvyys</translation> </message> <message> <location filename="../core/cochran.c" line="358"/> <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>pO₂</source> <translation>pO₂</translation> </message> @@ -7710,28 +7720,28 @@ Keski</translation> <location filename="../core/cochran.c" line="414"/> <location filename="../core/cochran.c" line="421"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="225"/> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="242"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>gaschange</source> <translation>Kaasun vaihto</translation> </message> <message> <location filename="../core/cochran.c" line="370"/> <location filename="../core/cochran.c" line="409"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="233"/> <source>rbt</source> <translation>pohja-aika</translation> </message> <message> <location filename="../core/cochran.c" line="379"/> <location filename="../core/cochran.c" line="426"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>ceiling</source> <translation>katto</translation> </message> <message> <location filename="../core/cochran.c" line="395"/> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>transmitter</source> <translation>lähetin</translation> </message> @@ -7993,12 +8003,17 @@ Keski</translation> <message> <location filename="../core/dive.c" line="33"/> <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1447"/> - <location filename="../core/planner.c" line="1450"/> + <location filename="../core/planner.c" line="1476"/> + <location filename="../core/planner.c" line="1479"/> <source>oxygen</source> <translation>happi</translation> </message> <message> + <location filename="../core/dive.c" line="33"/> + <source>not used</source> + <translation>käyttämättä</translation> + </message> + <message> <location filename="../core/dive.c" line="181"/> <source>pascal</source> <translation>Pa</translation> @@ -8079,10 +8094,10 @@ Keski</translation> <translation>(%s) tai (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="490"/> + <location filename="../core/divelist.c" line="491"/> <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1443"/> - <location filename="../core/planner.c" line="1446"/> + <location filename="../core/planner.c" line="1472"/> + <location filename="../core/planner.c" line="1475"/> <source>air</source> <translation>ilma</translation> </message> @@ -8245,205 +8260,200 @@ Keski</translation> <translation>lokin %s haku epäonnistui (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="210"/> + <location filename="../core/libdivecomputer.c" line="218"/> <location filename="../core/parse-xml.c" line="3317"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation>tuntematon</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="231"/> <source>none</source> <translation>ei mitään</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="236"/> <source>workload</source> <translation>työmäärä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>violation</source> <translation>rike</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>bookmark</source> <translation>kirjanmerkki</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>surface</source> <translation>pinta</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>safety stop</source> <translation>turvapysähdys</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>safety stop (voluntary)</source> <translation>turvapysähdys (vapaaehtoinen)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop (mandatory)</source> <translation>turvapysähdys (pakollinen)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="245"/> <source>deepstop</source> <translation>syväpysähdys</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>ceiling (safety stop)</source> <translation>katto (turvapysähdys)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>liian syvällä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>divetime</source> <translation>sukellusaika</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>airtime</source> <translation>Ilma-aika</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>heading</source> <translation>suunta</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>tissue level warning</source> <translation>kudoskertymän varoitus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> - <source>non stop time</source> - <translation>keskeytyksetön aika</translation> - </message> - <message> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/libdivecomputer.c" line="265"/> <source>invalid event number</source> <translation>tuntematon tapahtumanumero</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="553"/> + <location filename="../core/libdivecomputer.c" line="592"/> <source>Error parsing the datetime</source> <translation>Virhe ajan jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="571"/> + <location filename="../core/libdivecomputer.c" line="610"/> <source>Dive %d: %s</source> <translation>Sukellus %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="577"/> + <location filename="../core/libdivecomputer.c" line="616"/> <source>Error parsing the divetime</source> <translation>Virhe sukelluksen keston jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="587"/> + <location filename="../core/libdivecomputer.c" line="626"/> <source>Error parsing the maxdepth</source> <translation>Virhe maksimisyvyyden jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="606"/> + <location filename="../core/libdivecomputer.c" line="645"/> <source>Error parsing temperature</source> <translation>Virhe lämpötilan jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the gas mix count</source> <translation>Virhe kaasuseosten määrän jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="638"/> + <location filename="../core/libdivecomputer.c" line="677"/> <source>Error obtaining water salinity</source> <translation>Virhe veden suolapitoisuuden määrityksessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="647"/> + <location filename="../core/libdivecomputer.c" line="686"/> <source>Error obtaining surface pressure</source> <translation>Virhe ilmanpaineen määrityksessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="672"/> + <location filename="../core/libdivecomputer.c" line="711"/> <source>Error obtaining divemode</source> <translation>Virhe sukellustyypin lataamisessa</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="692"/> + <location filename="../core/libdivecomputer.c" line="731"/> <source>Error parsing the gas mix</source> <translation>Virhe kaasuseoksen jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="717"/> + <location filename="../core/libdivecomputer.c" line="756"/> <source>Unable to create parser for %s %s</source> <translation>Jäsentäjän luominen %s %s epäonnistui</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="723"/> + <location filename="../core/libdivecomputer.c" line="762"/> <source>Error registering the data</source> <translation>Virhe tiedon rekisteröinnissä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="744"/> + <location filename="../core/libdivecomputer.c" line="783"/> <source>Error parsing the samples</source> <translation>Virhe näytteiden tulkinnassa</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="882"/> + <location filename="../core/libdivecomputer.c" line="921"/> <source>Event: waiting for user action</source> <translation>Tapahtuma: odotetaan käyttäjän toimia</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="890"/> + <location filename="../core/libdivecomputer.c" line="929"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="954"/> + <location filename="../core/libdivecomputer.c" line="993"/> <source>Error registering the event handler.</source> <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="959"/> + <location filename="../core/libdivecomputer.c" line="998"/> <source>Error registering the cancellation handler.</source> <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="980"/> + <location filename="../core/libdivecomputer.c" line="1019"/> <source>Dive data import error</source> <translation>Virhe sukellusten jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1058"/> <source>Unable to create libdivecomputer context</source> <translation>libdivecomputer-kontekstin luominen epäonnistui</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1026"/> + <location filename="../core/libdivecomputer.c" line="1065"/> <source>Unable to open %s %s (%s)</source> <translation>Avaaminen epäonnistui: %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1048"/> + <location filename="../core/libdivecomputer.c" line="1087"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Käyttövaltuudet eivät riitä laitteen %s %s (%s) avaamiseen</translation> </message> @@ -8503,179 +8513,183 @@ Keski</translation> </message> <message> <location filename="../core/planner.c" line="574"/> - <location filename="../core/planner.c" line="840"/> - <location filename="../core/planner.c" line="845"/> - <location filename="../core/planner.c" line="871"/> - <location filename="../core/planner.c" line="881"/> + <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="874"/> + <location filename="../core/planner.c" line="900"/> + <location filename="../core/planner.c" line="910"/> <source>Warning:</source> <translation>Varoitus:</translation> </message> <message> - <location filename="../core/planner.c" line="584"/> - <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> - <translation>perustuu Bühlmann ZHL-16C algoritmiin GFlow = %d ja GFhigh = %d arvoilla</translation> - </message> - <message> - <location filename="../core/planner.c" line="589"/> - <source>based on VPM-B at nominal conservatism</source> - <translation>perustuu VPM-B:hen nominaalikonservatismilla</translation> - </message> - <message> - <location filename="../core/planner.c" line="591"/> - <source>based on VPM-B at +%d conservatism</source> - <translation>Perustuu VPM-B:hen +%d:n konservatismilla</translation> - </message> - <message> - <location filename="../core/planner.c" line="593"/> + <location filename="../core/planner.c" line="812"/> <source>, effective GF=%d/%d</source> <translation>, efektiivinen GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="597"/> - <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation>harrastemoodi perustuu Bühlmannin ZHL-16B algoritmiin arvoilla GFlow = %d ja GFhigh = %d</translation> - </message> - <message> - <location filename="../core/planner.c" line="602"/> + <location filename="../core/planner.c" line="586"/> <source>Subsurface dive plan (surface interval </source> <translation>Subsurface -sukellussuunnitelma (pinta-aika </translation> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="590"/> <source>Subsurface dive plan</source> <translation>Subsurfacen sukellussuunnitelma</translation> </message> <message> - <location filename="../core/planner.c" line="610"/> - <source><div>Runtime: %dmin</div><br></source> - <translation><div>Sukellusaika: %dmin</div><br></translation> + <location filename="../core/planner.c" line="593"/> + <source>Runtime: %dmin<br></div></source> + <translation>Kesto: %dmin<br></div></translation> </message> <message> - <location filename="../core/planner.c" line="615"/> + <location filename="../core/planner.c" line="598"/> <source>depth</source> <translation>syvyys</translation> </message> <message> - <location filename="../core/planner.c" line="618"/> + <location filename="../core/planner.c" line="601"/> <source>duration</source> <translation>kesto</translation> </message> <message> - <location filename="../core/planner.c" line="621"/> + <location filename="../core/planner.c" line="604"/> <source>runtime</source> <translation>sukellusaika</translation> </message> <message> - <location filename="../core/planner.c" line="624"/> + <location filename="../core/planner.c" line="607"/> <source>gas</source> <translation>kaasu</translation> </message> <message> - <location filename="../core/planner.c" line="667"/> + <location filename="../core/planner.c" line="650"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Siirtymä %.*f %s ajassa %d:%02d min - aika %d:%02u seoksella %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="675"/> + <location filename="../core/planner.c" line="658"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Siirtymä %.*f %s ajassa %d:%02d min - sukellusaika %d:%02u on %s</translation> </message> <message> - <location filename="../core/planner.c" line="688"/> + <location filename="../core/planner.c" line="671"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Pysy syvyydessä %.*f %s %d:%02d min - aika %d:%02u seoksella %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="695"/> + <location filename="../core/planner.c" line="678"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Pysy %.*f %s:n syvyydessä %d:%02d min - sukellusaika %d:%02u %s:lla</translation> </message> <message> - <location filename="../core/planner.c" line="740"/> + <location filename="../core/planner.c" line="723"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/planner.c" line="743"/> - <location filename="../core/planner.c" line="747"/> + <location filename="../core/planner.c" line="726"/> + <location filename="../core/planner.c" line="730"/> <source>%3dmin</source> <translation>%3d min</translation> </message> <message> - <location filename="../core/planner.c" line="756"/> - <location filename="../core/planner.c" line="768"/> + <location filename="../core/planner.c" line="739"/> + <location filename="../core/planner.c" line="751"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="791"/> + <location filename="../core/planner.c" line="774"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Vaihda kaasu seuraavaan %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="793"/> + <location filename="../core/planner.c" line="776"/> <source>Switch gas to %s</source> <translation>Vaihda kaasu seuraavaan: %s </translation> </message> <message> - <location filename="../core/planner.c" line="812"/> + <location filename="../core/planner.c" line="796"/> <source>CNS</source> <translation>Happikertymä (CNS)</translation> </message> <message> - <location filename="../core/planner.c" line="814"/> + <location filename="../core/planner.c" line="798"/> <source>OTU</source> <translation>Happikertymä (OTU)</translation> </message> <message> - <location filename="../core/planner.c" line="818"/> + <location filename="../core/planner.c" line="803"/> + <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> + <translation>Dekomalli: Bühlmann ZHL-16C käyttäen GFlow = %d ja GFhigh = %d -arvoja</translation> + </message> + <message> + <location filename="../core/planner.c" line="808"/> + <source>Deco model: VPM-B at nominal conservatism</source> + <translation>Dekomalli: VPM-B nimelliskonservatismilla</translation> + </message> + <message> + <location filename="../core/planner.c" line="810"/> + <source>Deco model: VPM-B at +%d conservatism</source> + <translation>Dekomalli: VPM-B +%d konservatismilla</translation> + </message> + <message> + <location filename="../core/planner.c" line="816"/> + <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> + <translation>Dekomalli: Harrastemalli perustuen Bühlmann ZHL-16B algoritmiin GFlow = %d ja GFhigh = %d -arvoilla</translation> + </message> + <message> + <location filename="../core/planner.c" line="824"/> + <source>ATM pressure: %dmbar (%d%s)<br></div></source> + <translation>Ilmanpaine: %dmbar (%d%s)<br></div></translation> + </message> + <message> + <location filename="../core/planner.c" line="842"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Kaasun kulutus (CCR -etappeja ei mukana):</translation> </message> <message> - <location filename="../core/planner.c" line="820"/> - <source>Gas consumption:</source> - <translation>Kaasun kulutus: -</translation> + <location filename="../core/planner.c" line="844"/> + <source>Gas consumption (based on SAC</source> + <translation>Ilmankulutus (perustuen SAC:iin</translation> </message> <message> - <location filename="../core/planner.c" line="841"/> + <location filename="../core/planner.c" line="869"/> <source>this is more gas than available in the specified cylinder!</source> <translation>tämä on enemmän kaasua kuin sinulla on määritellyissä säiliöissä!</translation> </message> <message> - <location filename="../core/planner.c" line="846"/> + <location filename="../core/planner.c" line="875"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>sinulla ei ole tarpeeksi kaasua jakaaksesi sitä pintaan nousun ajan!</translation> </message> <message> - <location filename="../core/planner.c" line="848"/> + <location filename="../core/planner.c" line="877"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s / %s (%.0f%s/%.0f%s suunnitellussa nousussa)</translation> </message> <message> - <location filename="../core/planner.c" line="850"/> + <location filename="../core/planner.c" line="879"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s suunnitellun nousun aikana) / %s</translation> </message> <message> - <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="897"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>korkea pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="878"/> + <location filename="../core/planner.c" line="907"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>matala pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="1205"/> + <location filename="../core/planner.c" line="1234"/> <source>Can't find gas %s</source> <translation>Seosta %s ei löydy</translation> </message> <message> - <location filename="../core/planner.c" line="1451"/> + <location filename="../core/planner.c" line="1480"/> <source>ean</source> <translation>ean</translation> </message> @@ -9099,8 +9113,8 @@ EADD: %d%s </message> <message> <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="251"/> - <location filename="../smtk-import/smartrak.c" line="321"/> + <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="318"/> <source>Notes</source> <translation>Muistiinpanot</translation> </message> @@ -9670,77 +9684,77 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Muistiinpanot:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Built</source> <translation>Käännetty</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Sank</source> <translation>Upposi</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>SankTime</source> <translation>Sukellusaika</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Reason</source> <translation>Syy</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Nationality</source> <translation>Kansallisuus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Shipyard</source> <translation>Telakka</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>ShipType</source> <translation>Aluksen tyypp</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Length</source> <translation>Pituus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Beam</source> <translation>Puomi</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Draught</source> <translation>Kuivuus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Displacement</source> <translation>Syrjäytys</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Cargo</source> <translation>Lasti</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="263"/> + <location filename="../smtk-import/smartrak.c" line="260"/> <source>Wreck Data</source> <translation>Hylyn tiedot</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Altitude</source> <translation>Korkeus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Depth</source> <translation>Syvyys</translation> </message> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index f889b3193..5be3da9d3 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -1544,7 +1544,7 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> <source>Actions</source> <translation>Actions</translation> </message> @@ -1607,42 +1607,42 @@ <translation>Utilise</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="44"/> + <location filename="../qt-models/cylindermodel.cpp" line="43"/> <source>cuft</source> <translation>pieds³</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="48"/> + <location filename="../qt-models/cylindermodel.cpp" line="47"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="229"/> + <location filename="../qt-models/cylindermodel.cpp" line="235"/> <source>Clicking here will remove this cylinder.</source> <translation>Cliquer ici retirera ce bloc.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="239"/> + <location filename="../qt-models/cylindermodel.cpp" line="247"/> <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="242"/> + <location filename="../qt-models/cylindermodel.cpp" line="250"/> <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. Modifier MOD ajuste le % d'O₂ sur '*' pour le meilleur % d'O₂ pour la profondeur max.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="245"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <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 de Meilleur mélange FIN. Modifier MND ajuste le % d'He sur '*' pour le meilleur % d'He pour la profondeur max.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="503"/> + <location filename="../qt-models/cylindermodel.cpp" line="522"/> <source>Cylinder cannot be removed</source> <translation>Le bloc ne peut pas être retiré.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="504"/> + <location filename="../qt-models/cylindermodel.cpp" line="523"/> <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> @@ -1770,6 +1770,11 @@ <source>Show on map</source> <translation>Afficher sur la carte</translation> </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <source>Multiple Buddies</source> + <translation>Equipiers multiples</translation> + </message> </context> <context> <name>DiveDetailsEdit</name> @@ -2017,7 +2022,7 @@ GPS actuelle :</translation> <translation>Appuyer sur le bouton '+' pour ajouter une plongée</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> <source>No dives in dive list</source> <translation>Pas de plongée dans la liste des plongées</translation> </message> @@ -2107,12 +2112,12 @@ GPS actuelle :</translation> <message> <location filename="../desktop-widgets/divelistview.cpp" line="897"/> <source>Load image from web</source> - <translation type="unfinished"/> + <translation>Charger l'image depuis le web</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="974"/> <source>%1 does not appear to be an image</source> - <translation type="unfinished"/> + <translation>%1 ne semble pas être une image</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="919"/> @@ -2753,6 +2758,11 @@ GPS actuelle :</translation> <source>%1 dive(s)</source> <translation>%1 plongée(s)</translation> </message> + <message> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <source>Multiple Buddies</source> + <translation>Equipiers multiples</translation> + </message> </context> <context> <name>DivePlanner</name> @@ -2795,32 +2805,32 @@ GPS actuelle :</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="137"/> + <location filename="../qt-models/diveplannermodel.cpp" line="142"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="327"/> + <location filename="../qt-models/diveplannermodel.cpp" line="332"/> <source>Final depth</source> <translation>Prof. finale</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="329"/> + <location filename="../qt-models/diveplannermodel.cpp" line="334"/> <source>Run time</source> <translation>Durée de plongée</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="331"/> + <location filename="../qt-models/diveplannermodel.cpp" line="336"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="333"/> + <location filename="../qt-models/diveplannermodel.cpp" line="338"/> <source>Used gas</source> <translation>Gaz utilisé</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="335"/> + <location filename="../qt-models/diveplannermodel.cpp" line="340"/> <source>CC setpoint</source> <translation>Setpoint CC</translation> </message> @@ -3606,7 +3616,7 @@ veuillez envoyer les informations suivantes aux développeurs. </translation> <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> <source>Back</source> <translation>Retour</translation> </message> @@ -3696,7 +3706,7 @@ veuillez envoyer les informations suivantes aux développeurs. </translation> <message numerus="yes"> <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>, %n dive(s) here)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>, %n plongée ici)</numerusform><numerusform>, %n plongées ici)</numerusform></translation> </message> <message> <location filename="../desktop-widgets/modeldelegates.cpp" line="508"/> @@ -4828,7 +4838,7 @@ mélangés à partir de l'air et en utilisant : <message> <location filename="../desktop-widgets/mainwindow.cpp" line="506"/> <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1562"/> <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> @@ -4840,7 +4850,7 @@ mélangés à partir de l'air et en utilisant : <message> <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Cancel</source> <translation>Annuler</translation> </message> @@ -4863,9 +4873,9 @@ mélangés à partir de l'air et en utilisant : <location filename="../desktop-widgets/mainwindow.cpp" line="662"/> <location filename="../desktop-widgets/mainwindow.cpp" line="809"/> <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="998"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <source>Warning</source> <translation>Avertissement</translation> </message> @@ -4890,85 +4900,85 @@ mélangés à partir de l'air et en utilisant : <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="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <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="998"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1045"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> <source>Yearly statistics</source> <translation>Statistiques annuelles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/> <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="1262"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/> <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="1267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/> <source>Save changes?</source> <translation>Enregistrer les modifications ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> <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="1587"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/> <source>Save file as</source> <translation>Enregistrer le fichier sous</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/> <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="1685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> <source>[local cache for] %1</source> <translation>[cache local pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/> <source>[cloud storage for] %1</source> <translation>[stockage dans le cloud pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1803"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/> <source>Opening datafile from older version</source> <translation>Ouverture d'un fichier de données d'une version plus ancienne</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1804"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/> <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="1815"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1817"/> <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="1816"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <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>Fichier 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="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Contacting cloud service...</source> <translation>Contact du service cloud...</translation> </message> @@ -5020,7 +5030,7 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="315"/> <source>Firmware files (*.hex *.bin)</source> - <translation type="unfinished"/> + <translation>Fichiers firmware (*.hex *.bin)</translation> </message> </context> <context> @@ -5922,113 +5932,113 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="730"/> + <location filename="../profile-widget/profilewidget2.cpp" line="750"/> <source> (#%1 of %2)</source> <translation> (n°%1 sur %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="733"/> + <location filename="../profile-widget/profilewidget2.cpp" line="753"/> <source>Unknown dive computer</source> <translation>Ordinateur de plongée inconnu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>L'affichage de la LND/DTR est désactivée à cause d'un temps de calcul excessif</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1339"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1359"/> <source>Make first divecomputer</source> <translation>Définir comme ordinateur de plongée principal</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1341"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1361"/> <source>Delete this divecomputer</source> <translation>Supprimer cet ordinateur de plongée</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1355"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1375"/> <source>Add gas change</source> <translation>Ajouter un changement de gaz</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1358"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> <source> (Tank %1)</source> <translation> (Bloc %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1366"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> <source>Add set-point change</source> <translation>Ajouter une modification de consigne</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1368"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> <source>Add bookmark</source> <translation>Ajouter un signet</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1372"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> <source>Edit the profile</source> <translation>Modifier le profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1376"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> <source>Remove event</source> <translation>Supprimer l'évènement</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1381"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Hide similar events</source> <translation>Masquer les évènements similaires</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> <source>Edit name</source> <translation>Modifier le nom</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1424"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Ajuster la pression du bloc %1 (actuellement interpolé comme %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1459"/> <source>Unhide all events</source> <translation>Afficher tous les évènements</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide events</source> <translation>Masquer les évènements</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide all %1 events?</source> <translation>Masquer tous les évènements %1 ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1509"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> <source>Remove the selected event?</source> <translation>Supprimer l'évènement sélectionné ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1510"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>Edit name of bookmark</source> <translation>Modifier le nom du signet</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1634"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> <source>Custom name:</source> <translation>Nom personnalisé :</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1639"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> <source>Name is too long!</source> <translation>Le nom est trop long !</translation> </message> @@ -6041,96 +6051,96 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Démarrage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> <source>working in no-cloud mode</source> <translation>Travail hors-ligne</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> <source>no cloud credentials</source> <translation>Pas d'information de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> <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="284"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> <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="306"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> <source>Testing cloud credentials</source> <translation>Test des informations de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> <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="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> <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="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> <source>Cloud credentials are invalid</source> <translation>Informations de connexion pour le cloud invalides</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <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="387"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> <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="399"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> <source>Cannot connect to cloud storage</source> <translation>Impossible de se connecter au cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> <source>Cloud storage error: %1</source> <translation>Erreur cloud: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> <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="550"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/> <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="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> <source>Unknown GPS location</source> <translation>Location GPS inconnue</translation> </message> @@ -6202,7 +6212,7 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message numerus="yes"> <location filename="../core/qthelper.cpp" line="962"/> <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>(%n plongée)</numerusform><numerusform>(%n plongées)</numerusform></translation> </message> <message> <location filename="../core/qthelper.cpp" line="1232"/> @@ -6985,62 +6995,62 @@ de 30 minutes avant le début de la plongée et 30 minutes après la fin.</trans <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="308"/> + <location filename="../tests/testparse.cpp" line="313"/> <source>Sample time</source> <translation>Heure de l'échantillon</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="310"/> + <location filename="../tests/testparse.cpp" line="315"/> <source>Sample depth</source> <translation>Profondeur de l'échantillon</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="312"/> + <location filename="../tests/testparse.cpp" line="317"/> <source>Sample temperature</source> <translation>Température de l'échantillon</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="314"/> + <location filename="../tests/testparse.cpp" line="319"/> <source>Sample pO₂</source> <translation>pO₂ de l'échantillon</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="316"/> + <location filename="../tests/testparse.cpp" line="321"/> <source>Sample sensor1 pO₂</source> <translation>Échantillonnage pO₂ capteur1</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="318"/> + <location filename="../tests/testparse.cpp" line="323"/> <source>Sample sensor2 pO₂</source> <translation>Échantillonnage pO₂ capteur2</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="320"/> + <location filename="../tests/testparse.cpp" line="325"/> <source>Sample sensor3 pO₂</source> <translation>Échantillonnage pO₂ capteur3</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="322"/> + <location filename="../tests/testparse.cpp" line="327"/> <source>Sample CNS</source> <translation>SNC de l'échantillon</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="324"/> + <location filename="../tests/testparse.cpp" line="329"/> <source>Sample NDL</source> <translation>LND de l'échantillon</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="326"/> + <location filename="../tests/testparse.cpp" line="331"/> <source>Sample TTS</source> <translation>DTR de l'échantillon</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="328"/> + <location filename="../tests/testparse.cpp" line="333"/> <source>Sample stopdepth</source> <translation>Profondeur d’arrêt de l'échantillon</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="330"/> + <location filename="../tests/testparse.cpp" line="335"/> <source>Sample pressure</source> <translation>Pression de l'échantillon</translation> </message> @@ -7660,7 +7670,7 @@ Maximum</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="737"/> + <location filename="../core/libdivecomputer.c" line="776"/> <source>Error parsing the header</source> <translation>Erreur d'analyse de l'entête</translation> </message> @@ -7671,7 +7681,7 @@ Maximum</translation> <location filename="../core/cochran.c" line="309"/> <location filename="../core/cochran.c" line="315"/> <location filename="../core/cochran.c" line="385"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="232"/> <source>deco stop</source> <translation>Palier de décompression</translation> </message> @@ -7679,7 +7689,7 @@ Maximum</translation> <location filename="../core/cochran.c" line="336"/> <location filename="../core/cochran.c" line="390"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>ascent</source> <translation>remontée</translation> </message> @@ -7691,20 +7701,20 @@ Maximum</translation> </message> <message> <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>maxdepth</source> <translation>profondeur max</translation> </message> <message> <location filename="../core/cochran.c" line="358"/> <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>pO₂</source> <translation>pO₂</translation> </message> @@ -7713,28 +7723,28 @@ Maximum</translation> <location filename="../core/cochran.c" line="414"/> <location filename="../core/cochran.c" line="421"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="225"/> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="242"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>gaschange</source> <translation>Changement de gaz</translation> </message> <message> <location filename="../core/cochran.c" line="370"/> <location filename="../core/cochran.c" line="409"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="233"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../core/cochran.c" line="379"/> <location filename="../core/cochran.c" line="426"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>ceiling</source> <translation>plafond</translation> </message> <message> <location filename="../core/cochran.c" line="395"/> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>transmitter</source> <translation>transmetteur</translation> </message> @@ -7996,12 +8006,17 @@ Maximum</translation> <message> <location filename="../core/dive.c" line="33"/> <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1447"/> - <location filename="../core/planner.c" line="1450"/> + <location filename="../core/planner.c" line="1476"/> + <location filename="../core/planner.c" line="1479"/> <source>oxygen</source> <translation>oxygène</translation> </message> <message> + <location filename="../core/dive.c" line="33"/> + <source>not used</source> + <translation>Non utilisé</translation> + </message> + <message> <location filename="../core/dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> @@ -8082,10 +8097,10 @@ Maximum</translation> <translation>(%s) ou (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="490"/> + <location filename="../core/divelist.c" line="491"/> <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1443"/> - <location filename="../core/planner.c" line="1446"/> + <location filename="../core/planner.c" line="1472"/> + <location filename="../core/planner.c" line="1475"/> <source>air</source> <translation>air</translation> </message> @@ -8248,205 +8263,200 @@ Maximum</translation> <translation>git clone de %s a échoué (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="210"/> + <location filename="../core/libdivecomputer.c" line="218"/> <location filename="../core/parse-xml.c" line="3317"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="231"/> <source>none</source> <translation>aucun</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="236"/> <source>workload</source> <translation>charge</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>violation</source> <translation>violation</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>bookmark</source> <translation>signet</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>surface</source> <translation>surface</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>safety stop</source> <translation>palier de sécurité</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>safety stop (voluntary)</source> <translation>palier de sécurité (volontaire)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop (mandatory)</source> <translation>palier de sécurité (obligatoire)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="245"/> <source>deepstop</source> <translation>Palier profond</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>ceiling (safety stop)</source> <translation>plafond (palier de sécurité)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>sous la profondeur plancher</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>divetime</source> <translation>Durée de plongée</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>airtime</source> <translation>Durée à l'air</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>heading</source> <translation>entête</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>tissue level warning</source> <translation>Avertissement de niveau de tissus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> - <source>non stop time</source> - <translation>Durée sans arrêt</translation> - </message> - <message> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/libdivecomputer.c" line="265"/> <source>invalid event number</source> <translation>numéro d'évènement non valide</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="553"/> + <location filename="../core/libdivecomputer.c" line="592"/> <source>Error parsing the datetime</source> <translation>Impossible d'analyser la date</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="571"/> + <location filename="../core/libdivecomputer.c" line="610"/> <source>Dive %d: %s</source> <translation>Plongée %d : %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="577"/> + <location filename="../core/libdivecomputer.c" line="616"/> <source>Error parsing the divetime</source> <translation>Erreur lors de l'analyse de la durée de plongée</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="587"/> + <location filename="../core/libdivecomputer.c" line="626"/> <source>Error parsing the maxdepth</source> <translation>Erreur d'analyse de la profondeur maximale</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="606"/> + <location filename="../core/libdivecomputer.c" line="645"/> <source>Error parsing temperature</source> <translation>Erreur d'analyse de la température</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the gas mix count</source> <translation>Erreur d'analyse du nombre de mélanges gazeux</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="638"/> + <location filename="../core/libdivecomputer.c" line="677"/> <source>Error obtaining water salinity</source> <translation>Erreur lors de l'obtention de la salinité de l'eau</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="647"/> + <location filename="../core/libdivecomputer.c" line="686"/> <source>Error obtaining surface pressure</source> <translation>Erreur lors de l'obtention de la pression en surface</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="672"/> + <location filename="../core/libdivecomputer.c" line="711"/> <source>Error obtaining divemode</source> <translation>Erreur lors de l'obtention du mode de plongée</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="692"/> + <location filename="../core/libdivecomputer.c" line="731"/> <source>Error parsing the gas mix</source> <translation>Erreur d'analyse du mélange gazeux</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="717"/> + <location filename="../core/libdivecomputer.c" line="756"/> <source>Unable to create parser for %s %s</source> <translation>Impossible de créer un analyseur pour %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="723"/> + <location filename="../core/libdivecomputer.c" line="762"/> <source>Error registering the data</source> <translation>Impossible d'enregistrer les données</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="744"/> + <location filename="../core/libdivecomputer.c" line="783"/> <source>Error parsing the samples</source> <translation>Erreur d'analyse des échantillons</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="882"/> + <location filename="../core/libdivecomputer.c" line="921"/> <source>Event: waiting for user action</source> <translation>Évènement : attente d'une action de l'utilisateur</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="890"/> + <location filename="../core/libdivecomputer.c" line="929"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modèle = %u (0x%08x), firmware = %u (0x%08x), numéro de série = %u (0x%08x)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="954"/> + <location filename="../core/libdivecomputer.c" line="993"/> <source>Error registering the event handler.</source> <translation>Erreur d'enregistrement du gestionnaire d'évènements.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="959"/> + <location filename="../core/libdivecomputer.c" line="998"/> <source>Error registering the cancellation handler.</source> <translation>Erreur d'enregistrement du gestionnaire d'annulation.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="980"/> + <location filename="../core/libdivecomputer.c" line="1019"/> <source>Dive data import error</source> <translation>Erreur d'import des données de plongées</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1058"/> <source>Unable to create libdivecomputer context</source> <translation>Impossible de créer un contexte libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1026"/> + <location filename="../core/libdivecomputer.c" line="1065"/> <source>Unable to open %s %s (%s)</source> <translation>Impossible d'ouvrir %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1048"/> + <location filename="../core/libdivecomputer.c" line="1087"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Privilèges insuffisants pour ouvrir le périphérique %s %s (%s)</translation> </message> @@ -8506,177 +8516,182 @@ Maximum</translation> </message> <message> <location filename="../core/planner.c" line="574"/> - <location filename="../core/planner.c" line="840"/> - <location filename="../core/planner.c" line="845"/> - <location filename="../core/planner.c" line="871"/> - <location filename="../core/planner.c" line="881"/> + <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="874"/> + <location filename="../core/planner.c" line="900"/> + <location filename="../core/planner.c" line="910"/> <source>Warning:</source> <translation>Avertissement :</translation> </message> <message> - <location filename="../core/planner.c" line="584"/> - <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> - <translation>basé sur Bühlmann ZHL-16C avec GFlow = %d et GFhigh = %d</translation> - </message> - <message> - <location filename="../core/planner.c" line="589"/> - <source>based on VPM-B at nominal conservatism</source> - <translation>basé sur VPM-B en conservatisme nominal</translation> - </message> - <message> - <location filename="../core/planner.c" line="591"/> - <source>based on VPM-B at +%d conservatism</source> - <translation>basé sur VPM-B en conservatisme +%d</translation> - </message> - <message> - <location filename="../core/planner.c" line="593"/> + <location filename="../core/planner.c" line="812"/> <source>, effective GF=%d/%d</source> <translation>, GF effectif = %d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="597"/> - <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation>mode loisir basé sur Bühlmann ZHL-16B avec GFlow = %d et GFhigh = %d</translation> - </message> - <message> - <location filename="../core/planner.c" line="602"/> + <location filename="../core/planner.c" line="586"/> <source>Subsurface dive plan (surface interval </source> <translation>Planification de plongée Subsurface (intervalle surface</translation> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="590"/> <source>Subsurface dive plan</source> <translation>Planification de plongée Subsurface</translation> </message> <message> - <location filename="../core/planner.c" line="610"/> - <source><div>Runtime: %dmin</div><br></source> - <translation><div>Runtime: %dmin</div><br></translation> + <location filename="../core/planner.c" line="593"/> + <source>Runtime: %dmin<br></div></source> + <translation>Ryntime : %dmin <br></div></translation> </message> <message> - <location filename="../core/planner.c" line="615"/> + <location filename="../core/planner.c" line="598"/> <source>depth</source> <translation>profondeur</translation> </message> <message> - <location filename="../core/planner.c" line="618"/> + <location filename="../core/planner.c" line="601"/> <source>duration</source> <translation>durée</translation> </message> <message> - <location filename="../core/planner.c" line="621"/> + <location filename="../core/planner.c" line="604"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/planner.c" line="624"/> + <location filename="../core/planner.c" line="607"/> <source>gas</source> <translation>gaz</translation> </message> <message> - <location filename="../core/planner.c" line="667"/> + <location filename="../core/planner.c" line="650"/> <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/planner.c" line="675"/> + <location filename="../core/planner.c" line="658"/> <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/planner.c" line="688"/> + <location filename="../core/planner.c" line="671"/> <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/planner.c" line="695"/> + <location filename="../core/planner.c" line="678"/> <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/planner.c" line="740"/> + <location filename="../core/planner.c" line="723"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/planner.c" line="743"/> - <location filename="../core/planner.c" line="747"/> + <location filename="../core/planner.c" line="726"/> + <location filename="../core/planner.c" line="730"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/planner.c" line="756"/> - <location filename="../core/planner.c" line="768"/> + <location filename="../core/planner.c" line="739"/> + <location filename="../core/planner.c" line="751"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="791"/> + <location filename="../core/planner.c" line="774"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Changer de gaz vers %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="793"/> + <location filename="../core/planner.c" line="776"/> <source>Switch gas to %s</source> <translation>Changer de gaz vers %s</translation> </message> <message> - <location filename="../core/planner.c" line="812"/> + <location filename="../core/planner.c" line="796"/> <source>CNS</source> <translation>SNC</translation> </message> <message> - <location filename="../core/planner.c" line="814"/> + <location filename="../core/planner.c" line="798"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/planner.c" line="818"/> + <location filename="../core/planner.c" line="803"/> + <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 GFlow = %d et GFhigh = %d</translation> + </message> + <message> + <location filename="../core/planner.c" line="808"/> + <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/planner.c" line="810"/> + <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/planner.c" line="816"/> + <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 GFlow = %d et GFhigh = %d</translation> + </message> + <message> + <location filename="../core/planner.c" line="824"/> + <source>ATM pressure: %dmbar (%d%s)<br></div></source> + <translation>Pression ATM : %dmbar (%d%s)<br></div></translation> + </message> + <message> + <location filename="../core/planner.c" line="842"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consommation de gaz (segments CCR exclus) :</translation> </message> <message> - <location filename="../core/planner.c" line="820"/> - <source>Gas consumption:</source> - <translation>Consommation de gaz :</translation> + <location filename="../core/planner.c" line="844"/> + <source>Gas consumption (based on SAC</source> + <translation>Consommation de gaz (basé sur le SAC</translation> </message> <message> - <location filename="../core/planner.c" line="841"/> + <location filename="../core/planner.c" line="869"/> <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/planner.c" line="846"/> + <location filename="../core/planner.c" line="875"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>pas assez de gaz en réserve pour un échange lors de la remontée !</translation> </message> <message> - <location filename="../core/planner.c" line="848"/> + <location filename="../core/planner.c" line="877"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s dans la remontée planifiée)</translation> </message> <message> - <location filename="../core/planner.c" line="850"/> + <location filename="../core/planner.c" line="879"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durant la remontée planifiée) de %s</translation> </message> <message> - <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="897"/> <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 %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="878"/> + <location filename="../core/planner.c" line="907"/> <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 %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="1205"/> + <location filename="../core/planner.c" line="1234"/> <source>Can't find gas %s</source> <translation>Impossible de trouver le gaz %s</translation> </message> <message> - <location filename="../core/planner.c" line="1451"/> + <location filename="../core/planner.c" line="1480"/> <source>ean</source> <translation>nitrox</translation> </message> @@ -9100,8 +9115,8 @@ PEDA : %d%s </message> <message> <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="251"/> - <location filename="../smtk-import/smartrak.c" line="321"/> + <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="318"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -9672,77 +9687,77 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <translation>Notes :</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Built</source> <translation>Construire</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Sank</source> <translation>Coulé</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>SankTime</source> <translation>SankTime</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Reason</source> <translation>Raison</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Nationality</source> <translation>Nationalité</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Shipyard</source> <translation>Shipyard</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>ShipType</source> <translation>ShipType</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Length</source> <translation>Longueur</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Beam</source> <translation>Beam</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Draught</source> <translation>Sécheresse</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Displacement</source> <translation>Déplacement</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Cargo</source> <translation>Cargo</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="263"/> + <location filename="../smtk-import/smartrak.c" line="260"/> <source>Wreck Data</source> <translation>Données d'épave</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Altitude</source> <translation>Altitude</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Depth</source> <translation>Profondeur</translation> </message> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 1140afa0f..eab426f77 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -1544,7 +1544,7 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> <source>Actions</source> <translation>Действия</translation> </message> @@ -1607,42 +1607,42 @@ <translation>Назначение</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="44"/> + <location filename="../qt-models/cylindermodel.cpp" line="43"/> <source>cuft</source> <translation>куб. фут</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="48"/> + <location filename="../qt-models/cylindermodel.cpp" line="47"/> <source>ℓ</source> <translation>л</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="229"/> + <location filename="../qt-models/cylindermodel.cpp" line="235"/> <source>Clicking here will remove this cylinder.</source> <translation>Нажмите здесь чтобы удалить этот баллон.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="239"/> + <location filename="../qt-models/cylindermodel.cpp" line="247"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Глубина переключения на деко-газ. Рассчитывается из настроек деко pO₂, если не указано вручную.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="242"/> + <location filename="../qt-models/cylindermodel.cpp" line="250"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</source> <translation>Вычислено с учетом настройки донного pO₂. Ввод MOD меняет O₂%, установите '*' для лучшего O₂% на макс. глубине.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="245"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</source> <translation>Вычислено с учетом настройки END лучшей смеси. Ввод MND меняет He%, установите '*' для лучшего He% на макс. глубине.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="503"/> + <location filename="../qt-models/cylindermodel.cpp" line="522"/> <source>Cylinder cannot be removed</source> <translation>Баллон не может быть удален</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="504"/> + <location filename="../qt-models/cylindermodel.cpp" line="523"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation> </message> @@ -1770,6 +1770,11 @@ <source>Show on map</source> <translation>Показать на карте</translation> </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <source>Multiple Buddies</source> + <translation>Несколько напарников</translation> + </message> </context> <context> <name>DiveDetailsEdit</name> @@ -2017,7 +2022,7 @@ GPS location:</source> <translation>Нажмите кнопку '+' чтобы добавить погружение</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> <source>No dives in dive list</source> <translation>Нет погружений в списке</translation> </message> @@ -2107,12 +2112,12 @@ GPS location:</source> <message> <location filename="../desktop-widgets/divelistview.cpp" line="897"/> <source>Load image from web</source> - <translation type="unfinished"/> + <translation>Загрузить фото из Web</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="974"/> <source>%1 does not appear to be an image</source> - <translation type="unfinished"/> + <translation>%1 не является картинкой</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="919"/> @@ -2753,6 +2758,11 @@ GPS location:</source> <source>%1 dive(s)</source> <translation>%1 погружение(й)</translation> </message> + <message> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <source>Multiple Buddies</source> + <translation>Несколько напарников</translation> + </message> </context> <context> <name>DivePlanner</name> @@ -2795,32 +2805,32 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="137"/> + <location filename="../qt-models/diveplannermodel.cpp" line="142"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="327"/> + <location filename="../qt-models/diveplannermodel.cpp" line="332"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="329"/> + <location filename="../qt-models/diveplannermodel.cpp" line="334"/> <source>Run time</source> <translation>Отсчет</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="331"/> + <location filename="../qt-models/diveplannermodel.cpp" line="336"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="333"/> + <location filename="../qt-models/diveplannermodel.cpp" line="338"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="335"/> + <location filename="../qt-models/diveplannermodel.cpp" line="340"/> <source>CC setpoint</source> <translation>Установка ребризера</translation> </message> @@ -3607,7 +3617,7 @@ p, li { white-space: pre-wrap; } <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> <source>Back</source> <translation>Назад</translation> </message> @@ -3697,7 +3707,7 @@ p, li { white-space: pre-wrap; } <message numerus="yes"> <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>, %n dive(s) here)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>, здесь %n дайв)</numerusform><numerusform>, здесь %n дайва)</numerusform><numerusform>, здесь %n дайвов)</numerusform><numerusform>, %n dive(s) here)</numerusform></translation> </message> <message> <location filename="../desktop-widgets/modeldelegates.cpp" line="508"/> @@ -4829,7 +4839,7 @@ mixed from Air and using: <message> <location filename="../desktop-widgets/mainwindow.cpp" line="506"/> <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1562"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Сохраните или отмените изменения перед открытием нового файла.</translation> </message> @@ -4841,7 +4851,7 @@ mixed from Air and using: <message> <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -4864,9 +4874,9 @@ mixed from Air and using: <location filename="../desktop-widgets/mainwindow.cpp" line="662"/> <location filename="../desktop-widgets/mainwindow.cpp" line="809"/> <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="998"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4891,85 +4901,85 @@ mixed from Air and using: <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="998"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Попытка редактирования погружения, созданного не вручную.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1045"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1262"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл журнала?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1803"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1804"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/> <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>Вы открыли журнал, созданный в старой версии Subsurface. Мы рекомендуем прочитать руководство, чтобы узнать о последних изменения, особенно что касается управления сайтами погружений. Subsurface попытался перенести уже существующие данные, но тем не менее стоит проверить, что все информация выглядит корректно.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1817"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1816"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <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>Файлы погружений (*.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 (*.can *.CAN);;Файлы CSV (*.csv *.CSV);;Файлы DiveLog.de (*.dld *.DLD);;Файлы JDiveLog (*.jlb *.JLB);;Файлы Liquivision (*.lvd *.LVD);;Файлы MkVI (*.txt *.TXT);;Файлы Suunto (*.sde *.db *.SDE *.DB);;Файлы Divesoft (*.dlf *.DLF);;Файлы UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Файлы XML (*.xml *.XML);;APD log viewer (*.apd *.APD);;Файлы Datatrak/WLog (*.log *.LOG);;Файлы OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Все файлы (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -5021,7 +5031,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="315"/> <source>Firmware files (*.hex *.bin)</source> - <translation type="unfinished"/> + <translation>Файлы прошивки (*.hex *.bin)</translation> </message> </context> <context> @@ -5923,113 +5933,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="730"/> + <location filename="../profile-widget/profilewidget2.cpp" line="750"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="733"/> + <location filename="../profile-widget/profilewidget2.cpp" line="753"/> <source>Unknown dive computer</source> <translation>Неизвестный дайвкомпьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Отображение NDL/TTS отключено из-за большого времени расчета</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1339"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1359"/> <source>Make first divecomputer</source> <translation>Сделать первым компьютером</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1341"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1361"/> <source>Delete this divecomputer</source> <translation>Удалить этот дайвкомпьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1355"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1375"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1358"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> <source> (Tank %1)</source> <translation> (Баллон %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1366"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> <source>Add set-point change</source> <translation>Добавить замену установки</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1368"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1372"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> <source>Edit the profile</source> <translation>Редактировать профиль</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1376"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1381"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1424"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Скорректировать давление баллона %1 (текущее интерполированное %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1459"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1509"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1510"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1634"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1639"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -6042,96 +6052,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Запуск...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Попытка открыть облачное хранилище с новыми учетными данными</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> <source>Testing cloud credentials</source> <translation>Проверка учетных данных</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> <source>No response from cloud server to validate the credentials</source> <translation>Нет ответа от сервера в облаке чтобы проверить учетные данные</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Невозможно подключиться к облачному хранилищу - учетная запись не проверена</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> <source>Cloud credentials are invalid</source> <translation>Учетные данные неверны</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Невозможно открыть облачное хранилище: Ошибка защищенного подключения</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> <source>Cannot open cloud storage: %1</source> <translation>Невозможно открыть облачное хранилище: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> <source>Cannot connect to cloud storage</source> <translation>Невозможно подключиться к облачному хранилищу</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> @@ -6203,7 +6213,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message numerus="yes"> <location filename="../core/qthelper.cpp" line="962"/> <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>(%n дайв)</numerusform><numerusform>(%n дайва)</numerusform><numerusform>(%n дайвов)</numerusform><numerusform>(%n dive(s))</numerusform></translation> </message> <message> <location filename="../core/qthelper.cpp" line="1232"/> @@ -6988,62 +6998,62 @@ Not all images have timestamps in the range between <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="308"/> + <location filename="../tests/testparse.cpp" line="313"/> <source>Sample time</source> <translation>Выборка времени</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="310"/> + <location filename="../tests/testparse.cpp" line="315"/> <source>Sample depth</source> <translation>Выборка глубины</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="312"/> + <location filename="../tests/testparse.cpp" line="317"/> <source>Sample temperature</source> <translation>Выборка температуры</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="314"/> + <location filename="../tests/testparse.cpp" line="319"/> <source>Sample pO₂</source> <translation>Выборка pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="316"/> + <location filename="../tests/testparse.cpp" line="321"/> <source>Sample sensor1 pO₂</source> <translation>Выборка 1-го сеносора pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="318"/> + <location filename="../tests/testparse.cpp" line="323"/> <source>Sample sensor2 pO₂</source> <translation>Выборка 2-го сеносора pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="320"/> + <location filename="../tests/testparse.cpp" line="325"/> <source>Sample sensor3 pO₂</source> <translation>Выборка 3-го сеносора pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="322"/> + <location filename="../tests/testparse.cpp" line="327"/> <source>Sample CNS</source> <translation>Выборка CNS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="324"/> + <location filename="../tests/testparse.cpp" line="329"/> <source>Sample NDL</source> <translation>Выборка NDL</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="326"/> + <location filename="../tests/testparse.cpp" line="331"/> <source>Sample TTS</source> <translation>Выборка TTS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="328"/> + <location filename="../tests/testparse.cpp" line="333"/> <source>Sample stopdepth</source> <translation>Выборка остановки</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="330"/> + <location filename="../tests/testparse.cpp" line="335"/> <source>Sample pressure</source> <translation>Выборка давления</translation> </message> @@ -7662,7 +7672,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="737"/> + <location filename="../core/libdivecomputer.c" line="776"/> <source>Error parsing the header</source> <translation>Ошибка разбора заголовка</translation> </message> @@ -7673,7 +7683,7 @@ Maximum</source> <location filename="../core/cochran.c" line="309"/> <location filename="../core/cochran.c" line="315"/> <location filename="../core/cochran.c" line="385"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="232"/> <source>deco stop</source> <translation>деко стоп</translation> </message> @@ -7681,7 +7691,7 @@ Maximum</source> <location filename="../core/cochran.c" line="336"/> <location filename="../core/cochran.c" line="390"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>ascent</source> <translation>подъем</translation> </message> @@ -7693,20 +7703,20 @@ Maximum</source> </message> <message> <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>maxdepth</source> <translation>макс. глуб.</translation> </message> <message> <location filename="../core/cochran.c" line="358"/> <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>pO₂</source> <translation>pO₂</translation> </message> @@ -7715,28 +7725,28 @@ Maximum</source> <location filename="../core/cochran.c" line="414"/> <location filename="../core/cochran.c" line="421"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="225"/> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="242"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>gaschange</source> <translation>замена смеси</translation> </message> <message> <location filename="../core/cochran.c" line="370"/> <location filename="../core/cochran.c" line="409"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="233"/> <source>rbt</source> <translation>оставшееся время на дне</translation> </message> <message> <location filename="../core/cochran.c" line="379"/> <location filename="../core/cochran.c" line="426"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>ceiling</source> <translation>потолок</translation> </message> <message> <location filename="../core/cochran.c" line="395"/> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>transmitter</source> <translation>передатчик</translation> </message> @@ -7998,12 +8008,17 @@ Maximum</source> <message> <location filename="../core/dive.c" line="33"/> <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1447"/> - <location filename="../core/planner.c" line="1450"/> + <location filename="../core/planner.c" line="1476"/> + <location filename="../core/planner.c" line="1479"/> <source>oxygen</source> <translation>кислород</translation> </message> <message> + <location filename="../core/dive.c" line="33"/> + <source>not used</source> + <translation>не используется</translation> + </message> + <message> <location filename="../core/dive.c" line="181"/> <source>pascal</source> <translation>Па</translation> @@ -8084,10 +8099,10 @@ Maximum</source> <translation>(%s) или (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="490"/> + <location filename="../core/divelist.c" line="491"/> <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1443"/> - <location filename="../core/planner.c" line="1446"/> + <location filename="../core/planner.c" line="1472"/> + <location filename="../core/planner.c" line="1475"/> <source>air</source> <translation>воздух</translation> </message> @@ -8250,205 +8265,200 @@ Maximum</source> <translation>Клонирование git-репозитория %s не удалось (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="210"/> + <location filename="../core/libdivecomputer.c" line="218"/> <location filename="../core/parse-xml.c" line="3317"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="231"/> <source>none</source> <translation>отсутствует</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="236"/> <source>workload</source> <translation>нагрузка</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>violation</source> <translation>нарушение</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>bookmark</source> <translation>закладка</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>surface</source> <translation>поверхность</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>safety stop</source> <translation>остановка безопасности</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>safety stop (voluntary)</source> <translation>остановка безопасности (добровольно)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop (mandatory)</source> <translation>остановка безопасности (обязательно)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="245"/> <source>deepstop</source> <translation>глубокая остановка</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>ceiling (safety stop)</source> <translation>потолок (остановка безопасности)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>ниже пола</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>divetime</source> <translation>время погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>airtime</source> <translation>оставшееся время по воздуху</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>heading</source> <translation>направление</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>tissue level warning</source> <translation>насыщение тканей</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> - <source>non stop time</source> - <translation>время без остановки</translation> - </message> - <message> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/libdivecomputer.c" line="265"/> <source>invalid event number</source> <translation>неверный номер события</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="553"/> + <location filename="../core/libdivecomputer.c" line="592"/> <source>Error parsing the datetime</source> <translation>Ошибка разбора даты/времени</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="571"/> + <location filename="../core/libdivecomputer.c" line="610"/> <source>Dive %d: %s</source> <translation>Погр. №%d - %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="577"/> + <location filename="../core/libdivecomputer.c" line="616"/> <source>Error parsing the divetime</source> <translation>Ошибка разбора времени погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="587"/> + <location filename="../core/libdivecomputer.c" line="626"/> <source>Error parsing the maxdepth</source> <translation>Ошибка разбора макс. глубины</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="606"/> + <location filename="../core/libdivecomputer.c" line="645"/> <source>Error parsing temperature</source> <translation>Ошибка разбора температуры</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the gas mix count</source> <translation>Ошибка разбора счетчика смесей</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="638"/> + <location filename="../core/libdivecomputer.c" line="677"/> <source>Error obtaining water salinity</source> <translation>Ошибка получения солености воды</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="647"/> + <location filename="../core/libdivecomputer.c" line="686"/> <source>Error obtaining surface pressure</source> <translation>Ошибка получения давления на поверхности</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="672"/> + <location filename="../core/libdivecomputer.c" line="711"/> <source>Error obtaining divemode</source> <translation>Ошибка при получении режима погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="692"/> + <location filename="../core/libdivecomputer.c" line="731"/> <source>Error parsing the gas mix</source> <translation>Ошибка разбора смеси</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="717"/> + <location filename="../core/libdivecomputer.c" line="756"/> <source>Unable to create parser for %s %s</source> <translation>Невозможно создать анализатор для %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="723"/> + <location filename="../core/libdivecomputer.c" line="762"/> <source>Error registering the data</source> <translation>Ошибка регистрации данных</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="744"/> + <location filename="../core/libdivecomputer.c" line="783"/> <source>Error parsing the samples</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="882"/> + <location filename="../core/libdivecomputer.c" line="921"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="890"/> + <location filename="../core/libdivecomputer.c" line="929"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="954"/> + <location filename="../core/libdivecomputer.c" line="993"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="959"/> + <location filename="../core/libdivecomputer.c" line="998"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="980"/> + <location filename="../core/libdivecomputer.c" line="1019"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1058"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1026"/> + <location filename="../core/libdivecomputer.c" line="1065"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1048"/> + <location filename="../core/libdivecomputer.c" line="1087"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Нет прав, чтобы открыть устройство %s %s (%s)</translation> </message> @@ -8508,177 +8518,182 @@ Maximum</source> </message> <message> <location filename="../core/planner.c" line="574"/> - <location filename="../core/planner.c" line="840"/> - <location filename="../core/planner.c" line="845"/> - <location filename="../core/planner.c" line="871"/> - <location filename="../core/planner.c" line="881"/> + <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="874"/> + <location filename="../core/planner.c" line="900"/> + <location filename="../core/planner.c" line="910"/> <source>Warning:</source> <translation>Внимание:</translation> </message> <message> - <location filename="../core/planner.c" line="584"/> - <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> - <translation>на сонове алгоритма Бюльмана ZHL-16C с GFlow = %d и GFhigh = %d</translation> - </message> - <message> - <location filename="../core/planner.c" line="589"/> - <source>based on VPM-B at nominal conservatism</source> - <translation>на основе VPM-B с номинальным консерватизмом</translation> - </message> - <message> - <location filename="../core/planner.c" line="591"/> - <source>based on VPM-B at +%d conservatism</source> - <translation>на основе VPM-B с консерватизмом +%d</translation> - </message> - <message> - <location filename="../core/planner.c" line="593"/> + <location filename="../core/planner.c" line="812"/> <source>, effective GF=%d/%d</source> <translation>, эффективный GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="597"/> - <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation>рекреационный режим на основе алгорита Бюльмана ZHL-16B с GFlow = %d и GFhigh = %d</translation> - </message> - <message> - <location filename="../core/planner.c" line="602"/> + <location filename="../core/planner.c" line="586"/> <source>Subsurface dive plan (surface interval </source> <translation>План погружения Subsurface (пов. интервал</translation> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="590"/> <source>Subsurface dive plan</source> <translation>План погружения Subsurface</translation> </message> <message> - <location filename="../core/planner.c" line="610"/> - <source><div>Runtime: %dmin</div><br></source> - <translation><div>Рантайм: %dмин</div><br></translation> + <location filename="../core/planner.c" line="593"/> + <source>Runtime: %dmin<br></div></source> + <translation>Рантайм: %dмин<br></div></translation> </message> <message> - <location filename="../core/planner.c" line="615"/> + <location filename="../core/planner.c" line="598"/> <source>depth</source> <translation>глубина</translation> </message> <message> - <location filename="../core/planner.c" line="618"/> + <location filename="../core/planner.c" line="601"/> <source>duration</source> <translation>длительность</translation> </message> <message> - <location filename="../core/planner.c" line="621"/> + <location filename="../core/planner.c" line="604"/> <source>runtime</source> <translation>отсчет</translation> </message> <message> - <location filename="../core/planner.c" line="624"/> + <location filename="../core/planner.c" line="607"/> <source>gas</source> <translation>смесь</translation> </message> <message> - <location filename="../core/planner.c" line="667"/> + <location filename="../core/planner.c" line="650"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/planner.c" line="675"/> + <location filename="../core/planner.c" line="658"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s</translation> </message> <message> - <location filename="../core/planner.c" line="688"/> + <location filename="../core/planner.c" line="671"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Остановка на %.*f %s в течение %d:%02d мин - отсчет %d:%02u на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/planner.c" line="695"/> + <location filename="../core/planner.c" line="678"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Остановка на %.*f %s на %d:%02d мин - отсчет %d:%02u на %s</translation> </message> <message> - <location filename="../core/planner.c" line="740"/> + <location filename="../core/planner.c" line="723"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/planner.c" line="743"/> - <location filename="../core/planner.c" line="747"/> + <location filename="../core/planner.c" line="726"/> + <location filename="../core/planner.c" line="730"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../core/planner.c" line="756"/> - <location filename="../core/planner.c" line="768"/> + <location filename="../core/planner.c" line="739"/> + <location filename="../core/planner.c" line="751"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fбар)</translation> </message> <message> - <location filename="../core/planner.c" line="791"/> + <location filename="../core/planner.c" line="774"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Переключение на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/planner.c" line="793"/> + <location filename="../core/planner.c" line="776"/> <source>Switch gas to %s</source> <translation>Переключение на %s</translation> </message> <message> - <location filename="../core/planner.c" line="812"/> + <location filename="../core/planner.c" line="796"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/planner.c" line="814"/> + <location filename="../core/planner.c" line="798"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/planner.c" line="818"/> + <location filename="../core/planner.c" line="803"/> + <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> + <translation>Деко-модель: Bühlmann ZHL-16C с GFlow = %d и GFhigh = %d</translation> + </message> + <message> + <location filename="../core/planner.c" line="808"/> + <source>Deco model: VPM-B at nominal conservatism</source> + <translation>Деко-модель: VPM-B с номинальным консерватизимом</translation> + </message> + <message> + <location filename="../core/planner.c" line="810"/> + <source>Deco model: VPM-B at +%d conservatism</source> + <translation>Деко-модель: VPM-B с консерватизимом +%d</translation> + </message> + <message> + <location filename="../core/planner.c" line="816"/> + <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> + <translation>Деко-модель: Рекреационный режим по модели Bühlmann ZHL-16B с GFlow = %d и GFhigh = %d</translation> + </message> + <message> + <location filename="../core/planner.c" line="824"/> + <source>ATM pressure: %dmbar (%d%s)<br></div></source> + <translation>Атм. давление: %dмбар (%d%s)<br></div></translation> + </message> + <message> + <location filename="../core/planner.c" line="842"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Потребление газа (без CCR сегментов)</translation> </message> <message> - <location filename="../core/planner.c" line="820"/> - <source>Gas consumption:</source> - <translation>Расход газов:</translation> + <location filename="../core/planner.c" line="844"/> + <source>Gas consumption (based on SAC</source> + <translation>Расход газа (расчет по SAC</translation> </message> <message> - <location filename="../core/planner.c" line="841"/> + <location filename="../core/planner.c" line="869"/> <source>this is more gas than available in the specified cylinder!</source> <translation>расход выше чем запас газа в указанном баллоне!</translation> </message> <message> - <location filename="../core/planner.c" line="846"/> + <location filename="../core/planner.c" line="875"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>недостаточно газа для резерва при подъеме</translation> </message> <message> - <location filename="../core/planner.c" line="848"/> + <location filename="../core/planner.c" line="877"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s в запланированном подъеме)</translation> </message> <message> - <location filename="../core/planner.c" line="850"/> + <location filename="../core/planner.c" line="879"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s в запланированном подъеме) на %s</translation> </message> <message> - <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="897"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>высокий pO₂ %.2f в %d:%02u на %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="878"/> + <location filename="../core/planner.c" line="907"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>Низкое значение pO₂ %.2f в %d:%02u на смеси %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="1205"/> + <location filename="../core/planner.c" line="1234"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1451"/> + <location filename="../core/planner.c" line="1480"/> <source>ean</source> <translation>ean</translation> </message> @@ -9103,8 +9118,8 @@ EADD: %d%s </message> <message> <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="251"/> - <location filename="../smtk-import/smartrak.c" line="321"/> + <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="318"/> <source>Notes</source> <translation>Примечания</translation> </message> @@ -9675,77 +9690,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Заметки:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Built</source> <translation>Построен</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Sank</source> <translation>Затонул</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>SankTime</source> <translation>Затонул</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Reason</source> <translation>Причина</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Nationality</source> <translation>Порт приписки</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Shipyard</source> <translation>Верфь</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>ShipType</source> <translation>Тип судна</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Length</source> <translation>Длительность</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Beam</source> <translation>Ширина</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Draught</source> <translation>Водоизмещение</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Displacement</source> <translation>Водоизмещение</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Cargo</source> <translation>Карго</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="263"/> + <location filename="../smtk-import/smartrak.c" line="260"/> <source>Wreck Data</source> <translation>Данные рэка</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Altitude</source> <translation>Высота</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Depth</source> <translation>Глубина</translation> </message> @@ -9996,7 +10011,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> <source>Postpone gas change if a stop is not required</source> - <translation>Отложить замену гаща если остановка не требуется</translation> + <translation>Отложить замену газа если остановка не требуется</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index 408c3de82..51fd54dbc 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -5530,7 +5530,7 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> <source>Literal characters</source> - <translation type="unfinished"/> + <translation>Bokstavliga tecken</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index 6718e1ae4..793cd8eb4 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -25,7 +25,10 @@ © Subsurface developer team 2011-2017</source> - <translation type="unfinished"/> + <translation>版本: %1 + +© Subsurface developer team +2011-2017</translation> </message> </context> <context> @@ -1541,7 +1544,7 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> <source>Actions</source> <translation>動作</translation> </message> @@ -1604,42 +1607,42 @@ <translation>使用</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="44"/> + <location filename="../qt-models/cylindermodel.cpp" line="43"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="48"/> + <location filename="../qt-models/cylindermodel.cpp" line="47"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="229"/> + <location filename="../qt-models/cylindermodel.cpp" line="235"/> <source>Clicking here will remove this cylinder.</source> <translation>於此處按下將移除此氣瓶.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="239"/> + <location filename="../qt-models/cylindermodel.cpp" line="247"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>減壓氣體交換深度. 除非手動計算, 請優先使用減壓 pO₂ 計算. </translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="242"/> + <location filename="../qt-models/cylindermodel.cpp" line="250"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</source> <translation>優先使用置底pO₂計算. 調整O₂%設定MOD, 針對最大深度設定 '*' 使用最佳O₂%.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="245"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</source> <translation>優先使用最佳Mix END計算. 調整He%設定MND, 針對最大深度設定 '*' 使用最佳He%.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="503"/> + <location filename="../qt-models/cylindermodel.cpp" line="522"/> <source>Cylinder cannot be removed</source> <translation>氣瓶無法移除</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="504"/> + <location filename="../qt-models/cylindermodel.cpp" line="523"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>此氣瓶仍在使用中，在潛水中，只有未使用的氣瓶可被移除。</translation> </message> @@ -1767,6 +1770,11 @@ <source>Show on map</source> <translation>顯示於地圖</translation> </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <source>Multiple Buddies</source> + <translation>複數潛伴</translation> + </message> </context> <context> <name>DiveDetailsEdit</name> @@ -2014,7 +2022,7 @@ GPS位置:</translation> <translation>請按 '+' 鍵新增一潛水</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> <source>No dives in dive list</source> <translation>列表中無任何潛水記錄</translation> </message> @@ -2104,12 +2112,12 @@ GPS位置:</translation> <message> <location filename="../desktop-widgets/divelistview.cpp" line="897"/> <source>Load image from web</source> - <translation type="unfinished"/> + <translation>從網頁載入影像</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="974"/> <source>%1 does not appear to be an image</source> - <translation type="unfinished"/> + <translation>%1 非影像檔案</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="919"/> @@ -2750,6 +2758,11 @@ GPS位置:</translation> <source>%1 dive(s)</source> <translation>%1 dive(s)</translation> </message> + <message> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <source>Multiple Buddies</source> + <translation>複數潛伴</translation> + </message> </context> <context> <name>DivePlanner</name> @@ -2792,32 +2805,32 @@ GPS位置:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="137"/> + <location filename="../qt-models/diveplannermodel.cpp" line="142"/> <source>unknown</source> <translation>未知</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="327"/> + <location filename="../qt-models/diveplannermodel.cpp" line="332"/> <source>Final depth</source> <translation>最後深度</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="329"/> + <location filename="../qt-models/diveplannermodel.cpp" line="334"/> <source>Run time</source> <translation>持續時間</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="331"/> + <location filename="../qt-models/diveplannermodel.cpp" line="336"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="333"/> + <location filename="../qt-models/diveplannermodel.cpp" line="338"/> <source>Used gas</source> <translation>使用氣量</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="335"/> + <location filename="../qt-models/diveplannermodel.cpp" line="340"/> <source>CC setpoint</source> <translation>CC 設定點</translation> </message> @@ -3509,7 +3522,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="254"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> - <translation type="unfinished"/> + <translation>從Facebook帳號中斷Subsurface連接, 改以使用選單"分享"進入. </translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="263"/> @@ -3604,7 +3617,7 @@ p, li { white-space: pre-wrap; } <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> <source>Back</source> <translation>回到</translation> </message> @@ -3694,7 +3707,7 @@ p, li { white-space: pre-wrap; } <message numerus="yes"> <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>, %n dive(s) here)</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>, %n dive(s) 此處)</numerusform></translation> </message> <message> <location filename="../desktop-widgets/modeldelegates.cpp" line="508"/> @@ -4821,12 +4834,12 @@ mixed from Air and using: <message> <location filename="../desktop-widgets/mainwindow.cpp" line="358"/> <source>Disconnect from</source> - <translation type="unfinished"/> + <translation>從中斷</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="506"/> <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1562"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>在開啟新檔前，請儲存或取消此次潛水的編輯。</translation> </message> @@ -4838,7 +4851,7 @@ mixed from Air and using: <message> <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Cancel</source> <translation>取消</translation> </message> @@ -4861,9 +4874,9 @@ mixed from Air and using: <location filename="../desktop-widgets/mainwindow.cpp" line="662"/> <location filename="../desktop-widgets/mainwindow.cpp" line="809"/> <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="998"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <source>Warning</source> <translation>提醒</translation> </message> @@ -4888,85 +4901,85 @@ mixed from Air and using: <translation>嘗試針對非原計畫的潛水進行重新規畫. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>請在嘗試其他編輯時先完成當前編輯</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="998"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>嘗試編輯非手動建立的潛水記錄. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1045"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> <source>Yearly statistics</source> <translation>年統計</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>您是否要對檔案 %1 所做的修改儲存? </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1262"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>您是否要對資料檔案所做的修改進行儲存? </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/> <source>Save changes?</source> <translation>儲存變更? </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> <source>Changes will be lost if you don't save them.</source> <translation>如果不進行儲存，所做變更將會遺失。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/> <source>Save file as</source> <translation>另存新檔</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> <source>[local cache for] %1</source> <translation>[本地端暫存] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/> <source>[cloud storage for] %1</source> <translation>[雲端裝置] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1803"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/> <source>Opening datafile from older version</source> <translation>從較舊的版本中開啟資料檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1804"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/> <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>自舊版的 Subsurface 開啟資料檔案. 建議請先在新版程式中, 閱讀相關變更, 特別是有關潛點管理的部分. Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛點管理系統, 並確認資料是否正確. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1817"/> <source>Open dive log file</source> <translation>打開潛水日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1816"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <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>潛水日誌檔案 (*.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 檔案 (*.can *.CAN);;CSV 檔案 (*.csv *.CSV);;DiveLog.de 檔案 (*.dld *.DLD);;JDiveLog 檔案 (*.jlb *.JLB);;Liquivision 檔案 (*.lvd *.LVD);;MkVI 檔案 (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft 檔案 (*.dlf *.DLF);;UDDF/UDCF 檔案 (*.uddf *.udcf *.UDDF *.UDCF);;XML 檔案 (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog 檔案 (*.log *.LOG);;OSTCtools 檔案 (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;所有檔案 (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Contacting cloud service...</source> <translation>聯絡雲端服務...</translation> </message> @@ -4991,7 +5004,9 @@ Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛 <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> - <translation type="unfinished"/> + <translation> + +如果裝置是使用藍芽連接, 在繼續此更新前, 請使用與日誌下載相同的步驟</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="293"/> @@ -5016,7 +5031,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="315"/> <source>Firmware files (*.hex *.bin)</source> - <translation type="unfinished"/> + <translation>韌體程式檔案 (*.hex *.bin)</translation> </message> </context> <context> @@ -5918,113 +5933,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="730"/> + <location filename="../profile-widget/profilewidget2.cpp" line="750"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="733"/> + <location filename="../profile-widget/profilewidget2.cpp" line="753"/> <source>Unknown dive computer</source> <translation>未知的潛水電腦</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>當超過處理時間，顯示關閉 NDL / TTS</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1339"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1359"/> <source>Make first divecomputer</source> <translation>設定第 1 潛水電腦</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1341"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1361"/> <source>Delete this divecomputer</source> <translation>刪除此潛水電腦</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1355"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1375"/> <source>Add gas change</source> <translation>增加氣瓶交換</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1358"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1366"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> <source>Add set-point change</source> <translation>增加 set-point 變更</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1368"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> <source>Add bookmark</source> <translation>新增書籤</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1372"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> <source>Edit the profile</source> <translation>編輯摘要</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1376"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> <source>Remove event</source> <translation>移除事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1381"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Hide similar events</source> <translation>隱藏相似事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> <source>Edit name</source> <translation>潛水名稱</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1424"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>調整氣瓶 %1 壓力 (以 %2 插入目前位置)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1459"/> <source>Unhide all events</source> <translation>取消隱藏所有事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide events</source> <translation>隱藏事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide all %1 events?</source> <translation>隱藏所有 %1 事件?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1509"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> <source>Remove the selected event?</source> <translation>移除所選擇的事件？</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1510"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>Edit name of bookmark</source> <translation>編輯書籤名稱</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1634"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> <source>Custom name:</source> <translation>自訂名稱:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1639"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> <source>Name is too long!</source> <translation>名稱太長！</translation> </message> @@ -6037,96 +6052,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>開始...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> <source>working in no-cloud mode</source> <translation>於非雲端模式工作</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> <source>no cloud credentials</source> <translation>無雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> <source>Please enter valid cloud credentials.</source> <translation>請輸入合法的雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> <source>Attempting to open cloud storage with new credentials</source> <translation>嘗試使用新的憑證開啟雲端儲存</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> <source>Testing cloud credentials</source> <translation>測試雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> <source>No response from cloud server to validate the credentials</source> <translation>雲端伺服器認證憑證無回應</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>無法連結雲端儲存 - 未認證的帳號</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> <source>Cloud credentials are invalid</source> <translation>不合法的雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>無法開啟雲端儲存: 建立 https 連線錯誤</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> <source>Cannot open cloud storage: %1</source> <translation>無法開啟雲端儲存: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> <source>Cannot connect to cloud storage</source> <translation>無法連結雲端儲存</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> <source>Cloud storage error: %1</source> <translation>雲端儲存錯誤: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>連結雲端伺服器失敗, 返回非雲端狀態</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>成功開啟雲端儲存. 列表無潛水記錄. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> <source>Unknown GPS location</source> <translation>未知的GPS位置</translation> </message> @@ -6198,7 +6213,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message numerus="yes"> <location filename="../core/qthelper.cpp" line="962"/> <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>(%n dive(s))</numerusform></translation> </message> <message> <location filename="../core/qthelper.cpp" line="1232"/> @@ -6295,7 +6310,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../desktop-widgets/renumber.ui" line="43"/> <source>Renumbering all dives</source> - <translation type="unfinished"/> + <translation>重新編號全部的潛水</translation> </message> <message> <location filename="../desktop-widgets/renumber.ui" line="61"/> @@ -6311,12 +6326,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="145"/> <source>Renumber selected dives</source> - <translation type="unfinished"/> + <translation>重新編號所選取的潛水記錄</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="147"/> <source>Renumber all dives</source> - <translation type="unfinished"/> + <translation>重新編號全部的潛水</translation> </message> </context> <context> @@ -6702,7 +6717,7 @@ Not all images have timestamps in the range between <message> <location filename="../desktop-widgets/about.cpp" line="19"/> <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2017</span></source> - <translation type="unfinished"/> + <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>跨平台潛水日誌軟體<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, 和其他參與者, 2011-2017</span></translation> </message> </context> <context> @@ -6983,62 +6998,62 @@ Not all images have timestamps in the range between <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="308"/> + <location filename="../tests/testparse.cpp" line="313"/> <source>Sample time</source> <translation>樣本時間</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="310"/> + <location filename="../tests/testparse.cpp" line="315"/> <source>Sample depth</source> <translation>樣本深度</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="312"/> + <location filename="../tests/testparse.cpp" line="317"/> <source>Sample temperature</source> <translation>樣本溫度</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="314"/> + <location filename="../tests/testparse.cpp" line="319"/> <source>Sample pO₂</source> <translation>樣本pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="316"/> + <location filename="../tests/testparse.cpp" line="321"/> <source>Sample sensor1 pO₂</source> <translation>樣本感測器 1 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="318"/> + <location filename="../tests/testparse.cpp" line="323"/> <source>Sample sensor2 pO₂</source> <translation>樣本感測器 2 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="320"/> + <location filename="../tests/testparse.cpp" line="325"/> <source>Sample sensor3 pO₂</source> <translation>樣本感測器 3 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="322"/> + <location filename="../tests/testparse.cpp" line="327"/> <source>Sample CNS</source> <translation>樣本CNS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="324"/> + <location filename="../tests/testparse.cpp" line="329"/> <source>Sample NDL</source> <translation>樣本NDL</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="326"/> + <location filename="../tests/testparse.cpp" line="331"/> <source>Sample TTS</source> <translation>樣本TTS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="328"/> + <location filename="../tests/testparse.cpp" line="333"/> <source>Sample stopdepth</source> <translation>樣本停留深度</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="330"/> + <location filename="../tests/testparse.cpp" line="335"/> <source>Sample pressure</source> <translation>樣本壓力</translation> </message> @@ -7657,7 +7672,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="737"/> + <location filename="../core/libdivecomputer.c" line="776"/> <source>Error parsing the header</source> <translation>檔頭解析錯誤</translation> </message> @@ -7668,7 +7683,7 @@ Maximum</source> <location filename="../core/cochran.c" line="309"/> <location filename="../core/cochran.c" line="315"/> <location filename="../core/cochran.c" line="385"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="232"/> <source>deco stop</source> <translation>減壓停留</translation> </message> @@ -7676,7 +7691,7 @@ Maximum</source> <location filename="../core/cochran.c" line="336"/> <location filename="../core/cochran.c" line="390"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>ascent</source> <translation>上升</translation> </message> @@ -7688,20 +7703,20 @@ Maximum</source> </message> <message> <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>maxdepth</source> <translation>最大深度</translation> </message> <message> <location filename="../core/cochran.c" line="358"/> <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>pO₂</source> <translation>pO₂</translation> </message> @@ -7710,28 +7725,28 @@ Maximum</source> <location filename="../core/cochran.c" line="414"/> <location filename="../core/cochran.c" line="421"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="225"/> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="242"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>gaschange</source> <translation>氣瓶更換</translation> </message> <message> <location filename="../core/cochran.c" line="370"/> <location filename="../core/cochran.c" line="409"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="233"/> <source>rbt</source> <translation>剩餘滯底時間</translation> </message> <message> <location filename="../core/cochran.c" line="379"/> <location filename="../core/cochran.c" line="426"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>ceiling</source> <translation>上限深度</translation> </message> <message> <location filename="../core/cochran.c" line="395"/> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>transmitter</source> <translation>發射器</translation> </message> @@ -7993,12 +8008,17 @@ Maximum</source> <message> <location filename="../core/dive.c" line="33"/> <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1447"/> - <location filename="../core/planner.c" line="1450"/> + <location filename="../core/planner.c" line="1476"/> + <location filename="../core/planner.c" line="1479"/> <source>oxygen</source> <translation>氧氣</translation> </message> <message> + <location filename="../core/dive.c" line="33"/> + <source>not used</source> + <translation>未使用</translation> + </message> + <message> <location filename="../core/dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> @@ -8079,10 +8099,10 @@ Maximum</source> <translation>(%s) 或 (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="490"/> + <location filename="../core/divelist.c" line="491"/> <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1443"/> - <location filename="../core/planner.c" line="1446"/> + <location filename="../core/planner.c" line="1472"/> + <location filename="../core/planner.c" line="1475"/> <source>air</source> <translation>air</translation> </message> @@ -8245,205 +8265,200 @@ Maximum</source> <translation>git clone %s 失敗 (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="210"/> + <location filename="../core/libdivecomputer.c" line="218"/> <location filename="../core/parse-xml.c" line="3317"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation>未知</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="231"/> <source>none</source> <translation>無</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="236"/> <source>workload</source> <translation>工作量</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>violation</source> <translation>違反</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>bookmark</source> <translation>書籤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>surface</source> <translation>水面</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>safety stop</source> <translation>安全停留</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>safety stop (voluntary)</source> <translation>安全停留 (非必要)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop (mandatory)</source> <translation>安全停留 (強制性)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="245"/> <source>deepstop</source> <translation>深停留</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>ceiling (safety stop)</source> <translation>上限深度 (安全停留)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>below floor</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>divetime</source> <translation>潛水時間</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>airtime</source> <translation>空氣時間</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>heading</source> <translation>標題</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>tissue level warning</source> <translation>組織等級警告</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> - <source>non stop time</source> - <translation>無停留時間</translation> - </message> - <message> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/libdivecomputer.c" line="265"/> <source>invalid event number</source> <translation>錯誤的事件編號</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="553"/> + <location filename="../core/libdivecomputer.c" line="592"/> <source>Error parsing the datetime</source> <translation>日期時間解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="571"/> + <location filename="../core/libdivecomputer.c" line="610"/> <source>Dive %d: %s</source> <translation>潛水 %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="577"/> + <location filename="../core/libdivecomputer.c" line="616"/> <source>Error parsing the divetime</source> <translation>潛水時間解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="587"/> + <location filename="../core/libdivecomputer.c" line="626"/> <source>Error parsing the maxdepth</source> <translation>最大深度解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="606"/> + <location filename="../core/libdivecomputer.c" line="645"/> <source>Error parsing temperature</source> <translation>錯誤溫度解析</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the gas mix count</source> <translation>混合氣體數量解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="638"/> + <location filename="../core/libdivecomputer.c" line="677"/> <source>Error obtaining water salinity</source> <translation>得到錯誤的海水鹽度</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="647"/> + <location filename="../core/libdivecomputer.c" line="686"/> <source>Error obtaining surface pressure</source> <translation>得到錯誤的水面壓力</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="672"/> + <location filename="../core/libdivecomputer.c" line="711"/> <source>Error obtaining divemode</source> <translation>錯誤潛水模式取得</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="692"/> + <location filename="../core/libdivecomputer.c" line="731"/> <source>Error parsing the gas mix</source> <translation>混合氣體解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="717"/> + <location filename="../core/libdivecomputer.c" line="756"/> <source>Unable to create parser for %s %s</source> <translation>無法建立解析 %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="723"/> + <location filename="../core/libdivecomputer.c" line="762"/> <source>Error registering the data</source> <translation>錯誤的登錄資料</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="744"/> + <location filename="../core/libdivecomputer.c" line="783"/> <source>Error parsing the samples</source> <translation>樣本解析錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="882"/> + <location filename="../core/libdivecomputer.c" line="921"/> <source>Event: waiting for user action</source> <translation>事件: 等待使用者動作</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="890"/> + <location filename="../core/libdivecomputer.c" line="929"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>型號=%u (0x%08x), 韌體=%u (0x%08x), 序號=%u (0x%08x)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="954"/> + <location filename="../core/libdivecomputer.c" line="993"/> <source>Error registering the event handler.</source> <translation>錯誤的註冊程序.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="959"/> + <location filename="../core/libdivecomputer.c" line="998"/> <source>Error registering the cancellation handler.</source> <translation>錯誤的註冊取消程序.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="980"/> + <location filename="../core/libdivecomputer.c" line="1019"/> <source>Dive data import error</source> <translation>匯入潛水資料錯誤</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1058"/> <source>Unable to create libdivecomputer context</source> <translation>無法建立 libdivecomputer 上下文</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1026"/> + <location filename="../core/libdivecomputer.c" line="1065"/> <source>Unable to open %s %s (%s)</source> <translation> 無法開啟 %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1048"/> + <location filename="../core/libdivecomputer.c" line="1087"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>無權限開啟裝置 %s %s (%s)</translation> </message> @@ -8503,177 +8518,182 @@ Maximum</source> </message> <message> <location filename="../core/planner.c" line="574"/> - <location filename="../core/planner.c" line="840"/> - <location filename="../core/planner.c" line="845"/> - <location filename="../core/planner.c" line="871"/> - <location filename="../core/planner.c" line="881"/> + <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="874"/> + <location filename="../core/planner.c" line="900"/> + <location filename="../core/planner.c" line="910"/> <source>Warning:</source> <translation>提醒:</translation> </message> <message> - <location filename="../core/planner.c" line="584"/> - <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> - <translation>根據 Bühlmann ZHL-16C 使用 GFlow = %d 和 GFhigh = %d</translation> - </message> - <message> - <location filename="../core/planner.c" line="589"/> - <source>based on VPM-B at nominal conservatism</source> - <translation>基於 VPM-B 於公定保守等級</translation> - </message> - <message> - <location filename="../core/planner.c" line="591"/> - <source>based on VPM-B at +%d conservatism</source> - <translation>基於 VPM-B 於 +%d 保守等級</translation> - </message> - <message> - <location filename="../core/planner.c" line="593"/> + <location filename="../core/planner.c" line="812"/> <source>, effective GF=%d/%d</source> <translation>, effective GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="597"/> - <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation>休閒潛水模式, 基於 Bühlmann ZHL-16B 以 GFlow = %d 和 GFhigh = %d</translation> - </message> - <message> - <location filename="../core/planner.c" line="602"/> + <location filename="../core/planner.c" line="586"/> <source>Subsurface dive plan (surface interval </source> - <translation type="unfinished"/> + <translation>Subsurface 潛水計畫 (水面休息時間</translation> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="590"/> <source>Subsurface dive plan</source> <translation>Subsurface 潛水計畫</translation> </message> <message> - <location filename="../core/planner.c" line="610"/> - <source><div>Runtime: %dmin</div><br></source> + <location filename="../core/planner.c" line="593"/> + <source>Runtime: %dmin<br></div></source> <translation><div>Runtime: %dmin</div><br></translation> </message> <message> - <location filename="../core/planner.c" line="615"/> + <location filename="../core/planner.c" line="598"/> <source>depth</source> <translation>深度</translation> </message> <message> - <location filename="../core/planner.c" line="618"/> + <location filename="../core/planner.c" line="601"/> <source>duration</source> <translation>時間</translation> </message> <message> - <location filename="../core/planner.c" line="621"/> + <location filename="../core/planner.c" line="604"/> <source>runtime</source> <translation>作業時間</translation> </message> <message> - <location filename="../core/planner.c" line="624"/> + <location filename="../core/planner.c" line="607"/> <source>gas</source> <translation>氣體</translation> </message> <message> - <location filename="../core/planner.c" line="667"/> + <location filename="../core/planner.c" line="650"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>轉換至 %.*f %s in %d:%02d min - 運行時間 %d:%02u on %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="675"/> + <location filename="../core/planner.c" line="658"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>禁搭飛機 %.*f %s 在 %d:%02d min - 運行時間 %d:%02u 在 %s</translation> </message> <message> - <location filename="../core/planner.c" line="688"/> + <location filename="../core/planner.c" line="671"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>停留於 %.*f %s for %d:%02d min - 運行時間 %d:%02u on %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="695"/> + <location filename="../core/planner.c" line="678"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>停留在 %.*f %s for %d:%02d min - 運作時間 %d:%02u 於 %s</translation> </message> <message> - <location filename="../core/planner.c" line="740"/> + <location filename="../core/planner.c" line="723"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/planner.c" line="743"/> - <location filename="../core/planner.c" line="747"/> + <location filename="../core/planner.c" line="726"/> + <location filename="../core/planner.c" line="730"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/planner.c" line="756"/> - <location filename="../core/planner.c" line="768"/> + <location filename="../core/planner.c" line="739"/> + <location filename="../core/planner.c" line="751"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="791"/> + <location filename="../core/planner.c" line="774"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>氣體交換至 %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="793"/> + <location filename="../core/planner.c" line="776"/> <source>Switch gas to %s</source> <translation>更換氣體至 %s</translation> </message> <message> - <location filename="../core/planner.c" line="812"/> + <location filename="../core/planner.c" line="796"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/planner.c" line="814"/> + <location filename="../core/planner.c" line="798"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../core/planner.c" line="818"/> + <location filename="../core/planner.c" line="803"/> + <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> + <translation>減壓模型: Bühlmann ZHL-16C 與 GFlow = %d 和 GFhigh = %d</translation> + </message> + <message> + <location filename="../core/planner.c" line="808"/> + <source>Deco model: VPM-B at nominal conservatism</source> + <translation>減壓模型: VPM-B 基於公定保守等級</translation> + </message> + <message> + <location filename="../core/planner.c" line="810"/> + <source>Deco model: VPM-B at +%d conservatism</source> + <translation>減壓模型: VPM-B at +%d 保守等級</translation> + </message> + <message> + <location filename="../core/planner.c" line="816"/> + <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> + <translation>減壓模型: 休閒模式基於 Bühlmann ZHL-16B 與 GFlow = %d 和 GFhigh = %d</translation> + </message> + <message> + <location filename="../core/planner.c" line="824"/> + <source>ATM pressure: %dmbar (%d%s)<br></div></source> + <translation>ATM 壓力: %dmbar (%d%s)<br></div></translation> + </message> + <message> + <location filename="../core/planner.c" line="842"/> <source>Gas consumption (CCR legs excluded):</source> <translation>氣體消耗 (排除 CCR legs):</translation> </message> <message> - <location filename="../core/planner.c" line="820"/> - <source>Gas consumption:</source> - <translation>氣體消耗:</translation> + <location filename="../core/planner.c" line="844"/> + <source>Gas consumption (based on SAC</source> + <translation>氣體消耗 (基於 SAC</translation> </message> <message> - <location filename="../core/planner.c" line="841"/> + <location filename="../core/planner.c" line="869"/> <source>this is more gas than available in the specified cylinder!</source> <translation>指定的氣瓶氣體超過供給量！</translation> </message> <message> - <location filename="../core/planner.c" line="846"/> + <location filename="../core/planner.c" line="875"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>無足夠的預留氣體可供上升使用！</translation> </message> <message> - <location filename="../core/planner.c" line="848"/> + <location filename="../core/planner.c" line="877"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s 在計畫上升中)</translation> </message> <message> - <location filename="../core/planner.c" line="850"/> + <location filename="../core/planner.c" line="879"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s 在計畫上升期間) of %s</translation> </message> <message> - <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="897"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>高 pO₂ 數值 %.2f 發生於 %d:%02u 使用氣體 %s 在深度 %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="878"/> + <location filename="../core/planner.c" line="907"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>低 pO₂ 數值 %.2f 在 %d:%02u 使用氣源 %s 停留深度 %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="1205"/> + <location filename="../core/planner.c" line="1234"/> <source>Can't find gas %s</source> <translation>無法找到氣體 %s</translation> </message> <message> - <location filename="../core/planner.c" line="1451"/> + <location filename="../core/planner.c" line="1480"/> <source>ean</source> <translation>ean</translation> </message> @@ -9091,8 +9111,8 @@ EADD: %d%s </message> <message> <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="251"/> - <location filename="../smtk-import/smartrak.c" line="321"/> + <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="318"/> <source>Notes</source> <translation>記錄</translation> </message> @@ -9663,77 +9683,77 @@ Uemis Zurich 已正確插入？</translation> <translation>記錄:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Built</source> <translation>建造</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Sank</source> <translation>沉沒</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>SankTime</source> <translation>沉沒時間</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Reason</source> <translation>理由</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Nationality</source> <translation>國籍</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Shipyard</source> <translation>船廠</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>ShipType</source> <translation>船隻種類</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Length</source> <translation>長度</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Beam</source> <translation>橫樑</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Draught</source> <translation>草案</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Displacement</source> <translation>移位</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Cargo</source> <translation>船艙</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="263"/> + <location filename="../smtk-import/smartrak.c" line="260"/> <source>Wreck Data</source> <translation>沈船資料</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Altitude</source> <translation>海拔</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Depth</source> <translation>深度</translation> </message> |