diff options
30 files changed, 4858 insertions, 4134 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index a9495f67b..c69ff7f3d 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -36,7 +36,7 @@ <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/> <source>Navigate Back</source> - <translation type="unfinished"/> + <translation>Върни назад</translation> </message> </context> <context> @@ -202,7 +202,7 @@ <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> <source>A device needs a non-zero address for a connection.</source> - <translation type="unfinished"/> + <translation>Устройство не трябва да има нулев адрес на връзка.</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> @@ -326,12 +326,12 @@ <message numerus="yes"> <location filename="../core/checkcloudconnection.cpp" line="58"/> <source>Waiting for cloud connection (%n second(s) passed)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Изчакване на връзка с облака (%n секунда(секунди) изминали)</numerusform><numerusform>Изчакване на връзка с облака (%n секунда(секунди) изминали)</numerusform></translation> </message> <message> <location filename="../core/checkcloudconnection.cpp" line="65"/> <source>Cloud connection failed</source> - <translation type="unfinished"/> + <translation>Връзката с облака не може да бъде осъществена</translation> </message> </context> <context> @@ -359,7 +359,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> <source>Register</source> - <translation type="unfinished"/> + <translation>Регистрация</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> @@ -369,12 +369,12 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> <source>Sign-in or Register</source> - <translation type="unfinished"/> + <translation>Влезте или се регистрирайте</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>Режим без облак</translation> </message> </context> <context> @@ -688,7 +688,7 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="241"/> <source>OSTC 4</source> - <translation type="unfinished"/> + <translation>OSTC 4</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="262"/> @@ -1605,22 +1605,22 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3267"/> <source>Travel gas consumption</source> - <translation type="unfinished"/> + <translation>Пътна консумация на газ</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3290"/> <source>Button sensitivity</source> - <translation type="unfinished"/> + <translation>Чувствителност на бутон</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3420"/> <source>VPM</source> - <translation type="unfinished"/> + <translation>VPM</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3560"/> <source>VPM conservatism</source> - <translation type="unfinished"/> + <translation>VPM консерватизъм</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3567"/> @@ -1931,7 +1931,7 @@ <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> <source>Cancel edit</source> - <translation type="unfinished"/> + <translation>Отмени редакция</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> @@ -2041,7 +2041,7 @@ GPS позиция:</translation> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>Видимост</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> @@ -2079,7 +2079,7 @@ GPS позиция:</translation> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> <source>Map it</source> - <translation type="unfinished"/> + <translation>Разпредели</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> @@ -2089,7 +2089,7 @@ GPS позиция:</translation> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>Видимост</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> @@ -2187,7 +2187,7 @@ GPS позиция:</translation> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> - <translation type="unfinished"/> + <translation>Моля натиснете '+' бутона за да добавите гмуркане (или да изтеглите гмуркания от леководолазен компютър)</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> @@ -2285,7 +2285,7 @@ GPS позиция:</translation> <message> <location filename="../desktop-widgets/divelistview.cpp" line="921"/> <source>Image files (%1)</source> - <translation type="unfinished"/> + <translation>Файлове с изображения (%1)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="977"/> @@ -2301,12 +2301,12 @@ GPS позиция:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Създай ново място на гмуркане и копирай информация от текущото гмуркане.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Създай ново място на гмуркане с име</translation> </message> @@ -2912,7 +2912,7 @@ GPS позиция:</translation> <message numerus="yes"> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="336"/> <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>(%n гмуркане (гмуркания))</numerusform><numerusform>(%n гмуркане (гмуркания))</numerusform></translation> </message> <message> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> @@ -3191,142 +3191,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Дълбочина</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Тежест</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Водолазен костюм</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Темп.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Бутилка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Газ</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Снимки</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Държава</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Дълбочина(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Темп.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Тежест(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Снимки преди/по време на/след гмуркане</translation> </message> @@ -3460,7 +3460,7 @@ p, li { white-space: pre-wrap; } <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> <source>Connecting to dive computer</source> - <translation type="unfinished"/> + <translation>Връзване с леководолазен компютър</translation> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> @@ -3618,7 +3618,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="21"/> <source>Bluetooth is not enabled</source> - <translation type="unfinished"/> + <translation>Bluetooth не е включен</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> @@ -3633,7 +3633,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> <source> Connection:</source> - <translation type="unfinished"/> + <translation>Връзка:</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> @@ -3653,7 +3653,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> <source>Info:</source> - <translation type="unfinished"/> + <translation>Информация:</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> @@ -3712,22 +3712,22 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> <source>Facebook logged in successfully</source> - <translation type="unfinished"/> + <translation>Вход във Фейсбук успешен</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Error, unknown user id, cannot login.</source> - <translation type="unfinished"/> + <translation>Грешка - непознат потребител.</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> <source>Dive uploaded successfully to Facebook</source> - <translation type="unfinished"/> + <translation>Гмуркането бе качено успешно във Фейсбук</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> - <translation type="unfinished"/> + <translation>Качването на гмуркане неуспешно. Моля вижте дебъг текста и го пратете на Subsurface мейлинг списъка.</translation> </message> </context> <context> @@ -3792,7 +3792,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="50"/> <source>Navigate Forward</source> - <translation type="unfinished"/> + <translation>Отиди напред</translation> </message> </context> <context> @@ -3929,27 +3929,27 @@ p, li { white-space: pre-wrap; } <translation>Координати</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Обратно гео търсене</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Места за гмуркане със същите координати.</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Тагове</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Държава</translation> </message> @@ -3976,7 +3976,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Редакция на мяста за гмуркане</translation> </message> @@ -3998,7 +3998,7 @@ p, li { white-space: pre-wrap; } Сигурни ли сте че искате да продължите?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Вие редактирате място за гмуркане</translation> </message> @@ -4432,7 +4432,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/mainwindow.ui" line="380"/> <source>&Map</source> - <translation type="unfinished"/> + <translation>&Карта</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="388"/> @@ -4690,7 +4690,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/divelistview.cpp" line="585"/> <source>Trying to merge dives with %1min interval in between</source> - <translation type="unfinished"/> + <translation>Опит за смесване на гмуркания с %1мин. интервал помежду им</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> @@ -4800,7 +4800,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <message> <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> <source>Drag the selected dive location</source> - <translation type="unfinished"/> + <translation>Завлечете маркера на гмуркането</translation> </message> </context> <context> @@ -4808,22 +4808,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> - <translation type="unfinished"/> + <translation>Отвори местонахождение в Google Maps</translation> </message> <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> - <translation type="unfinished"/> + <translation>Копирай местонахождение в клипборд (десетични)</translation> </message> <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> - <translation type="unfinished"/> + <translation>Копирай местонахождение в клипборд (шестдесетичени)</translation> </message> <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> - <translation type="unfinished"/> + <translation>Избери видимите местонахождения</translation> </message> </context> <context> @@ -4832,7 +4832,8 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> - <translation type="unfinished"/> + <translation>MapWidget.qml не може да бъде зареден! +QML модулите QtPositioning и QtLocation може да липсват!</translation> </message> </context> <context> @@ -4890,17 +4891,17 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="26"/> <source>Page 1</source> - <translation type="unfinished"/> + <translation>Страница 1</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="37"/> <source>Text Field</source> - <translation type="unfinished"/> + <translation>Текстово Поле</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="42"/> <source>Press Me</source> - <translation type="unfinished"/> + <translation>Натисни Ме</translation> </message> </context> <context> @@ -4921,74 +4922,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>фута/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Последен стоп на 20фута</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% средна дълбочина до 20фута</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20фута то повърхността</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Последен стоп на 6 метра</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% средна дълбочина до 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6м до повърхността</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>кб.фута/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>бара</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5661,45 +5662,55 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="237"/> <source>Duration units</source> - <translation type="unfinished"/> + <translation>Времеви единици</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="243"/> <source>Show hours in duration</source> - <translation type="unfinished"/> + <translation>Покажи часове в продължителност</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="250"/> <source>hh:mm (always)</source> - <translation type="unfinished"/> + <translation>чч:мм (винаги)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="257"/> <source>mm (always)</source> - <translation type="unfinished"/> + <translation>мм (винаги)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="264"/> <source>mm (for dives shorter than 1 hour), hh:mm (otherwise)</source> - <translation type="unfinished"/> + <translation>мм (за гмуркания по-кратки от 1 час), чч:мм (иначе)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation>Списък на гмуркания</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation>Покажи единици в списъка на гмуркания</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>GPS координати</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Дисплей на местонахождение:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>традиционен (dms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>десетичен</translation> </message> @@ -5846,12 +5857,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Planned dive</source> - <translation type="unfinished"/> + <translation>Планирано гмуркане</translation> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="780"/> <source>Manually added dive</source> - <translation type="unfinished"/> + <translation>Ръчно добавено гмуркане</translation> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> @@ -5938,147 +5949,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Стартиране...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> - <translation type="unfinished"/> + <translation>Отвори локален файл с данни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> - <translation type="unfinished"/> + <translation>Отварянето на локален файл с данни неуспешно</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> - <translation type="unfinished"/> + <translation>%1 гмуркания заредени от локален файл с данни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>режим на работа без облак</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> - <translation type="unfinished"/> + <translation>Грешка при разряда на локалния склад</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>няма облакови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Моля въведете валидни облакови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Е-мейла и паролата за облаковия склад могат да съдържат букви, числа, '.', '-', '_' и '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> - <translation type="unfinished"/> + <translation>Грешен формат на имейл адрес</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Опит за отваряна не облаковия склад с нови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Тестване на облакови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>Няма отговор от облаковия сървър за да провери вашите данни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> - <translation type="unfinished"/> + <translation>Грешнен потребител или парола към облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Няма връзка към облаковия слад - акаунтът ви не е проверен</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Облаковите пълномощия са невалидни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Облаковия склад не може да бъде отворен: грешка в HTTPS връзката</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Облаковия склад не може да бъде отворен: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Няма връзка към облаковия слад</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> - <translation type="unfinished"/> + <translation>Зареждане на гмуркания...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Грешка в облаков слад: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> - <translation type="unfinished"/> + <translation>Зареждане на гмуркания от локален склад (режим без облак)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Не може да бъде осъществена връзка с облаковия слад</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облаковия слад беше отворен успешно. Няма гмуркания в регистъра.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>ч.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>сек.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Непозната GPS позиция</translation> </message> @@ -6324,32 +6335,32 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Undefined</source> - <translation type="unfinished"/> + <translation>Неопределен</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> <source>Incorrect username/password combination</source> - <translation type="unfinished"/> + <translation>Грешен потребител или парола</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> <source>Credentials need to be verified</source> - <translation type="unfinished"/> + <translation>Потребител и парола трябва да бъдат проверени</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> <source>Credentials verified</source> - <translation type="unfinished"/> + <translation>Потребител и парола потвърдени</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>Режим без облак</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="30"/> <source>Cloud status</source> - <translation type="unfinished"/> + <translation>Статус на облака</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="38"/> @@ -6359,12 +6370,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="44"/> <source>Not applicable</source> - <translation type="unfinished"/> + <translation>Не приложимо</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="52"/> <source>Change</source> - <translation type="unfinished"/> + <translation>Промени</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="59"/> @@ -6386,24 +6397,24 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../mobile-widgets/qml/Settings.qml" line="159"/> <location filename="../mobile-widgets/qml/Settings.qml" line="212"/> <source>regular text</source> - <translation type="unfinished"/> + <translation>Обикновен текст</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="122"/> <location filename="../mobile-widgets/qml/Settings.qml" line="174"/> <location filename="../mobile-widgets/qml/Settings.qml" line="227"/> <source>Highlight</source> - <translation type="unfinished"/> + <translation>Подчертай</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="145"/> <source>Pink</source> - <translation type="unfinished"/> + <translation>Розов</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="197"/> <source>Dark</source> - <translation type="unfinished"/> + <translation>Тъмен</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="261"/> @@ -6428,7 +6439,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="322"/> <source>Save detailed log</source> - <translation type="unfinished"/> + <translation>Запиши подробен регистър</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="345"/> @@ -6438,7 +6449,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="354"/> <source>Display Developer menu</source> - <translation type="unfinished"/> + <translation>Покажи меню на разработчик</translation> </message> </context> <context> @@ -6509,33 +6520,34 @@ Not all images have timestamps in the range between <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> <source>Image files (*.jpg *.jpeg)</source> - <translation type="unfinished"/> + <translation>Файлове с изображения (*.jpg *.jpeg)</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> <source>Selected dive date/time</source> - <translation type="unfinished"/> + <translation>Дата и време на избраното гмуркане</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="393"/> <source>First selected dive date/time</source> - <translation type="unfinished"/> + <translation>Дата и време на първото избрано гмуркане</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="394"/> <source>Last selected dive date/time</source> - <translation type="unfinished"/> + <translation>Дата и време на последното избрано гмуркане</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="396"/> <source> Files with inappropriate date/time</source> - <translation type="unfinished"/> + <translation> +Файлове с неправилна дата или време</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="406"/> <source>No Exif date/time found</source> - <translation type="unfinished"/> + <translation>Дата и време не можат да бъдат намерени в Exif</translation> </message> </context> <context> @@ -6651,7 +6663,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Малък</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> @@ -6723,7 +6735,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Малък</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/> @@ -6733,12 +6745,12 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/> <source>Big</source> - <translation type="unfinished"/> + <translation>Голям</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/> <source>The text to the right will be posted as the description with your dive profile graph to Facebook. The album name is required (the profile graph will be posted to that album).</source> - <translation type="unfinished"/> + <translation>Текста от дясно ще бъде побликъван във Фейсбук като описание. Името на албума е нужно (изображението ще бъде добавено в този албум).</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="57"/> @@ -6793,7 +6805,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/> <source>Image Size</source> - <translation type="unfinished"/> + <translation>Големина на изображение</translation> </message> </context> <context> @@ -6801,12 +6813,12 @@ Files with inappropriate date/time</source> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> - <translation type="unfinished"/> + <translation>За да използвате Subsurface-mobile с облаковия слад, моля въдете вашите пълномощия.<br/><br/>Ако това е първия път когато използвате облака, моля въведете валиден имейл адрес (малки букви) и парола (букви и цифри).<br/><br/>За да използвате мобилната версия на Subsurface само локално, изберете опцията без олак.</translation> </message> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> - <translation type="unfinished"/> + <translation>Благодарим, че се регистрирайте в Subsurface. Изпратихме на <b>%1</b> ПИН кода за довършване на регистрацията. Ако не получите имейл до 15 минути, моля проверете правописа на имейл адреса и също така проверете Спам папката си.<br/><br/>Ако имате проблеми при регистрацията, моля свържете се с нас в Форума (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> </context> <context> @@ -7016,7 +7028,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/> <source>d</source> - <translation type="unfinished"/> + <translation>д</translation> </message> </context> <context> @@ -7202,7 +7214,7 @@ mixed from Air and using: <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="133"/> <source>and</source> - <translation type="unfinished"/> + <translation>и</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="135"/> @@ -7450,107 +7462,120 @@ mixed from Air and using: <translation>(%1 показани)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Дълбочина(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Темп.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Бутилка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>ч.</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>мин</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Тежест(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Водолазен костюм</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Газ</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Снимки преди/по време на/след гмуркане</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Държава</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -8036,7 +8061,8 @@ Maximum</source> <location filename="../core/profile.c" line="1364"/> <source>Density: %.1fg/ℓ </source> - <translation type="unfinished"/> + <translation>Плъност: %.1fг/л. +</translation> </message> </context> <context> @@ -8295,17 +8321,18 @@ Maximum</source> <location filename="../core/datatrak.c" line="513"/> <source>[Warning] Manual dive # %d </source> - <translation type="unfinished"/> + <translation>[Внимание] Ръчно гмуркане № %d +</translation> </message> <message> <location filename="../core/datatrak.c" line="539"/> <source>[Error] Out of memory for dive %d. Abort parsing.</source> - <translation type="unfinished"/> + <translation>[Грешка] Няма достатъчно памен за разряд на гмуркане %d.</translation> </message> <message> <location filename="../core/datatrak.c" line="585"/> <source>[Error] File is not a DataTrak file. Aborted</source> - <translation type="unfinished"/> + <translation>[Грешка] Файла не е DataTrak файл.</translation> </message> <message> <location filename="../core/datatrak.c" line="598"/> @@ -8568,22 +8595,22 @@ Maximum</source> <message> <location filename="../core/file.c" line="950"/> <source>No dive profile found from '%s'</source> - <translation type="unfinished"/> + <translation>Не може да бъде намерен профил от '%s'</translation> </message> <message> <location filename="../core/git-access.c" line="56"/> <source>Checkout from storage (%lu/%lu)</source> - <translation type="unfinished"/> + <translation>Поръка от облаков склад (%lu/%lu)</translation> </message> <message> <location filename="../core/git-access.c" line="87"/> <source>Transfer from storage (%d/%d)</source> - <translation type="unfinished"/> + <translation>Трансфер от облаков склад (%d/%d)</translation> </message> <message> <location filename="../core/git-access.c" line="99"/> <source>Transfer to storage (%d/%d)</source> - <translation type="unfinished"/> + <translation>Трансфер към облаков склад (%d/%d)</translation> </message> <message> <location filename="../core/git-access.c" line="135"/> @@ -8639,42 +8666,42 @@ Maximum</source> <message> <location filename="../core/git-access.c" line="469"/> <source>Update local storage to match cloud storage</source> - <translation type="unfinished"/> + <translation>Обнови локалния склад да съвпада с облаковия.</translation> </message> <message> <location filename="../core/git-access.c" line="477"/> <source>Push local changes to cloud storage</source> - <translation type="unfinished"/> + <translation>Качи локалните промени в облака</translation> </message> <message> <location filename="../core/git-access.c" line="495"/> <source>Try to merge local changes into cloud storage</source> - <translation type="unfinished"/> + <translation>Опитай да смесиш локалните промени в облака</translation> </message> <message> <location filename="../core/git-access.c" line="537"/> <source>Store data into cloud storage</source> - <translation type="unfinished"/> + <translation>Запази данните в облака</translation> </message> <message> <location filename="../core/git-access.c" line="561"/> <source>Sync with cloud storage</source> - <translation type="unfinished"/> + <translation>Синхронизирай с облака</translation> </message> <message> <location filename="../core/git-access.c" line="588"/> <source>Can't reach cloud server, working with local data</source> - <translation type="unfinished"/> + <translation>Облаковия сървър не може да бъде намерен. Работа с локални данни.</translation> </message> <message> <location filename="../core/git-access.c" line="601"/> <source>Successful cloud connection, fetch remote</source> - <translation type="unfinished"/> + <translation>Успешна връзка с облака. Теглене на данни.</translation> </message> <message> <location filename="../core/git-access.c" line="616"/> <source>Done syncing with cloud storage</source> - <translation type="unfinished"/> + <translation>Синхронизацията с облака завършена</translation> </message> <message> <location filename="../core/git-access.c" line="752"/> @@ -8689,11 +8716,11 @@ Maximum</source> <message> <location filename="../core/git-access.c" line="778"/> <source>Synchronising data file</source> - <translation type="unfinished"/> + <translation>Синхорнизация на файл с данни</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>неизвестно</translation> @@ -8852,7 +8879,7 @@ Maximum</source> <message> <location filename="../core/libdivecomputer.c" line="805"/> <source>Already downloaded dive at %s</source> - <translation type="unfinished"/> + <translation>Гмуркане в %s е вече изтеглено</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="939"/> @@ -8862,7 +8889,7 @@ Maximum</source> <message> <location filename="../core/libdivecomputer.c" line="958"/> <source>model=%s firmware=%u serial=%u</source> - <translation type="unfinished"/> + <translation>модел=%s фирммуер=%u сер.номер=%u</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="1020"/> @@ -8894,16 +8921,19 @@ Maximum</source> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> - <translation type="unfinished"/> + <translation>Грешка при отваряне на у-во %s %s (%s) +В повечето случаи за да направим дебъг на този проблем ни е необходим регистър файл от libdivecomputer. +За да създадете такъв файл, моля изберете съответната отметка. +</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="1128"/> <source>No new dives downloaded from dive computer</source> - <translation type="unfinished"/> + <translation>Няма изтеглени нови гмуркания от леководолазен компютър</translation> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>повече от една GPS локации за това място на гмуркане; също така %s @@ -8911,7 +8941,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>допълнително име за място: %s @@ -8920,12 +8950,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/load-git.c" line="1703"/> <source>Load dives from local cache</source> - <translation type="unfinished"/> + <translation>Зареди гмуркания от лакален кеш</translation> </message> <message> <location filename="../core/load-git.c" line="1707"/> <source>Successfully opened dive data</source> - <translation type="unfinished"/> + <translation>Данните за гмурканията бяха заредни успешно</translation> </message> <message> <location filename="../core/ostctools.c" line="93"/> @@ -8939,19 +8969,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Грешка - %s - резряд на гмуркане %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Неразпозната стойност за проценти %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Не може да бъде напревен разбор на '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Не може да бъде отворен стилов файл %s</translation> </message> @@ -9107,7 +9137,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/plannernotes.c" line="105"/> <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> + <translation>Времетраене: %dмин. ВАРИАЦИИ<br></div></translation> </message> <message> <location filename="../core/plannernotes.c" line="324"/> @@ -9152,7 +9182,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/plannernotes.c" line="421"/> <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> + <translation><br>&nbsp;&mdash; <span style='color: %s;'>Минимален газ</span> (Базиран на %.1fxSAC/+%dмин@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> </message> <message> <location filename="../core/plannernotes.c" line="432"/> @@ -9272,21 +9302,26 @@ D: %.1f%s <location filename="../core/profile.c" line="1325"/> <source>P: %d%s (%s) </source> - <translation type="unfinished"/> + <translation>P: %d%s (%s) +</translation> </message> <message> <location filename="../core/profile.c" line="1357"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> - <translation type="unfinished"/> + <translation>EAD: %d%s +EADD: %d%s / %.1fгр./л. +</translation> </message> <message> <location filename="../core/profile.c" line="1361"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> - <translation type="unfinished"/> + <translation>END: %d%s +EADD: %d%s / %.1fгр./л. +</translation> </message> <message> <location filename="../core/profile.c" line="1378"/> @@ -9504,7 +9539,7 @@ EADD: %d%s / %.1fg/ℓ <message> <location filename="../core/qthelper.cpp" line="965"/> <source>more than %1 days</source> - <translation type="unfinished"/> + <translation>повече от %1 дни</translation> </message> <message> <location filename="../core/save-html.c" line="472"/> @@ -10284,22 +10319,22 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../core/save-git.c" line="985"/> <source>Start saving data</source> - <translation type="unfinished"/> + <translation>Започни запис на данни</translation> </message> <message> <location filename="../core/save-git.c" line="994"/> <source>Start saving dives</source> - <translation type="unfinished"/> + <translation>Започни запис на гмуркания</translation> </message> <message> <location filename="../core/save-git.c" line="1027"/> <source>Done creating local cache</source> - <translation type="unfinished"/> + <translation>Локален кеш създаден</translation> </message> <message> <location filename="../core/save-git.c" line="1258"/> <source>Preparing to save data</source> - <translation type="unfinished"/> + <translation>Подготовка за запис на данни</translation> </message> </context> <context> @@ -10322,12 +10357,12 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="133"/> <source>Dive management</source> - <translation type="unfinished"/> + <translation>Менажиране на гмуркания</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="234"/> <source>Disable location service</source> - <translation type="unfinished"/> + <translation>Изключи услугата за локализиране</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="250"/> @@ -10342,12 +10377,12 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="146"/> <source>Download from DC</source> - <translation type="unfinished"/> + <translation>Изтегли от леководолазен компютър</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="155"/> <source>Apply GPS Fixes</source> - <translation type="unfinished"/> + <translation>Приложи GPS позиции</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="162"/> @@ -10367,7 +10402,7 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="186"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> - <translation type="unfinished"/> + <translation>Изключването на автоматична синхронизация с облака значи запис на данни само локално. Това е много полезно в ситуации без добър интернет. Моля изберете "Ръчна синхронизация с облака" за да синхронизирате данните само при добра възможност.</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="195"/> @@ -10630,12 +10665,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> <source>Compute variations of plan (performance cost)</source> - <translation type="unfinished"/> + <translation>Изчисли промени в плана (разходи за ефективност)</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> <source>Display plan variations</source> - <translation type="unfinished"/> + <translation>Покажи промени по плана</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> diff --git a/translations/subsurface_ca.ts b/translations/subsurface_ca.ts index 5c2584714..5e257d126 100644 --- a/translations/subsurface_ca.ts +++ b/translations/subsurface_ca.ts @@ -36,7 +36,7 @@ <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/> <source>Navigate Back</source> - <translation type="unfinished"/> + <translation>Navega enrere</translation> </message> </context> <context> @@ -359,7 +359,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> <source>Register</source> - <translation type="unfinished"/> + <translation>Registra</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> @@ -369,12 +369,12 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> <source>Sign-in or Register</source> - <translation type="unfinished"/> + <translation>Signa o registra</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>Mode sense el núvol</translation> </message> </context> <context> @@ -1931,7 +1931,7 @@ <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> <source>Cancel edit</source> - <translation type="unfinished"/> + <translation>Cancel·la l'edició</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> @@ -2301,12 +2301,12 @@ GPS actual:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Crea un nou punt d'immersió, copiant la informació rellevant des de la immersió actual.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Crea un nou punt d'immersió amb aquest nom</translation> </message> @@ -3194,142 +3194,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>Núm.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Valoració</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Profunditat</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Durada</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Llast</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Vestit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Ampolla</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>SNC màx.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Fotografies</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>País</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Ubicació</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Prof.(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Llast(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Fotografies abans/durant/ després de la immersió</translation> </message> @@ -3715,22 +3715,22 @@ a la llista d'immersions.</translation> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> <source>Facebook logged in successfully</source> - <translation type="unfinished"/> + <translation>S'ha accedit al Facebook amb èxit</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Error, unknown user id, cannot login.</source> - <translation type="unfinished"/> + <translation>Error, ID d'usuari desconegut, no s'ha pogut accedir.</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> <source>Dive uploaded successfully to Facebook</source> - <translation type="unfinished"/> + <translation>S'ha publicat la immersió al Facebook amb èxit</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> - <translation type="unfinished"/> + <translation>Ha fallat la publicació de la immersió. Vegeu la sortida de depuració i envieu-la a la llista de correu del Subsurface</translation> </message> </context> <context> @@ -3795,7 +3795,7 @@ a la llista d'immersions.</translation> <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="50"/> <source>Navigate Forward</source> - <translation type="unfinished"/> + <translation>Navega endavant</translation> </message> </context> <context> @@ -3932,27 +3932,27 @@ a la llista d'immersions.</translation> <translation>Coordenades</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Cerca geogràfica inversa</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Punts d'immersió a les mateixes coordenades</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Etiquetes</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>País</translation> </message> @@ -3979,7 +3979,7 @@ a la llista d'immersions.</translation> </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Gestió dels punts d'immersió</translation> </message> @@ -4001,7 +4001,7 @@ a la llista d'immersions.</translation> Segur que voleu continuar?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Esteu editant un punt d'immersió</translation> </message> @@ -4836,7 +4836,8 @@ El Subsurface ja ha intentat omplir les dades, però potser valdrà la pena perd <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> - <translation type="unfinished"/> + <translation>El MapWidget.qml ha fallat en carregar! +Podrien faltar els mòduls QtPositioning i QtLocation del QML!</translation> </message> </context> <context> @@ -4925,74 +4926,74 @@ Si el vostre dispositiu usa Bluetooth, feu els mateixos preparatius que per a ba <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Última parada a 20 peus</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% de la prof. mitja a 20 peus</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>De 20 peus a la superfície</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Última parada a 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% de la prof. mitja a 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>De 6 m a la superfície</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>peus/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5689,21 +5690,31 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation>Taula de la llista d'immersions</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation>Mostra les unitats a la taula de la llista d'immersions</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>Coordenades GPS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Mostra la ubicació</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>Tradicional (gms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>Decimal</translation> </message> @@ -5942,147 +5953,147 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>S'està començant...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation>Obre un fitxer de dades de busseig local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation>Ha fallat en obrir el fitxer de dades local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation>S'han carregat %1 immersions des del fitxer de dades de busseig local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>Es treballa en el mode sense el núvol</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation>Error en analitzar l'emmagatzematge local i s'abandona</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>Sense les credencials del núvol</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Introduïu unes credencials vàlides pel núvol.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>El correu i la contrasenya de l'emmagatzematge al núvol només pot contenir lletres, números i els caràcters «.», «-», «_» i «+».</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation>Format no vàlid per a l'adreça de correu electrònic</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>S'està intentant obrir l'emmagatzematge en el núvol amb les credencials noves</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>S'estan provant les credencials del núvol</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>No hi ha resposta del servidor al núvol per a validar les credencials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation>Credencials per al núvol incorrectes</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>No s'ha pogut connectar amb l'emmagatzematge al núvol -el compte al núvol no ha estat verificat-</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Les credencials del núvol no són vàlides</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>No s'ha pogut obrir l'emmagatzematge al núvol: un error en crear la connexió HTTPS</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>No s'ha pogut obrir l'emmagatzematge al núvol: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>No s'ha pogut connectar amb l'emmagatzematge al núvol</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation>Les credencials del núvol són vàlides, s'estan carregant les immersions...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Error amb l'emmagatzematge al núvol: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>S'estan carregant les immersions des de l'emmagatzematge local (mode «sense núvol»)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ha fallat en connectar amb el servidor del núvol, no s'ha rebut l'estat</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>L'emmagatzematge al núvol s'ha obert amb èxit. No hi ha immersions a la llista de busseig.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>seg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Ubicació GPS desconeguda</translation> </message> @@ -6328,32 +6339,32 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Undefined</source> - <translation type="unfinished"/> + <translation>Sense definir</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> <source>Incorrect username/password combination</source> - <translation type="unfinished"/> + <translation>La combinació nom d'usuari/contrasenya és incorrecta</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> <source>Credentials need to be verified</source> - <translation type="unfinished"/> + <translation>Cal verificar les credencials</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> <source>Credentials verified</source> - <translation type="unfinished"/> + <translation>S'han verificat les credencials</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>Mode sense el núvol</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="30"/> <source>Cloud status</source> - <translation type="unfinished"/> + <translation>Estat del núvol</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="38"/> @@ -6363,17 +6374,17 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="44"/> <source>Not applicable</source> - <translation type="unfinished"/> + <translation>No aplicable</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="52"/> <source>Change</source> - <translation type="unfinished"/> + <translation>Canvia</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="59"/> <source>Status</source> - <translation type="unfinished"/> + <translation>Estat</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="84"/> @@ -6657,7 +6668,7 @@ Fitxers amb una data/hora inapropiada</translation> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Petit</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> @@ -6726,7 +6737,7 @@ Fitxers amb una data/hora inapropiada</translation> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Petit</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/> @@ -6736,7 +6747,7 @@ Fitxers amb una data/hora inapropiada</translation> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/> <source>Big</source> - <translation type="unfinished"/> + <translation>Gran</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/> @@ -6796,7 +6807,7 @@ Fitxers amb una data/hora inapropiada</translation> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/> <source>Image Size</source> - <translation type="unfinished"/> + <translation>Mida de la imatge</translation> </message> </context> <context> @@ -6804,12 +6815,12 @@ Fitxers amb una data/hora inapropiada</translation> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> - <translation type="unfinished"/> + <translation>Per usar el Subsurface-mobile amb l'emmagatzematge al núvol del Subsurface, si us plau, introduïu les vostres credencials del núvol.<br/><br/>Si aquesta és la primera vegada que useu l'emmagatzematge al núvol del Subsurface, introduïu un correu electrònic vàlid (tot en minúscules) i una contrasenya de la vostra elecció (lletres i números).<br/><br/>Per usar el Subsurface-mobile només amb dades locals sobre aquest dispositiu, seleccioneu el botó sense núvol que hi ha a sobre.</translation> </message> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> - <translation type="unfinished"/> + <translation>Gràcies per registrar-vos amb el Subsurface. Hem enviat a en <b>%1</b> un codi PIN per a completar el registre. Si no rebeu un correu electrònic nostre en 15 minuts, si us plau, primer comproveu la correcta ortografia de la vostra adreça de correu electrònic i la vostra bústia de correu brossa.<br/><br/>En cas de problemes relacionats amb la configuració del compte del núvol, poseu-vos en contacte amb nosaltres al nostre fòrum d'usuari (https://subsurface-divelog.org/user-forum/).<br/><br/>q</translation> </message> </context> <context> @@ -7452,107 +7463,120 @@ mixed from Air and using: <translation>(%1 visibles)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>Núm.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Valoració</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Prof.(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Durada</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Ampolla</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>SNC màx.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Llast(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Vestit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Fotografies abans/durant/ després de la immersió</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>País</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Ubicació</translation> </message> @@ -8697,7 +8721,7 @@ Màxim</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>Desconegut</translation> @@ -8909,14 +8933,14 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>múltiples posicions GPS per aquest lloc d'immersió; també %s</translation> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>nom addicional per aquest lloc: %s</translation> @@ -8943,18 +8967,18 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>Error - %s - en analitzar la immersió %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Percentatge estrany en llegir %s</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Ha fallat en analitzar «%s»</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>No s'ha pogut obrir el full d'estil %s</translation> </message> @@ -9155,7 +9179,7 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <message> <location filename="../core/plannernotes.c" line="421"/> <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> + <translation><br>&nbsp;&mdash; <span style='color: %s;'>Gas mínim</span> (basat en el %.1fxCAS/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> </message> <message> <location filename="../core/plannernotes.c" line="432"/> @@ -10384,7 +10408,7 @@ Està connectat correctament el Uemis Zurich?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="200"/> <source>Upload GPS data</source> - <translation>Puja les dades del GPS</translation> + <translation>Publica les dades del GPS</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="208"/> diff --git a/translations/subsurface_cs.ts b/translations/subsurface_cs.ts index 8764e7514..05ea7c0f4 100644 --- a/translations/subsurface_cs.ts +++ b/translations/subsurface_cs.ts @@ -36,7 +36,7 @@ <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/> <source>Navigate Back</source> - <translation type="unfinished"/> + <translation>Jít zpět</translation> </message> </context> <context> @@ -359,7 +359,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> <source>Register</source> - <translation type="unfinished"/> + <translation>Registrovat</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> @@ -369,12 +369,12 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> <source>Sign-in or Register</source> - <translation type="unfinished"/> + <translation>Přihlásit nebo registrovat</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>Režim bez cloudu</translation> </message> </context> <context> @@ -1930,7 +1930,7 @@ <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> <source>Cancel edit</source> - <translation type="unfinished"/> + <translation>Zrušit změny</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> @@ -2300,12 +2300,12 @@ GPS polohu:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Vytvořit novou potápěčskou lokalitu, zkopírovat významné informace ze současné lokality.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Vytvořit novou potápěčskou lokalitu s tímto názvem</translation> </message> @@ -3190,142 +3190,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>Číslo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Hodnocení</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Hloubka</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Délka</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Zátěž</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Teplota</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Lahev</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Plyn</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Fotografie</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Stát</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Lokalita</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Hloubka (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Teplota (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Zátěž (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>Spotřeba plynu (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Fotografie před/během/po ponoru</translation> </message> @@ -3459,7 +3459,7 @@ p, li { white-space: pre-wrap; } <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> <source>Connecting to dive computer</source> - <translation type="unfinished"/> + <translation>Připojování k potápěčskému počítači</translation> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> @@ -3711,22 +3711,22 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> <source>Facebook logged in successfully</source> - <translation type="unfinished"/> + <translation>Přihlášení Facebooku úspěšné</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Error, unknown user id, cannot login.</source> - <translation type="unfinished"/> + <translation>Chyba, neznámé uživatelské ID, nelze se přihlásit.</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> <source>Dive uploaded successfully to Facebook</source> - <translation type="unfinished"/> + <translation>Nahrání ponoru na Facebook úspěšné</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> - <translation type="unfinished"/> + <translation>Nahrání ponoru selhalo. Podívejte se prosím na debugovací výstup a zašlete jej do poštovní konference Subsurface</translation> </message> </context> <context> @@ -3791,7 +3791,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="50"/> <source>Navigate Forward</source> - <translation type="unfinished"/> + <translation>Jít vpřed</translation> </message> </context> <context> @@ -3928,27 +3928,27 @@ p, li { white-space: pre-wrap; } <translation>Souřadnice</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Reverzní geo vyhledávání</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Potápěčské lokality na stejných souřadnicích</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Štítky</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Stát</translation> </message> @@ -3975,7 +3975,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Správa potápěčských lokalit</translation> </message> @@ -3997,7 +3997,7 @@ p, li { white-space: pre-wrap; } Jste si jisti, že chcete pokračovat?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Upravujete potápěčskou lokalitu</translation> </message> @@ -4818,7 +4818,7 @@ Subsurface se pokusil předvyplnit data, ale může být užitečné podívat se <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> - <translation type="unfinished"/> + <translation>Zkopírovat polohu do schránky (šedesátkově)</translation> </message> <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> @@ -4832,7 +4832,7 @@ Subsurface se pokusil předvyplnit data, ale může být užitečné podívat se <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> - <translation type="unfinished"/> + <translation>Selhalo nahrání MapWidget.qml! QML moduly QtPositioning a QtLocation mohou chybět!</translation> </message> </context> <context> @@ -4921,74 +4921,74 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Poslední zastávka ve 20 stopách</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50 % průměrné hloubky do 20 stop</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20 stop na hladinu</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation> m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Poslední zastávka v 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50 % průměrné hloubky do 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6 m na hladinu</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation> ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5685,21 +5685,31 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation>Tabulka ponorů</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation>Zobrazit jednotky v tabulce ponorů</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>Souřadnice GPS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Zobrazení pozice</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>tradiční (dms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>desetinný</translation> </message> @@ -5938,147 +5948,147 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Spouštění...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation>Otevřít místní soubor s údaji o ponoru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation>Otevřít místní soubor s daty se nepodařilo</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 ponorů nahráno z místního souboru s údaji o ponoru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>režim práce bez serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation>Chyba při zpracování místního úložiště. Vzdává se</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>žádné přístupové údaje k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Prosím zadejte platné přístupové údaje k serveru.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-mail a heslo k serverovému úložišti mohou obsahovat pouze písmena, čísla a '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation>Neplatný formát pro adresy elektronické pošty</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Pokus o otevření serverového úložiště s novými přístupovými údaji</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Zkoušení přístupových údajů k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>Žádná odpověď cloudového serveru k ověření přístupových údajů</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation>Nesprávné přístupové údaje k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Nelze se připojit k serverovému úložišti - serverový účet neověřen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Neplatné přístupové údaje k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Nelze otevřít cloudové úložiště: Chyba vytvoření https spojení</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Nelze otevřít serverové úložiště: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Nelze se připojit k serverovému úložišti</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation>Přihlašovací údaje k serveru platné. Nahrávají se ponory...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Chyba serverového úložiště: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Nahrávají se ponory s místního úložiště (režim žádný server)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Selhalo připojení ke cloudovému serveru, návrat ke stavu bez serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Serverové úložiště úspěšně otevřeno. Žádné ponory v seznamu.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>s</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Neznámá GPS pozice</translation> </message> @@ -6324,32 +6334,32 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Undefined</source> - <translation type="unfinished"/> + <translation>Nedefinováno</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> <source>Incorrect username/password combination</source> - <translation type="unfinished"/> + <translation>Neplatná kombinace uživatelského jména a hesla</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> <source>Credentials need to be verified</source> - <translation type="unfinished"/> + <translation>Je nutno ověřit přístupové údaje</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> <source>Credentials verified</source> - <translation type="unfinished"/> + <translation>Přístupové údaje ověřeny</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>Režim bez cloudu</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="30"/> <source>Cloud status</source> - <translation type="unfinished"/> + <translation>Stav cloudu</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="38"/> @@ -6359,17 +6369,17 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="44"/> <source>Not applicable</source> - <translation type="unfinished"/> + <translation>Neplatné</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="52"/> <source>Change</source> - <translation type="unfinished"/> + <translation>Změna</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="59"/> <source>Status</source> - <translation type="unfinished"/> + <translation>Status</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="84"/> @@ -6652,7 +6662,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Malé</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> @@ -6724,7 +6734,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Malé</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/> @@ -6734,12 +6744,12 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/> <source>Big</source> - <translation type="unfinished"/> + <translation>Velké</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/> <source>The text to the right will be posted as the description with your dive profile graph to Facebook. The album name is required (the profile graph will be posted to that album).</source> - <translation type="unfinished"/> + <translation>Text vpravo bude odeslán jako popisek s grafem vašeho profilu ponoru na Facebook. Název alba je vyžadován (graf profilu bude poslán do tohoto alba). </translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="57"/> @@ -6794,7 +6804,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/> <source>Image Size</source> - <translation type="unfinished"/> + <translation>Velikost obrázku</translation> </message> </context> <context> @@ -6802,12 +6812,12 @@ Files with inappropriate date/time</source> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> - <translation type="unfinished"/> + <translation>Pro použití Subsurface-mobile s cloudovým úložištěm Subsurface, zadejte prosím vaše přihlašovací údaje. <br/><br/> Pokud je to poprvé, kdy využíváte serverové úložiště Subsurface, zadejte platný e-mail (malými písmeny) a heslo dle vašeho výběru (písmena a číslice). <br/><br/> Pro použití Subsurface-mobile pouze s lokálními daty na tomto zařízení, vyberte tlačítko "bez cloudu" nahoře.</translation> </message> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> - <translation type="unfinished"/> + <translation>Děkujeme za registraci k Subsurface. Odeslali jsme <b>%1</b> PIN kód k dokončení registrace. Pokud od nás do 15 minut neobdržíte email, zkontroljte prosím nejdříve správnost vaší emailové adresy a svojí složku se spamem. <br/><br/> V případě jakýchkoliv problémů ohledně nastavení cloudového účtu nás prosím kontaktujte na našem uživatelském fóru (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> </context> <context> @@ -7450,107 +7460,120 @@ ze vzduchu a následujících plynů:</translation> <translation>(%1 zobrazeno)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>Číslo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Hodnocení</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Hloubka (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Délka</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Teplota (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Lahev</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Hmotnost (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Plyn</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Fotografie před/během/po ponoru</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Stát</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Lokalita</translation> </message> @@ -8695,7 +8718,7 @@ Průměr</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>neznámý</translation> @@ -8896,16 +8919,18 @@ Průměr</translation> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> - <translation type="unfinished"/> + <translation>Chyba otevírání zařízení %s %s (%s). +Pro debugování této záležitosti je většinou užitečný log soubor libdivecomputer. +Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v stahovacím dialogu.</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="1128"/> <source>No new dives downloaded from dive computer</source> - <translation type="unfinished"/> + <translation>Z potápěčského počítače nebyl stažen žádný ponor</translation> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>více GPS pozic pro tuto potápěčskou lokalitu; také %s @@ -8913,7 +8938,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>dodatečný název lokality: %s @@ -8941,19 +8966,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Chyba - %s - zpracování ponoru %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Načtena divná procenta %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Nepodařilo se zpracovat '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Nelze otevřít styl %s</translation> </message> @@ -9154,7 +9179,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/plannernotes.c" line="421"/> <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> + <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum plynu</span> (založeno na %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> </message> <message> <location filename="../core/plannernotes.c" line="432"/> @@ -10637,12 +10662,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> <source>Compute variations of plan (performance cost)</source> - <translation type="unfinished"/> + <translation>Spočítat odchylky plánu (výpočetně náročnější)</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> <source>Display plan variations</source> - <translation type="unfinished"/> + <translation>Zobrazit odchylky plánu</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index 9a46db1d7..3dd7c7cb5 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -2296,12 +2296,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Opret ny dykker lokation med dette navn</translation> </message> @@ -3182,142 +3182,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Bedømmelse</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Vægt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Dragt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Fotos</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Lokation</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>fod</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Vægt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> @@ -3919,27 +3919,27 @@ p, li { white-space: pre-wrap; } <translation>Koordinater</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation type="unfinished"/> </message> @@ -3966,7 +3966,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3987,7 +3987,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4908,74 +4908,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>f/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Sidste stop på 20f</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% gnm. dybde til 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20ft til overflade</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Sidste stop på 6 meter</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% gnm. dybde til 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m til overflade</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5670,21 +5670,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>GPS koordinater</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>decimal</translation> </message> @@ -5923,147 +5933,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -7433,107 +7443,120 @@ blandes fra Luft ved brug: <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Bedømmelse</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min.</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Vægt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Dragt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Placering</translation> </message> @@ -8672,7 +8695,7 @@ Gennemsnit</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>Ukendt</translation> @@ -8882,14 +8905,14 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8916,19 +8939,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation> Mærkelig procent læsning %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Fejl i fortolkning af '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åbne stylesheet %s</translation> </message> diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index 31efdff64..15821efce 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -2300,12 +2300,12 @@ Position verwenden</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Einen neuen Tauchplatz, basierend auf den Daten des aktuellen Tauchplatz, erstellen.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Neuer Tauchplatz mit diesem Name anlegen</translation> </message> @@ -3190,142 +3190,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Ort</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Fotos vor/während/nach dem Tauchgang</translation> </message> @@ -3928,27 +3928,27 @@ p, li { white-space: pre-wrap; } <translation>Koordinaten</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Umgekehrte Standortbestimmung</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Tauchplätze mit denselben Koordinaten</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Stichwörter</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Land</translation> </message> @@ -3975,7 +3975,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Tauchplatzverwaltung</translation> </message> @@ -3997,7 +3997,7 @@ p, li { white-space: pre-wrap; } Möchtest Du fortfahren?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Du bearbeitest einen Tauchplatz</translation> </message> @@ -4921,74 +4921,74 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Letzter Stopp auf 20 Fuss</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% mitlerer Tiefe bis 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20ft bis Oberfläche</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Letzter Stopp auf 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% mitlerer Tiefe bis 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m bis Oberfläche</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5685,21 +5685,31 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>GPS Koordinaten</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Ortsanzeige</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>traditionall (Grad Minuten Sekunden)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>Dezimal</translation> </message> @@ -5938,147 +5948,147 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>ohne Cloud-Anbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>Keine Cloud-Benutzerdaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Bitte gültige Cloud-Benutzerdaten eingeben.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Cloud Email und Passwörter können nur Buchstaben, Zahlen und folgende Sonderzeichen enthalten . - _ + </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Versuche Cloud mit neuen Benutzerdaten zu öffnen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Überprüfe Could-Benutzerdaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>Keine Antwort vom Cloud-Server zur Überprüfung der Benutzerdaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Keine Verbindung zum Cloud-Server - Cloud-Account nicht bestätigt</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Cloud-Benutzerdaten ungültig</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kann den Cloud-Speicher nicht öffnen: Fehler beim Erstellen der https-Verbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Kann den Cloud-Speicher nicht öffnen: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Kann nicht zum Cloud-Speicher verbinden</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Cloud-Speicher-Fehler: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Verbindung zum Cloud-Server fehlgeschlagen, Fortsetzung ohne Cloud-Verbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloudspeicher erfolgreich geöffnet. Keine Tauchgänge in der Tauchgangsliste.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Unbekannte GPS-Position</translation> </message> @@ -7450,107 +7460,120 @@ den folgenden Gasen gemischt werden: <translation> (%1 angezeigt)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>US-Pfund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Fotos vor/während/nach dem Tauchgang</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Ort</translation> </message> @@ -8693,7 +8716,7 @@ Durchschnitt</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>unbekannt</translation> @@ -8903,7 +8926,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>mehrere GPS Koordinaten für diesen Tauchplatz; ebenso %s @@ -8911,7 +8934,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>Zusätzlicher Name für Tauchplatz: %s @@ -8939,19 +8962,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Fehler - %s - beim Analysieren von Tauchgang %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Unverständliche Prozentangabe %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index c89614c6d..7e5242539 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -2175,7 +2175,7 @@ Position verwenden</translation> <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> <source>Dive list</source> - <translation>Tauchgangliste</translation> + <translation>Tauchgangsliste</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> @@ -2299,12 +2299,12 @@ Position verwenden</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Neuen Tauchplatz erstellen, relevante Informationen werden aus dem aktuellen Tauchgang kopiert.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Neuen Tauchplatz mit diesem Namen erstellen</translation> </message> @@ -3189,142 +3189,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>AMV</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Position</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>AMV(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Fotos vor/während/nach dem Tauchgang</translation> </message> @@ -3715,7 +3715,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Error, unknown user id, cannot login.</source> - <translation type="unfinished"/> + <translation>Fehler, unbekannte Benutzerkennung, Anmeldung nicht möglich.</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> @@ -3725,7 +3725,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> - <translation type="unfinished"/> + <translation>Hochladen der Tauchgänge fehlgeschlagen. Bitte Fehlerausgabe prüfen und an die Subsurface Mailingliste schicken!</translation> </message> </context> <context> @@ -3927,27 +3927,27 @@ p, li { white-space: pre-wrap; } <translation>Koordinaten</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Umgekehrte Standortbestimmung</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Tauchplätze auf denselben Koordinaten</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Stichwörter</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Land</translation> </message> @@ -3974,7 +3974,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Tauchplatzverwaltung</translation> </message> @@ -3996,7 +3996,7 @@ p, li { white-space: pre-wrap; } Trotzdem fortfahren?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Sie bearbeiten einen Tauchplatz</translation> </message> @@ -4390,7 +4390,7 @@ Trotzdem fortfahren?</translation> <message> <location filename="../desktop-widgets/mainwindow.ui" line="316"/> <source>&Dive list</source> - <translation>Tauchgangliste</translation> + <translation>Tauchgangsliste</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="324"/> @@ -4831,7 +4831,8 @@ Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> - <translation type="unfinished"/> + <translation>MapWidget.qml konnte nicht geladen werden! +Die QML Module QtPositioning und QtLocation fehlen eventuell!</translation> </message> </context> <context> @@ -4920,74 +4921,74 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Letzter Stopp auf 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% mitlerer Tiefe bis 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20ft bis Oberfläche</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Letzter Stopp auf 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% mitlerer Tiefe bis 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m bis Oberfläche</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5684,21 +5685,31 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation>Tauchgangsliste</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation>Einheiten in der Tauchgangsliste anzeigen</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>GPS-Koordinaten</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Positionsanzeige</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>traditionall (Grad Minuten Sekunden)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>Dezimal</translation> </message> @@ -5937,147 +5948,147 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation>Lokale Tauchdatendatei öffnen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation>Fehler bei Öffnen der lokalen Tauchdatendatei</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 Tauchgänge aus der lokalen Tauchdatendatei geladen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>ohne Cloud-Anbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation>Fehler beim Lesen der lokalen Daten, ich gebe auf</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>keine Cloud-Anmeldedaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Bitte geben Sie gültige Cloud-Anmeldedaten ein.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-Mail-Adresse und Passwort für den Cloudspeicher können nur aus Buchstaben, Zahlen und '.', '-', '_', sowie '+' bestehen.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation>Ungültiges Format für E-Mail-Adresse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Es wird versucht, den Cloud-Speicher mit neuen Anmeldeinformationen zu öffnen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Cloud-Anmeldedaten werden getestet</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>Keine Antwort des Cloud-Servers zur Validierung der Anmeldeinformationen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation>Falsche Cloud-Anmeldedaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Keine Verbindung zum Cloud-Server - Cloud-Account nicht bestätigt</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Cloud-Anmeldedaten sind ungültig</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kann den Cloud-Speicher nicht öffnen: Fehler beim Erstellen der https-Verbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Kann den Cloud-Speicher nicht öffnen: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Kann nicht zum Cloud-Speicher verbinden</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud-Anmeldedaten gültig, Tauchgänge werden geladen...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Cloud-Speicher-Fehler: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Tauchgänge werden aus dem lokalen Speicher geladen (Modus 'keine Cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Verbindung zum Cloud-Server fehlgeschlagen, Fortsetzung ohne Cloud-Verbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloudspeicher erfolgreich geöffnet. Keine Tauchgänge in der Tauchgangsliste.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>s</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Unbekannte GPS-Position</translation> </message> @@ -6323,7 +6334,7 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Undefined</source> - <translation type="unfinished"/> + <translation>Undefiniert</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> @@ -7450,107 +7461,120 @@ den folgenden Gasen gemischt werden: <translation>(%1 angezeigt)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>US-Pfund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>AMV(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Fotos vor/während/nach dem Tauchgang</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Position</translation> </message> @@ -8695,7 +8719,7 @@ Durchschnitt</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>unbekannt</translation> @@ -8907,7 +8931,7 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>mehrere GPS-Positionen für diesen Tauchplatz; ebenso %s @@ -8915,7 +8939,7 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>zusätzlicher Name für Platz: %s @@ -8943,19 +8967,19 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>Fehler - %s - Tauchgang %d wird gelesen</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Unverständliche Prozentangabe %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> @@ -10326,7 +10350,7 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="117"/> <source>Dive list</source> - <translation>Tauchgangliste</translation> + <translation>Tauchgangsliste</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="133"/> diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts index a0a5dad65..906936b82 100644 --- a/translations/subsurface_el_GR.ts +++ b/translations/subsurface_el_GR.ts @@ -2296,12 +2296,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Δημιουργία μίας νέας θέσης κατάδυσης, αντιγράφοντας τις σχετικές πληροφορίες από την τρέχουσα κατάδυση.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Δημιουργία νέας θέσης κατάδυσης με αυτό το όνομα </translation> </message> @@ -3186,142 +3186,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Ημερομηνία</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Βαθμός</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Βάθος</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Βάρος</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Στολή</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Μείγμα</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>Κατανάλωση Αέρα στην Επιφάνεια</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Μέγιστη τοξικότητα Κεντρικού Νευρικού Συστήματος</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Φωτογραφίες</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Χώρα</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Βάθος(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Βάρος(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>Κατανάλωση Αέρα στην Επιφανεία(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Φωτογραφίες πριν/κατά τη διάρκεια/μετά την κατάδυση </translation> </message> @@ -3923,27 +3923,27 @@ p, li { white-space: pre-wrap; } <translation>Συντεταγμένες</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Αντίστροφη γεωεύρεση</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Θέσεις κατάδυσης με τις ίδιες συντετατγμένες </translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Ετικέτες</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Χώρα</translation> </message> @@ -3970,7 +3970,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Διαχείριση θέσης κατάδυσης</translation> </message> @@ -3992,7 +3992,7 @@ p, li { white-space: pre-wrap; } Είστε βέβαιος ότι θέλετε να συνεχίσεται; </translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Επεξεργάζεστε μία θέση κατάδυσης </translation> </message> @@ -4916,74 +4916,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Παθητικό ημίκλειστο κύκλωμα επαναπνοής </translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Τελευταία στάση στα 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>Ταχύτητα ανόδου από το 50% του μέσου βάθους στα 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20ft για την επιφάνεια</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Τελευταία στάση στα 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>Ταχύτητα ανόδου από το 50% του μέσου βάθους στα 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m για την επιφάνεια</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5680,21 +5680,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>Συντεταγμένες GPS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Προβολή τοποθεσίας</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>Μοίρες/Πρώτα/Δεύτερα</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>Δεκαδικά ψηφία</translation> </message> @@ -5933,147 +5943,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Έναρξη...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>εργασία εκτός αποθηκευτικού νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>Δεν υπάρχουν διαπιστευτήρια νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Παρακαλώ εισάγετε έγκυρα διαπιστευτήρια νέφους </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Η διεύθυνση ηλεκτρονικού ταχυδρομείου και το συνθηματικό του αποθηκευτικού νέφους μπορεί να περιλαμβάνει μόνο γράμματα, αριθμούς και '.', '-', '_', και '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Προσπάθεια ανοίγματος αποθήκευσης νέφους με νέα διαπιστευτήρια </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Έλεγχος διαπιστευτηρίων νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>Καμία απόκριση από τον διαμεσολαβητή του αποθηκευτικού νέφους για έλεγχο εγκυρότητας των διαπιστευτηρίων </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Δεν μπορεί να συνδεθεί με το αποθηκευτικό νέφος - ο λογαριασμός αποθηκευτικού νέφους δεν έχει επιβεβαιωθεί </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Λανθασμένα διαπιστευτήρια αποθηκευτικού νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Δεν μπορεί να ανοιχθεί το αποθηκευτικό νέφος: Σφάλμα στη δημιουργία συνδέσεων https </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Δεν μπορεί να ανοιχθεί το αποθηκευτικό νέφος: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Δεν μπορεί να συνδεθεί με το αποθηκευτικό νέφος</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Σφάλμα αποθήκευσης στο αποθηκευτικό νέφος: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Αποτυχία σύνδεσης με τον διακομιστή του αποθηκευτικού νέφους, επαναφορά σε καθεστώς λειτουργίας χωρίς αποθηκευτικό νέφος </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Το αποθηκευτικό νέφος ανοίχθηκε με επιτυχία. Δεν υπάρχουν καταδύσεις στον κατάλογο καταδύσεων. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>ώρα</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>δευτερόλεπτα</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Άγνωστη θέση GPS</translation> </message> @@ -7445,107 +7455,120 @@ mixed from Air and using: <translation>(%1 προβάλετε)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Ημερομηνία</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Βαθμός</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Βάθος(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>ώρα</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>λεπτά</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Βάρος(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Στολή</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Μείγμα</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>Κατανάλωση Αέρα στην Επιφανεία(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Φωτογραφίες πριν/κατά τη διάρκεια/μετά την κατάδυση </translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Χώρα</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> @@ -8687,7 +8710,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>άγνωστο</translation> @@ -8897,7 +8920,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>πολλαπλές τοποθεσίες GPS για αυτή την καταδυτική θέση, επίσης %s @@ -8905,7 +8928,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>επιπρόσθετο όνομα για την θέση κατάδυσης: %s @@ -8933,19 +8956,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Σφάλμα - %s - ανάλυση κατάδυσης %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Ασυνήθιστη ανάγνωση ποσοστού %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Σφάλμα στην ανάλυση του '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Αδύνατο το άνοιγμα του stylesheet %s</translation> </message> diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index e47c8499b..d1f4ebb41 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -36,7 +36,7 @@ <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/> <source>Navigate Back</source> - <translation type="unfinished"/> + <translation>Navigate back</translation> </message> </context> <context> @@ -359,7 +359,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> <source>Register</source> - <translation type="unfinished"/> + <translation>Register</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> @@ -369,12 +369,12 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> <source>Sign-in or Register</source> - <translation type="unfinished"/> + <translation>Sign-in or register</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>No cloud mode</translation> </message> </context> <context> @@ -1931,7 +1931,7 @@ <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> <source>Cancel edit</source> - <translation type="unfinished"/> + <translation>Cancel edit</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> @@ -2301,12 +2301,12 @@ GPS location:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Create a new dive site, copying relevant information from the current dive.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Create a new dive site with this name</translation> </message> @@ -3191,142 +3191,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Cylinder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Photos</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Country</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Photos before/during/after dive</translation> </message> @@ -3712,22 +3712,22 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> <source>Facebook logged in successfully</source> - <translation type="unfinished"/> + <translation>Facebook logged in successfully</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Error, unknown user id, cannot login.</source> - <translation type="unfinished"/> + <translation>Error, unknown user id, cannot login.</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> <source>Dive uploaded successfully to Facebook</source> - <translation type="unfinished"/> + <translation>Dive uploaded successfully to Facebook</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> - <translation type="unfinished"/> + <translation>Dive upload failed. Please see debug output and send to Subsurface mailing list</translation> </message> </context> <context> @@ -3792,7 +3792,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="50"/> <source>Navigate Forward</source> - <translation type="unfinished"/> + <translation>Navigate forward</translation> </message> </context> <context> @@ -3929,27 +3929,27 @@ p, li { white-space: pre-wrap; } <translation>Coordinates</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Reverse geolocation lookup</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Dive sites on same coordinates</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Country</translation> </message> @@ -3976,7 +3976,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Dive site management</translation> </message> @@ -3998,7 +3998,7 @@ p, li { white-space: pre-wrap; } Are you sure you want to continue?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>You are editing a dive site</translation> </message> @@ -4833,7 +4833,8 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> - <translation type="unfinished"/> + <translation>MapWidget.qml failed to load! +The QML modules QtPositioning and QtLocation could be missing!</translation> </message> </context> <context> @@ -4922,74 +4923,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Last stop at 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20ft to surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% avg. depth to 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m to surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5686,21 +5687,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation>Dive list table</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation>Show units in dive list table</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>GPS coordinates</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Location display</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>deg/min/sec</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>decimal</translation> </message> @@ -5939,147 +5950,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Starting...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation>Open local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation>Opening local data file failed</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dives loaded from local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>working in no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation>Error parsing local storage, giving up</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>no cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Please enter valid cloud credentials.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation>Invalid format for email address</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Attempting to open cloud storage with new credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Testing cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>No response from cloud server to validate the credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation>Incorrect cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Cannot connect to cloud storage - cloud account not verified</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Cloud credentials are invalid</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Cannot open cloud storage: Error creating https connection</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Cannot open cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Cannot connect to cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud credentials valid, loading dives...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Cloud storage error: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Loading dives from local storage ('no cloud' mode)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Failed to connect to cloud server, reverting to no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud storage open successfully. No dives in dive list.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Unknown GPS location</translation> </message> @@ -6325,32 +6336,32 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Undefined</source> - <translation type="unfinished"/> + <translation>Undefined</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> <source>Incorrect username/password combination</source> - <translation type="unfinished"/> + <translation>Incorrect username/password combination</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> <source>Credentials need to be verified</source> - <translation type="unfinished"/> + <translation>Credentials need to be verified</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> <source>Credentials verified</source> - <translation type="unfinished"/> + <translation>Credentials verified</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>No cloud mode</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="30"/> <source>Cloud status</source> - <translation type="unfinished"/> + <translation>Cloud status</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="38"/> @@ -6360,17 +6371,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="44"/> <source>Not applicable</source> - <translation type="unfinished"/> + <translation>Not applicable</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="52"/> <source>Change</source> - <translation type="unfinished"/> + <translation>Change</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="59"/> <source>Status</source> - <translation type="unfinished"/> + <translation>Status</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="84"/> @@ -6654,7 +6665,7 @@ Files with inappropriate date/time</translation> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Small</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> @@ -6726,7 +6737,7 @@ Files with inappropriate date/time</translation> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Small</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/> @@ -6736,7 +6747,7 @@ Files with inappropriate date/time</translation> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/> <source>Big</source> - <translation type="unfinished"/> + <translation>Big</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/> @@ -6796,7 +6807,7 @@ Files with inappropriate date/time</translation> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/> <source>Image Size</source> - <translation type="unfinished"/> + <translation>Image size</translation> </message> </context> <context> @@ -6804,12 +6815,12 @@ Files with inappropriate date/time</translation> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> - <translation type="unfinished"/> + <translation>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is your first time using Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud button above.</translation> </message> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> - <translation type="unfinished"/> + <translation>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> </context> <context> @@ -7453,107 +7464,120 @@ mixed from Air and using: <translation>(%1 shown)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Cylinder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Photos before/during/after dive</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Country</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Location</translation> </message> @@ -8698,7 +8722,7 @@ Maximum</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>unknown</translation> @@ -8910,7 +8934,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>multiple GPS locations for this dive site; also %s @@ -8918,7 +8942,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>additional name for site: %s @@ -8946,19 +8970,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Error - %s - parsing dive %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Strange percentage reading %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Failed to parse '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Can't open stylesheet %s</translation> </message> @@ -9159,7 +9183,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/plannernotes.c" line="421"/> <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> + <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> </message> <message> <location filename="../core/plannernotes.c" line="432"/> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index 205b30309..70038f3fa 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -2302,12 +2302,12 @@ GPS actual:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Crea un nuevo punto de buceo, tomando información relevante de la inmersión actual.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Crea un nuevo punto de buceo con este nombre</translation> </message> @@ -3192,142 +3192,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Valoración</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Prof.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Traje</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Botella</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>CNS máximo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Fotos</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Pais</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Ubicación</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Prof.(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Lastre(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Fotos antes/durante/después de la inmersión </translation> </message> @@ -3930,27 +3930,27 @@ p, li { white-space: pre-wrap; } <translation>Coordenadas</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Búsqueda geográfica inversa</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>…</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Puntos de buceo en las mismas coordenadas</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Etiquetas</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Pais</translation> </message> @@ -3977,7 +3977,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Gestión de puntos de buceo</translation> </message> @@ -3999,7 +3999,7 @@ p, li { white-space: pre-wrap; } ¿Seguro que deseas continuar?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Estas editando un punto de buceo</translation> </message> @@ -4924,74 +4924,74 @@ Si tu dispositivo usa Bluetooth, efectúa los mismos preparativos que para desca <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Última parada a 20pies</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>De 50% de prof. media a 20 pies</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>De 20 pies a superficie</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Última parada a 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>De 50% prof. media a 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>De 6m a superficie</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>pies3/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5688,21 +5688,31 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString </translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation>Lista de inmersiones</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation>Mostrar unidades en la lista de inmersiones</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>Coordenadas GPS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Presentación de las coordenadas</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>Tradicional (gms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>Decimal</translation> </message> @@ -5941,147 +5951,147 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString </translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Iniciando...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation>Abrir archivo de datos local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation>Abrir archivo de datos local ha fallado</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 inmersiones cargados desde archivo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>Funcionando en modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation>Error analizando el almacenamiento local. Abortando.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>sin credenciales para la nube</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Por favor, introduce credenciales para la nube validas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>El correo y la contraseña del almacenamiento en la nube solo pueden contener letras, números, '.', '-', '_', y '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation>Formato de correo electrónico inválido</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Intentando acceder al almacenamiento en la nube con nuevas credenciales</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Comprobando credenciales para la nube</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>Sin respuesta del servidor en la nube al validar las credenciales</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation>Credenciales de la nube incorrectas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>No se puede conectar con el almacenamiento en la nube - la cuenta no pudo verificarse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Credenciales para la nube invalidas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>No se puede abrir el almacenamiento en la nube: Error al crear la conexión https</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>No se pudo abrir el almacenamiento en la nube: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>No se pudo conectar con el almacenamiento en la nube</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation>Credenciales en la nube validadas, cargando inmersiones ...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Error en almacenamiento en la nube: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Cargando inmersiones desde el almacenamiento local (sin nube)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Fallo al conectar con el servidor en la nube, volviendo al modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Almacenamiento en la nube abierto. No hay inmersiones en la lista.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>seg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Posición GPS desconocida</translation> </message> @@ -7456,107 +7466,120 @@ a partir de aire y usando: <translation>(%1 mostrada)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Valoración</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Prof.(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Botella</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Lastre(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Traje</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Fotos antes/durante/después de la inmersión</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Pais</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Ubicación</translation> </message> @@ -8701,7 +8724,7 @@ Media</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>desconocido</translation> @@ -8913,7 +8936,7 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>multiples posiciones GPS para este punto de buceo; también %s @@ -8921,7 +8944,7 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>otro nombre para este sitio: %s @@ -8949,19 +8972,19 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en <translation>Error - %s - al analizar la inmersión %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Porcentaje extraño al leer %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>No se pudo analizar '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>No se puede abrir la hoja de estilo %s</translation> </message> diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index f9b30e462..a40e2aeb8 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -2301,12 +2301,12 @@ asukohta:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Loo uus sukeldumiskoht kopeerides asjakohase info praegusest sukeldumisest</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Loo uus sukeldumiskoht selle nimega</translation> </message> @@ -3196,142 +3196,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Kuupäev</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Hinne</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Sügavus</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Raskus</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Ülikond</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Balloon</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gaas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>Hapnikumürgistuse ühik (OTU)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Fotod</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Riik</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Asukoht</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Sügavus(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Raskus(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Fotod sukeldumise eel/ajal/järel</translation> </message> @@ -3934,27 +3934,27 @@ p, li { white-space: pre-wrap; } <translation>Koordinaadid</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Sukeldumiskohad samadel koordinaatidel</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Märgendid</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Riik</translation> </message> @@ -3981,7 +3981,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Sukeldumiskohtade haldamine</translation> </message> @@ -4003,7 +4003,7 @@ p, li { white-space: pre-wrap; } Oled kindel et soovid jätkata?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Toimetad sukeldumiskohta</translation> </message> @@ -4924,74 +4924,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>jalg/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Viimane peatus 20 jala peal</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% keskmine sügavus 20 jalani</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20 jalga pinnani</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Viimane peatus 6m peal</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% keskmine sügavus 6m-i</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m pinnani</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>kuupjalg/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5686,21 +5686,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>GPS koordinaadid</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>Traditsiooniline (dms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation type="unfinished"/> </message> @@ -5939,147 +5949,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Alustan...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>Töötamine mitte-pilve režiimis</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>pole pilve volitusi</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Palun sisesta kehtivad pilve volitused.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Üritan avada pilvesalvestit uute volitustega</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Pilve volituste testimine</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Ei saa avada pilve salvestit: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Ei saa ühendust pilve salvestiga</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Pilve salvesti viga: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Pilve salvesti avamine õnnestus. Sukeldumiste nimekiri on tühi.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Tundmatu GPS koht</translation> </message> @@ -7449,107 +7459,120 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Kuupäev</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Hinne</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Sügavus(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Balloon</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Raskus(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Ülikond</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gaas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Fotod sukeldumise eel/ajal/järel</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Riik</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Asukoht</translation> </message> @@ -8691,7 +8714,7 @@ Max</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>tundmatu</translation> @@ -8901,14 +8924,14 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8935,19 +8958,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Imelik protsendilugem %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>'%s' tuvastamine ebaõnnestus</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Ei suuda avada stiililehte %s</translation> </message> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index ba3704203..277a7df98 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -2300,12 +2300,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Luo uusi sukelluskohde ja kopioi oleelliset tiedot valitusta sukelluskohteesta</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Luo uusi sukelluskohde tälle nimelle</translation> </message> @@ -3190,142 +3190,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Ajankohta</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Yleisarvio</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Syvyys</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Painot</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Puku</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Lämpö</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Säiliö</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Kaasu</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>Pintakulutus</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Valokuvat</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Maa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Kohde</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Syvyys(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Lämpö (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Massa(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>Pintakulutus(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Kuvat sukelluksen aikana tai ennen/jälkeen</translation> </message> @@ -3928,27 +3928,27 @@ p, li { white-space: pre-wrap; } <translation>Koordinaatit</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Sijaintitiedon päivitys</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Sukelluskohteet samassa sijainnissa</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Avainsanat</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Maa</translation> </message> @@ -3975,7 +3975,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Sukelluskohteiden hallinta</translation> </message> @@ -3996,7 +3996,7 @@ p, li { white-space: pre-wrap; } <translation>Olet yhdistämässä sukelluskohteita. Toimintoa ei voi perua. Oletko varma, että haluat jatkaa?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Muokkaat sukelluskohdetta</translation> </message> @@ -4921,74 +4921,74 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Viimeinen pysähdys 20 jalassa</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% keskisyvyydestä - 20 jalkaan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20 jalasta pintaan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Viimeinen pysähdys kuudessa metrissä</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% keskisyvyydestä - 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m:stä pintaan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>ft³/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5684,21 +5684,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>Koordinaatit</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Sijainnin näyttö</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>perinteinen (dms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>desimaali</translation> </message> @@ -5937,147 +5947,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Ladataan...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation>Avaa paikallinen sukelluslokitiedosto</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation>Paikallisen tiedoston avaus epäonnistui</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 sukellusta ladattu paikallisesta tiedostosta</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>käytä off-line -tilassa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation>Virhe paikallisen tallenteen jäsentämisessä, keskeytetään</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>Ei pilvipalvelun tunnuksia</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Syötä pilvipalvelun tunnuksent.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Pilvipalvelun sähköpostiosoitteessa ja salasanassa voi olla vain kirjaimia, numeroita ja merkit '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation>Virheellinen sähköpostiosoite</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <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="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Testataan pilvipalvelun tunnuksia</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <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="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation>Virheelliset pilvitunnukset</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Virheelliset pilvipalvelun tunnukset</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <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="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Pilvitallennuksen yhteyden avaus epäonnistui: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Yhteys pilvitallennukseen epäonnistui</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation>Pilvitunnukset OK, ladataan sukelluksia...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Virhe pilvitallennuksessa: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Ladataan sukellukset paikallisesta tallennustilasta ('ei pilve' tila)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <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="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <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="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Tuntemattomat GPS -sijainnit</translation> </message> @@ -7449,107 +7459,120 @@ sekoittaa ilmasta ja käyttäen: <translation> (näytetään %1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Ajankohta</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Yleisarvio</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Syvyys(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Lämpö (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Säiliö</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>t</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Massa(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Puku</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Kaasu</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>Pintakulutus(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>Happikertymä (OTU)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Kuvat sukelluksen aikana tai ennen/jälkeen</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Maa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Kohde</translation> </message> @@ -8694,7 +8717,7 @@ Keski</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>tuntematon</translation> @@ -8906,7 +8929,7 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>sukelluskohteella on useita GPS -positioita; %s @@ -8914,7 +8937,7 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>Ylimääräinen nimi sukelluskohteelle: %s @@ -8942,19 +8965,19 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - <translation>Virhe - %s - jäsentäessä sukellusta %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Outo prosenttiosuus: %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Tiedoston '%s' lukeminen epäonnistui.</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Tyylitiedoston %1 avaus ei onnistu</translation> </message> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 8e28abd67..c141dc6bb 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -2301,12 +2301,12 @@ GPS actuelle :</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Créer un nouveau site de plongée, en copiant les informations pertinentes de la plongée actuelle.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Créer un nouveau site de plongée avec ce nom</translation> </message> @@ -3191,142 +3191,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Évaluation</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Profondeur</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Poids</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Combinaison</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Bloc</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>SNC max</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Photos</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Pays</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Lieu</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Profondeur (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>pied</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Température (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Poids (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Photos avant/durant/après la plongée</translation> </message> @@ -3929,27 +3929,27 @@ p, li { white-space: pre-wrap; } <translation>Coordonnées</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Recherche geo inversée</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Sites de plongée avec les même coordonnées</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Étiquettes</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Pays</translation> </message> @@ -3976,7 +3976,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Gestion des sites de plongée</translation> </message> @@ -3998,7 +3998,7 @@ p, li { white-space: pre-wrap; } cette opération. Voulez-vous vraiment continuer ?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Vous modifiez un site de plongée</translation> </message> @@ -4923,74 +4923,74 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Dernier palier à 20 pieds</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% de la prof. moyenne à 20 pieds</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>de 20 pieds à la surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Dernier palier à 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% de la profondeur moyenne à 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>de 6m à la surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5687,21 +5687,31 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation>Tableau de la liste des plongées</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation>Afficher les unités dans le tableau de la liste des plongées</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>Coordonnées GPS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Affichage du lieu</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>traditionnel (dms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>décimal</translation> </message> @@ -5940,147 +5950,147 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Démarrage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation>Ouvrir les données de plongée local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation>L'ouverture du fichier local de données a échoué</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 plongées chargées depuis le fichier local de données de plongées</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>Travail hors-ligne</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation>Erreur d'analyse du fichier de stockage local, abandon</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>Pas d'information de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <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="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>L'e-mail et le mot de passe du stockage dans le cloud peuvent uniquement comporter des lettres, nombres et '.', '-', '_' et '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation>Format invalide pour l'adresse e-mail</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <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="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Test des informations de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <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="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation>Informations de connexion au cloud incorrectes</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Informations de connexion pour le cloud invalides</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <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="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <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="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Impossible de se connecter au cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation>Informations de connexion au cloud valides, chargement des plongées...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Erreur cloud : %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Chargement des plongées depuis le stockage local (mode 'no cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <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="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <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="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Location GPS inconnue</translation> </message> @@ -6805,12 +6815,12 @@ Fichiers avec dates/heures incorrectes</translation> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> - <translation type="unfinished"/> + <translation>Pour utiliser Subsurface-mobile avec le stockage cloud de Subsurface, veuillez entrer vos identifiants cloud. <br/><br/>Si c'est la première fois que vous utilisez le stockage cloud de Subsurface, entrez un e-mail valide (en minuscules) et un mot de passe de votre choix (lettres et nombres).<br/><br/> Pour utiliser Subsurface-mobile uniquement avec des données locales, sur ce périphérique, cliquez sur le bouton Pas de cloud.</translation> </message> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> - <translation type="unfinished"/> + <translation>Merci de vous être enregistré avec Subsurface. Nous vous avons envoyé <b>%1</b> un code PIN pour terminer l'enregistrement. Si vous n'avez pas reçu d'e-mail de notre part dans les 15 minutes, veuillez vérifier l'adresse e-mail fournie et votre dossier spam. <br/><br/>En cas de problème avec la configuration du compte cloud, contactez-nous sur notre forum utilisateur (https://subsurface-divelog.org/user-forum/).<br/></translation> </message> </context> <context> @@ -7454,107 +7464,120 @@ mélangés à partir de l'air et en utilisant : <translation>(%1 affiché(s))</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Évaluation</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Profondeur (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Température (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Bloc</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>SNC Max.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Poids (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Combinaison</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Photos avant/durant/après la plongée</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Pays</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Lieu</translation> </message> @@ -8701,7 +8724,7 @@ Maximum</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>inconnu</translation> @@ -8860,7 +8883,7 @@ Maximum</translation> <message> <location filename="../core/libdivecomputer.c" line="805"/> <source>Already downloaded dive at %s</source> - <translation type="unfinished"/> + <translation>Plongées déjà téléchargées le %s</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="939"/> @@ -8902,7 +8925,9 @@ Maximum</translation> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> - <translation type="unfinished"/> + <translation>Erreur lors de l'ouverture du périphérique %s %s (%s). +La plupart du temps, pour déboguer ce problème, un fichier log de libdivecomputer sera utile. +Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans la fenêtre de téléchargement.</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="1128"/> @@ -8911,7 +8936,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>Emplacement GPS multiples pour le site de plongée; également %s @@ -8919,7 +8944,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>Noms supplémentaires pour le site : %s @@ -8947,19 +8972,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Erreur - %s - lors de l'analyse de la plongée %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Valeur de pourcentage étrange lue %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Impossible d'analyser '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Impossible d'ouvrir le feuille de style %s</translation> </message> @@ -9160,7 +9185,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/plannernotes.c" line="421"/> <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> + <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum de gaz</span> (basé sur %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> </message> <message> <location filename="../core/plannernotes.c" line="432"/> @@ -10380,7 +10405,7 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="186"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> - <translation type="unfinished"/> + <translation>Désactiver la synchronisation automatique vers le cloud entraîne un enregistrement des données localement uniquement. Cela peut être utile dans des situations avec un accès au réseau limité ou inexistant. Veuillez choisir 'Synchro manuelle avec le cloud' si vous avez une connexion réseau et que vous souhaitez synchroniser vos données vers le stockage cloud.</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="195"/> diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index 01abcd131..9a8dd1d21 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -2300,12 +2300,12 @@ GPS הנוכחי:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>יצירת אתר צלילה חדש, העתקת מידע רלוונטי מהצלילה הנוכחית.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>יצירת אתר צלילה חדש בשם זה</translation> </message> @@ -3191,142 +3191,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>תאריך</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>דירוג</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>עומק</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>משקל</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>חליפה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>טמפ</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>מיכל</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>גז</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>צריכת אויר</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>רעילות שייורית מקסימלית</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>תמונות</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>מדינה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>מיקום</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>עומק (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>טמפ.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>משקל(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>ליברות</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>צריכת גז (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>לדקה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>תמונות לפני / במהלך / אחרי צלילה</translation> </message> @@ -3929,27 +3929,27 @@ p, li { white-space: pre-wrap; } <translation>קואורדינטות</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>בדיקה גיאוגרפית הפוכה</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>אתרי צלילה באותה נ"צ</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>תגיות</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>מדינה</translation> </message> @@ -3976,7 +3976,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>ניהול אתרי צלילה</translation> </message> @@ -3998,7 +3998,7 @@ p, li { white-space: pre-wrap; } האם אתה בטוח שאתה רוצה להמשיך?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>הנך עורך אתר צלילה</translation> </message> @@ -4922,74 +4922,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>מערכת חצי סגורה</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>רגל לדקה</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>תחנה אחרונה ב-20 רגל</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% עומק ממוצע ל-20 רגל</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20 רגל לפני המים</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>מטרים לדקה</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>עצירה אחרונה ב6 מ'</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% עומק ממוצע ל-6 מטר</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6 מטר לפני המים</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>רגל מעוקב לדקה</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ליטר לדקה</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5686,21 +5686,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>נ"צ</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>תצוגת מיקום</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>מסורתיות (מעלות דקות שניות)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>עשרוני</translation> </message> @@ -5939,147 +5949,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>מתחיל...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>עובד במצב של חוסר תקשורת עם הענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation>שגיאה בקריאת קובץ מקומי, מבטל</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>אין פרטי זיהוי לענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>נא להזין פרטי זיהוי חוקיים לענן.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>דואר אלקטרוני וסיסמא לאחסון בענן יכולים רק מורכבים מאותיות, מספרים, ו, '.' '-', '_', ו '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>מנסה להתחבר לענן עם זיהוי חדש</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>בודק זיהוי לענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>אין תגובה משרת ענן כדי לאמת את האישורים</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>אין אפשרות להתחבר לענן - חשבון ענן לא מאומת</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>זיהוי לענן לא חוקי</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>אין אפשרות להתחבר לענן: תקלה ביצירת קשר https</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>אין אפשרות להתחבר לענן: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>אין אפשרות להתחבר לענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>שגיאת איחסון ענן: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>שגיאה בחיבור לשרת ענן, חוזר למצב של עבודה מקומית</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>חיבור לענן נוצר בהצלחה. אין צלילות ברשימת הצלילות.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>שעה</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>דקה</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>שניות</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>נ"צ לא מוכר</translation> </message> @@ -7452,107 +7462,120 @@ mixed from Air and using: <translation>(%1 מוצג)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>תאריך</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>דירוג</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>עומק (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>טמפ.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>מיכל</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>רעילות שייורית מקסימלית</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>שעה</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>דקה</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>משקל(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>ליברה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>חליפה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>גז</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>צריכת גז (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>לדקה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>תמונות לפני / במהלך / אחרי צלילה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>מדינה</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>מיקום</translation> </message> @@ -8695,7 +8718,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>לא ידוע</translation> @@ -8905,7 +8928,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>מיקומי GPS מרובים לאתר צלילה זה; גם %s @@ -8913,7 +8936,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>שם נוסף לאתר: %s @@ -8941,19 +8964,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>תקלה - %s - בקריאת צלילה %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>קריאת אחוז מוזרה %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>נכשל ניסיון לנתח '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>לא ניתן לפתוח את גיליון העיצוב %s</translation> </message> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index e0d308eda..142d12545 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -2293,12 +2293,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -3179,142 +3179,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Ocjena</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Dubina</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Težina</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Odijelo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Boca</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Lokacija</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> @@ -3915,27 +3915,27 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation type="unfinished"/> </message> @@ -3962,7 +3962,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3983,7 +3983,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4904,74 +4904,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5666,21 +5666,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> - <source>GPS coordinates</source> + <source>Dive list table</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> + <source>GPS coordinates</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation type="unfinished"/> </message> @@ -5919,147 +5929,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -7422,107 +7432,120 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Ocjena</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Boca</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Odijelo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Lokacija</translation> </message> @@ -8650,7 +8673,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>nepoznato</translation> @@ -8860,14 +8883,14 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8894,19 +8917,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Neobično očitanje postotka %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Nije uspjelo parsiranje '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts index 74c4b3643..b8f2c2040 100644 --- a/translations/subsurface_hu.ts +++ b/translations/subsurface_hu.ts @@ -2297,12 +2297,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -3183,142 +3183,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Mélység</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Palack</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Hely</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> @@ -3919,27 +3919,27 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation type="unfinished"/> </message> @@ -3966,7 +3966,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3987,7 +3987,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4908,74 +4908,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation type="unfinished"/> </message> @@ -5670,21 +5670,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> - <source>GPS coordinates</source> + <source>Dive list table</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> + <source>GPS coordinates</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation type="unfinished"/> </message> @@ -5923,147 +5933,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -7426,107 +7436,120 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Palack</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Hely</translation> </message> @@ -8654,7 +8677,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation type="unfinished"/> @@ -8864,14 +8887,14 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8898,18 +8921,18 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>'%s' értelmezése meghiúsult.</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index fdcefc4f0..4ffe4a2e8 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -2293,12 +2293,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -3179,142 +3179,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Tanggal</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Peringkat</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>edalaman</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Berat</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Pakaian</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Lokasi</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/menit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> @@ -3915,27 +3915,27 @@ p, li { white-space: pre-wrap; } <translation>Koordinat</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Tag</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation type="unfinished"/> </message> @@ -3962,7 +3962,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3983,7 +3983,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4904,74 +4904,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5666,21 +5666,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> - <source>GPS coordinates</source> + <source>Dive list table</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> + <source>GPS coordinates</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation type="unfinished"/> </message> @@ -5919,147 +5929,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>menit</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -7422,107 +7432,120 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Tanggal</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Peringkat</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>menit</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kgkg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Pakaian</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/menit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Lokasi</translation> </message> @@ -8658,7 +8681,7 @@ Rata-rata</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>Tak dikenal</translation> @@ -8868,14 +8891,14 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8902,18 +8925,18 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index 7f1221481..29e427f37 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -36,7 +36,7 @@ <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/> <source>Navigate Back</source> - <translation type="unfinished"/> + <translation>Torna indietro</translation> </message> </context> <context> @@ -359,7 +359,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> <source>Register</source> - <translation type="unfinished"/> + <translation>Registrati</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> @@ -369,12 +369,12 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> <source>Sign-in or Register</source> - <translation type="unfinished"/> + <translation>Accedi o Registrati</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>Modalità off-line</translation> </message> </context> <context> @@ -1931,7 +1931,7 @@ il computer selezionato?</translation> <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> <source>Cancel edit</source> - <translation type="unfinished"/> + <translation>Annulla modifiche</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> @@ -2041,7 +2041,7 @@ del GPS:</translation> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>Visibilità:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> @@ -2089,7 +2089,7 @@ del GPS:</translation> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>Visibilità:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> @@ -2301,12 +2301,12 @@ del GPS:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Crea un nuovo sito di immersione copiando le principali informazioni dall'immersione corrente.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Crea un nuovo sito d'immersione con questo nome</translation> </message> @@ -3191,142 +3191,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Valutazione</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Profondità</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Muta</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Bombola</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>CNS massimo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Foto</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Nazione</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Luogo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Prof. (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Fot pprima/durante/dopo l'immersione</translation> </message> @@ -3460,7 +3460,7 @@ p, li { white-space: pre-wrap; } <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> <source>Connecting to dive computer</source> - <translation type="unfinished"/> + <translation>Connessione allo strumento in corso</translation> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> @@ -3618,7 +3618,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="21"/> <source>Bluetooth is not enabled</source> - <translation type="unfinished"/> + <translation>Il Bluetooth non è abilitato</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> @@ -3633,7 +3633,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> <source> Connection:</source> - <translation type="unfinished"/> + <translation>Connessione:</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> @@ -3712,22 +3712,22 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> <source>Facebook logged in successfully</source> - <translation type="unfinished"/> + <translation>Accesso a facebook eseguito con successo</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Error, unknown user id, cannot login.</source> - <translation type="unfinished"/> + <translation>Login fallito, utente sconosciuto</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> <source>Dive uploaded successfully to Facebook</source> - <translation type="unfinished"/> + <translation>Immersioni caricate correttamente su Facebook</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> - <translation type="unfinished"/> + <translation>Caricamento delle immersioni fallito. Invia le informazioni di debug alla mailing list di Subsurface</translation> </message> </context> <context> @@ -3792,7 +3792,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="50"/> <source>Navigate Forward</source> - <translation type="unfinished"/> + <translation>Avanti</translation> </message> </context> <context> @@ -3929,27 +3929,27 @@ p, li { white-space: pre-wrap; } <translation>Coordinate</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Ricerca inversa delle coordinate</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Siti con le stesse coordinate</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Nazione</translation> </message> @@ -3976,7 +3976,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Gestione dei siti di immersione</translation> </message> @@ -3998,7 +3998,7 @@ p, li { white-space: pre-wrap; } Sei sicuro di voler continuare?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Stai modificando un sito di immersione</translation> </message> @@ -4432,7 +4432,7 @@ Sei sicuro di voler continuare?</translation> <message> <location filename="../desktop-widgets/mainwindow.ui" line="380"/> <source>&Map</source> - <translation type="unfinished"/> + <translation>&Mappa</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="388"/> @@ -4801,7 +4801,7 @@ Subsurface ha già cercato di convertire i dati in maniera automatica ma sarebbe <message> <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> <source>Drag the selected dive location</source> - <translation type="unfinished"/> + <translation>Trascina il punto di immersione selezionato</translation> </message> </context> <context> @@ -4809,22 +4809,22 @@ Subsurface ha già cercato di convertire i dati in maniera automatica ma sarebbe <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> - <translation type="unfinished"/> + <translation>Apri la posizione su Google Maps</translation> </message> <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> - <translation type="unfinished"/> + <translation>Copia la posizione nella clipboard (decimale)</translation> </message> <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> - <translation type="unfinished"/> + <translation>Copia la posizione nella clipboard (sessagesimale)</translation> </message> <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> - <translation type="unfinished"/> + <translation>Seleziona i punti di immersione visibili</translation> </message> </context> <context> @@ -4833,7 +4833,8 @@ Subsurface ha già cercato di convertire i dati in maniera automatica ma sarebbe <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> - <translation type="unfinished"/> + <translation>Errore nel caricamento di MapWidget +Potrebbero mancare i moduli QML QtPositioning e QtLocation!</translation> </message> </context> <context> @@ -4891,17 +4892,17 @@ Se il tuo strumento usa il Bluetooth, prima di eseguire l'aggiornamento, es <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="26"/> <source>Page 1</source> - <translation type="unfinished"/> + <translation>Pagina 1</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="37"/> <source>Text Field</source> - <translation type="unfinished"/> + <translation>Campo di testo</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="42"/> <source>Press Me</source> - <translation type="unfinished"/> + <translation>Premimi</translation> </message> </context> <context> @@ -4922,74 +4923,74 @@ Se il tuo strumento usa il Bluetooth, prima di eseguire l'aggiornamento, es <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>piedi/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Ultima sosta a 20 piedi</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>Dal 50% della prof. media a 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20 piedi alla superficie</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Ultima sosta a 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>Dal 50% della prof. media a 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m alla superficie</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5686,21 +5687,31 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation>Elenco delle immersioni</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation>Mostra unità di misura nell'elenco delle immersioni</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>Coordinate GPS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Visualizzazione del luogo</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>tradizionale (gms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>decimale</translation> </message> @@ -5939,147 +5950,147 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Avvio...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation>Apri file di log immersioni locale</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation>Apertura del file locale fallita</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 immersioni caricate dal file locale</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>sto lavorando in modalità off-line</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation>Errore nella decodifica dell'archivio locale, abbandono</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>Credenziali cloud mancanti</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Prego inserire credenziali valide per il cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Email e password per la memoria cloud possono contenere solo lettere, numeri, '.', '-', '_', e '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> - <translation type="unfinished"/> + <translation>Formato email errato</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Sto cercando di aprire la memoria cloud con le nuove credenziali</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Controlle le credenziali per il cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>Nessuna risposta del server cloud per la validazione delle credenziali</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> - <translation type="unfinished"/> + <translation>Credenziali per il cloud errate</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Non è possibile connettersi al cloud storage - account cloud non verificato</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Le credenziali per il cloud non sono valide</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Non è possibile aprire il cloud storage: errore nella creazione della connessione https</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Non è possibile aprire il cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Non è possibile connettersi al cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation>Credenziali per il cloud valide, sto caricando le immersioni</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Errore cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Sto caricando le immersioni dalla memoria locale (modalità "no cloud")</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Impossibile connettersi al server cloud, passo alla modalità off-line</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Memoria cloud aperta con successo. Non ho trovato immersioni.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Posizione GPS sconosciuta</translation> </message> @@ -6325,32 +6336,32 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio <message> <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Undefined</source> - <translation type="unfinished"/> + <translation>Non definito</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> <source>Incorrect username/password combination</source> - <translation type="unfinished"/> + <translation>Combinazione utente/password errata</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> <source>Credentials need to be verified</source> - <translation type="unfinished"/> + <translation>Le credenziali devono essere verificate</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> <source>Credentials verified</source> - <translation type="unfinished"/> + <translation>Credenziali di accesso verificate</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>Modalità off-line</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="30"/> <source>Cloud status</source> - <translation type="unfinished"/> + <translation>Stato del cloud</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="38"/> @@ -6360,12 +6371,12 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio <message> <location filename="../mobile-widgets/qml/Settings.qml" line="44"/> <source>Not applicable</source> - <translation type="unfinished"/> + <translation>Non applicabile</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="52"/> <source>Change</source> - <translation type="unfinished"/> + <translation>Cambia</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="59"/> @@ -6429,7 +6440,7 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio <message> <location filename="../mobile-widgets/qml/Settings.qml" line="322"/> <source>Save detailed log</source> - <translation type="unfinished"/> + <translation>Salva un log dettagliato</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="345"/> @@ -6439,7 +6450,7 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio <message> <location filename="../mobile-widgets/qml/Settings.qml" line="354"/> <source>Display Developer menu</source> - <translation type="unfinished"/> + <translation>Visualizza il menù sviluppatore</translation> </message> </context> <context> @@ -6655,7 +6666,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Piccolo</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> @@ -6727,7 +6738,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Piccolo</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/> @@ -6737,12 +6748,12 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/> <source>Big</source> - <translation type="unfinished"/> + <translation>Grande</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/> <source>The text to the right will be posted as the description with your dive profile graph to Facebook. The album name is required (the profile graph will be posted to that album).</source> - <translation type="unfinished"/> + <translation>Il testo a destra sarà pubblicato su Facebook come descrizione insieme all'immagine del profilo di immersione. Il nome dell'album è obbligatorio (il profilo sarà pubblicato in quell'album).</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="57"/> @@ -6797,7 +6808,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/> <source>Image Size</source> - <translation type="unfinished"/> + <translation>Dimensioni dell'immagine</translation> </message> </context> <context> @@ -6805,12 +6816,12 @@ Files with inappropriate date/time</source> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> - <translation type="unfinished"/> + <translation>Per utilizzare Subsurface-mobile con il Subsurface cloud storage, inserisci le tue credenziali per il cloud.<br/><br/>Se questa è la prima volta che usi la memoria cloud di Subsurface, inserisci un indirizzo email valido (tutte lettere minuscole) e una password (lettere e numeri).<br/><br/>Per usare Subsurface-mobile solo con i dati locali su questo dispositivo, seleziona il tasto no cloud in alto.</translation> </message> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> - <translation type="unfinished"/> + <translation>Grazie per esserti registrato. Abbiamo inviato a <b>%1</b> un codice PIN per completare la registrazione. Se non ricevi una email da noi entro 15 minuti controlla prima l'indirizzo di posta digitato e la tua cartella dello spam.<br/><br/>Nel caso di problemi con la registrazione, contattaci al forum di assistenza (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> </context> <context> @@ -7454,107 +7465,120 @@ mixati con aria e usando: <translation> (%1 mostrati)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>n</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Valutazione</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Prof. (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Bombola</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>CNS massimo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Muta</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Foto prima/durante/dopo l'immersione</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Nazione</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Luogo</translation> </message> @@ -8573,7 +8597,7 @@ Media</translation> <message> <location filename="../core/file.c" line="950"/> <source>No dive profile found from '%s'</source> - <translation type="unfinished"/> + <translation>Nessun profilo di immersione trovato in '%s'</translation> </message> <message> <location filename="../core/git-access.c" line="56"/> @@ -8698,7 +8722,7 @@ Media</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>sconosciuto</translation> @@ -8899,16 +8923,18 @@ Media</translation> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> - <translation type="unfinished"/> + <translation>Errore all'apertura di %s %s (%s). +Di solito per capire il problema è utile avere un file di log di libdivecomputer. +Puoi crearne uno selezionando il corrispondente checkbox nella maschera di download.</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="1128"/> <source>No new dives downloaded from dive computer</source> - <translation type="unfinished"/> + <translation>Non sono state trovate nuove immersioni nel computer subacqueo</translation> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>Ci sono più coordinate GPS per questo luogo di immersione, anche %s @@ -8916,7 +8942,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>nome addizionale per il sito: %s @@ -8944,7 +8970,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Errore - %s - nel parsing dell'immersione %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Lettura di strane percentuali %s @@ -8952,12 +8978,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Impossibile analizzare '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Non é possibile aprire il foglio di stile %s</translation> </message> @@ -9113,7 +9139,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/plannernotes.c" line="105"/> <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> + <translation>Runtime: %dmin VARIAZIONI<br></div></translation> </message> <message> <location filename="../core/plannernotes.c" line="324"/> @@ -9158,7 +9184,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/plannernotes.c" line="421"/> <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> + <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (calcolato in base a %.1fxCAS/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> </message> <message> <location filename="../core/plannernotes.c" line="432"/> @@ -9279,7 +9305,8 @@ D:%.1f%s <location filename="../core/profile.c" line="1325"/> <source>P: %d%s (%s) </source> - <translation type="unfinished"/> + <translation>P: %d%s (%s) +</translation> </message> <message> <location filename="../core/profile.c" line="1357"/> @@ -10333,12 +10360,12 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="133"/> <source>Dive management</source> - <translation type="unfinished"/> + <translation>Gestione dell'immersione</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="234"/> <source>Disable location service</source> - <translation type="unfinished"/> + <translation>Disabilita il servizio di localizzazione</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="250"/> @@ -10358,7 +10385,7 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="155"/> <source>Apply GPS Fixes</source> - <translation type="unfinished"/> + <translation>Applica i punti GPS</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="162"/> @@ -10438,7 +10465,7 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/main.qml" line="28"/> <source>Hello World</source> - <translation type="unfinished"/> + <translation>Hello World</translation> </message> </context> <context> @@ -10641,12 +10668,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> <source>Compute variations of plan (performance cost)</source> - <translation type="unfinished"/> + <translation>Calcola le variazioni del piano (costo della performance)</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> <source>Display plan variations</source> - <translation type="unfinished"/> + <translation>Visualizza le variazioni al piano di immersione</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts index c8489365f..337e519ed 100644 --- a/translations/subsurface_lv_LV.ts +++ b/translations/subsurface_lv_LV.ts @@ -2294,12 +2294,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -3180,142 +3180,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Datums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Novērtējums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Dziļums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Svars</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Kostīms</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Maks. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Fotogrāfijas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Vieta</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>mārciņa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> @@ -3917,27 +3917,27 @@ p, li { white-space: pre-wrap; } <translation>Koordinātas</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Tagi</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation type="unfinished"/> </message> @@ -3964,7 +3964,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3985,7 +3985,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4906,74 +4906,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Pēdējā pietura pie 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Pēdējā pietura pie 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5668,21 +5668,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> - <source>GPS coordinates</source> + <source>Dive list table</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> + <source>GPS coordinates</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation type="unfinished"/> </message> @@ -5921,147 +5931,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -7424,107 +7434,120 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Datums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Novērtējums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>mārciņa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Kostīms</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Vieta</translation> </message> @@ -8663,7 +8686,7 @@ Vidējais</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>nezināms</translation> @@ -8873,14 +8896,14 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8907,19 +8930,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Dīvaina procentu nolasīšana %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Kļūme parsējot '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Nevar atvērts stila lapu %s</translation> </message> diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 4f0f66f05..1c1c780fd 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -35,7 +35,7 @@ <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/> <source>Navigate Back</source> - <translation type="unfinished"/> + <translation>Naviger tilbake</translation> </message> </context> <context> @@ -201,7 +201,7 @@ <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> <source>A device needs a non-zero address for a connection.</source> - <translation type="unfinished"/> + <translation>En tom adresse kan ikke brukes for en enhetstilkobling</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> @@ -325,12 +325,12 @@ <message numerus="yes"> <location filename="../core/checkcloudconnection.cpp" line="58"/> <source>Waiting for cloud connection (%n second(s) passed)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Venter på skytilkobling (%n sekund(er) har gått)</numerusform><numerusform>Venter på skytilkobling (%n sekund(er) har gått)</numerusform></translation> </message> <message> <location filename="../core/checkcloudconnection.cpp" line="65"/> <source>Cloud connection failed</source> - <translation type="unfinished"/> + <translation>Skyforbindelse feilet</translation> </message> </context> <context> @@ -358,7 +358,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> <source>Register</source> - <translation type="unfinished"/> + <translation>Registrer</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> @@ -368,12 +368,12 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> <source>Sign-in or Register</source> - <translation type="unfinished"/> + <translation>Logg inn eller registrer</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>Ingen skymodus</translation> </message> </context> <context> @@ -687,7 +687,7 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="241"/> <source>OSTC 4</source> - <translation type="unfinished"/> + <translation>OSTC 4</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="262"/> @@ -1604,22 +1604,22 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3267"/> <source>Travel gas consumption</source> - <translation type="unfinished"/> + <translation>Forbruk av reisegass</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3290"/> <source>Button sensitivity</source> - <translation type="unfinished"/> + <translation>Knappesensitivitet</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3420"/> <source>VPM</source> - <translation type="unfinished"/> + <translation>VPM</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3560"/> <source>VPM conservatism</source> - <translation type="unfinished"/> + <translation>VPM-konservatisme</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3567"/> @@ -1929,7 +1929,7 @@ <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> <source>Cancel edit</source> - <translation type="unfinished"/> + <translation>Avbryt redigering</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> @@ -2039,7 +2039,7 @@ GPS-posisjon:</translation> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>Sikt:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> @@ -2077,7 +2077,7 @@ GPS-posisjon:</translation> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> <source>Map it</source> - <translation type="unfinished"/> + <translation>På kart</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> @@ -2087,7 +2087,7 @@ GPS-posisjon:</translation> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>Sikt:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> @@ -2185,7 +2185,7 @@ GPS-posisjon:</translation> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> - <translation type="unfinished"/> + <translation>Trykk '+'-knappen for å legge til et dykk (eller last ned dykk fra en dykkecomputer)</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> @@ -2283,7 +2283,7 @@ GPS-posisjon:</translation> <message> <location filename="../desktop-widgets/divelistview.cpp" line="921"/> <source>Image files (%1)</source> - <translation type="unfinished"/> + <translation>Bildefiler (%1)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="977"/> @@ -2299,12 +2299,12 @@ GPS-posisjon:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Lag et nytt dykkested, og kopier relevant informasjon fra dette dykket</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Opprett dykkested med dette navnet</translation> </message> @@ -2910,7 +2910,7 @@ GPS-posisjon:</translation> <message numerus="yes"> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="336"/> <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>(%n dykk)</numerusform><numerusform>(%n dykk)</numerusform></translation> </message> <message> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> @@ -3189,142 +3189,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gass</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Vekt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Bilder før/under/etter dykk</translation> </message> @@ -3458,7 +3458,7 @@ p, li { white-space: pre-wrap; } <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> <source>Connecting to dive computer</source> - <translation type="unfinished"/> + <translation>Kobler til dykkecomputer</translation> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> @@ -3616,7 +3616,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="21"/> <source>Bluetooth is not enabled</source> - <translation type="unfinished"/> + <translation>Bluetooth er ikke skrudd på</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> @@ -3631,7 +3631,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> <source> Connection:</source> - <translation type="unfinished"/> + <translation>Forbindelse:</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> @@ -3651,7 +3651,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> <source>Info:</source> - <translation type="unfinished"/> + <translation>Info:</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> @@ -3710,22 +3710,22 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> <source>Facebook logged in successfully</source> - <translation type="unfinished"/> + <translation>Logget inn på Facebook</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Error, unknown user id, cannot login.</source> - <translation type="unfinished"/> + <translation>Feil, ukjent bruker-id, kan ikke logge inn.</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> <source>Dive uploaded successfully to Facebook</source> - <translation type="unfinished"/> + <translation>Lastet opp dykk til Facebook</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> - <translation type="unfinished"/> + <translation>Kunne ikke laste opp dykk. Se debug-meldinger og send til epostlista til Subsurface</translation> </message> </context> <context> @@ -3790,7 +3790,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="50"/> <source>Navigate Forward</source> - <translation type="unfinished"/> + <translation>Naviger framover</translation> </message> </context> <context> @@ -3927,27 +3927,27 @@ p, li { white-space: pre-wrap; } <translation>Koordinater</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Geo-oppslag av dykkested</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Dykkesteder med samme koordinater</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Emner</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Land</translation> </message> @@ -3974,7 +3974,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Dykkestedsdatabase</translation> </message> @@ -3996,7 +3996,7 @@ p, li { white-space: pre-wrap; } Er du sikker på at du vil fortsette?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Du redigerer et dykkested</translation> </message> @@ -4430,7 +4430,7 @@ Er du sikker på at du vil fortsette?</translation> <message> <location filename="../desktop-widgets/mainwindow.ui" line="380"/> <source>&Map</source> - <translation type="unfinished"/> + <translation>Kart</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="388"/> @@ -4688,7 +4688,7 @@ Er du sikker på at du vil fortsette?</translation> <message> <location filename="../desktop-widgets/divelistview.cpp" line="585"/> <source>Trying to merge dives with %1min interval in between</source> - <translation type="unfinished"/> + <translation>Prøver å slå sammen dykk med %1min intervall mellom</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> @@ -4799,7 +4799,7 @@ Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på <message> <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> <source>Drag the selected dive location</source> - <translation type="unfinished"/> + <translation>Dra valgte dykkested</translation> </message> </context> <context> @@ -4807,22 +4807,22 @@ Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> - <translation type="unfinished"/> + <translation>Åpne sted i Google Maps</translation> </message> <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> - <translation type="unfinished"/> + <translation>Kopier sted (desimal)</translation> </message> <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> - <translation type="unfinished"/> + <translation>Kopier sted (seksagesimalt)</translation> </message> <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> - <translation type="unfinished"/> + <translation>Velg synlige dykkesteder</translation> </message> </context> <context> @@ -4831,7 +4831,8 @@ Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> - <translation type="unfinished"/> + <translation>MapWidget.qml kunne ikke lastes! +QML-modulene QtPositioning og QtLocation mangler muligens!</translation> </message> </context> <context> @@ -4889,17 +4890,17 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="26"/> <source>Page 1</source> - <translation type="unfinished"/> + <translation>Side 1</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="37"/> <source>Text Field</source> - <translation type="unfinished"/> + <translation>Tekstfelt</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="42"/> <source>Press Me</source> - <translation type="unfinished"/> + <translation>Velg meg</translation> </message> </context> <context> @@ -4920,74 +4921,74 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Siste stopp ved 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% av snittdybde til 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20ft til overflaten</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Siste stopp ved 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% av snittdybde til 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m til overflaten</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>ft³/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5660,45 +5661,55 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="237"/> <source>Duration units</source> - <translation type="unfinished"/> + <translation>Enheter for varighet</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="243"/> <source>Show hours in duration</source> - <translation type="unfinished"/> + <translation>Vis timer i varighet</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="250"/> <source>hh:mm (always)</source> - <translation type="unfinished"/> + <translation>hh:mm (alltid)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="257"/> <source>mm (always)</source> - <translation type="unfinished"/> + <translation>mm (alltid)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="264"/> <source>mm (for dives shorter than 1 hour), hh:mm (otherwise)</source> - <translation type="unfinished"/> + <translation>mm (for dykk kortere enn 1 time), hh:mm (ellers)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation>Liste over dyk</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation>Vis enheter i liste over dyk</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>GPS-koordinater</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Stedsvisning</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>tradisjonell (dms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>desimal</translation> </message> @@ -5845,12 +5856,12 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Planned dive</source> - <translation type="unfinished"/> + <translation>Planlagt dyk</translation> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="780"/> <source>Manually added dive</source> - <translation type="unfinished"/> + <translation>Dykk lagt til manuelt</translation> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> @@ -5937,147 +5948,147 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Starter...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> - <translation type="unfinished"/> + <translation>Åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> - <translation type="unfinished"/> + <translation>Kunne ikke åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> - <translation type="unfinished"/> + <translation>%1 dykk hentet fra lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>jobber i ikke-sky-modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> - <translation type="unfinished"/> + <translation>Klarte ikke å lese fra lokalt lagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>ingen påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Legg in påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Epost og passord for skylager kan bare bestå av bokstaver, tall og '.', '-', '_', og '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> - <translation type="unfinished"/> + <translation>Feil format på epostadresse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Prøver å åpne skylagring med nye påloggingsdetaljer</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Tester påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>Skytjener svarte ikke ved validering av påloggingsdetaljer</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> - <translation type="unfinished"/> + <translation>Feil bruker/passord for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Får ikke koblet til skylagring - konto er ikke verifisert</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Påloggingsdetaljer for skyen er ugyldige</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kunne ikke åpne skylagring: Feil ved opprettelse av https-forbindelse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Kan ikke åpne skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Kan ikke koble til skylagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> - <translation type="unfinished"/> + <translation>Gyldig bruker/passord, henter dykk</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Feil i skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> - <translation type="unfinished"/> + <translation>Henter dykk fra lokalt lager ('ikke-sky-modus")</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Fikk ikke koblet til skylagring, skrur tilbake til lokal modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Tilkobling til skylagring OK. Ingen dykk i lista.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Ukjent GPS-posisjon</translation> </message> @@ -6323,32 +6334,32 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Undefined</source> - <translation type="unfinished"/> + <translation>Udefinert</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> <source>Incorrect username/password combination</source> - <translation type="unfinished"/> + <translation>Feil brukernavn/passord</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> <source>Credentials need to be verified</source> - <translation type="unfinished"/> + <translation>Bruker/passord må verifiseres</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> <source>Credentials verified</source> - <translation type="unfinished"/> + <translation>Bruker/passord verifisert</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>Ingen skymodus</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="30"/> <source>Cloud status</source> - <translation type="unfinished"/> + <translation>Skystatus</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="38"/> @@ -6358,12 +6369,12 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="44"/> <source>Not applicable</source> - <translation type="unfinished"/> + <translation>Ikke relevant</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="52"/> <source>Change</source> - <translation type="unfinished"/> + <translation>Endre</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="59"/> @@ -6385,24 +6396,24 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <location filename="../mobile-widgets/qml/Settings.qml" line="159"/> <location filename="../mobile-widgets/qml/Settings.qml" line="212"/> <source>regular text</source> - <translation type="unfinished"/> + <translation>vanlig tekst</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="122"/> <location filename="../mobile-widgets/qml/Settings.qml" line="174"/> <location filename="../mobile-widgets/qml/Settings.qml" line="227"/> <source>Highlight</source> - <translation type="unfinished"/> + <translation>Høydepunkter</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="145"/> <source>Pink</source> - <translation type="unfinished"/> + <translation>Rosa</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="197"/> <source>Dark</source> - <translation type="unfinished"/> + <translation>Mørkt</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="261"/> @@ -6427,7 +6438,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="322"/> <source>Save detailed log</source> - <translation type="unfinished"/> + <translation>Lagre detaljert logg</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="345"/> @@ -6437,7 +6448,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="354"/> <source>Display Developer menu</source> - <translation type="unfinished"/> + <translation>Vis utviklermeny</translation> </message> </context> <context> @@ -6509,33 +6520,34 @@ valgte dykk. </translation> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> <source>Image files (*.jpg *.jpeg)</source> - <translation type="unfinished"/> + <translation>Bildefiler (*.jpg *.jpeg)</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> <source>Selected dive date/time</source> - <translation type="unfinished"/> + <translation>Valgte dykkedato/-tid</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="393"/> <source>First selected dive date/time</source> - <translation type="unfinished"/> + <translation>Første valgte dykkedato/-tid</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="394"/> <source>Last selected dive date/time</source> - <translation type="unfinished"/> + <translation>Siste valgte dykkedato/-tid</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="396"/> <source> Files with inappropriate date/time</source> - <translation type="unfinished"/> + <translation> +Filer med upassende dykkedato/-tid</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="406"/> <source>No Exif date/time found</source> - <translation type="unfinished"/> + <translation>Ingen Exif-dato/-tid funnet</translation> </message> </context> <context> @@ -6651,7 +6663,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Liten</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> @@ -6723,7 +6735,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Liten</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/> @@ -6733,12 +6745,12 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/> <source>Big</source> - <translation type="unfinished"/> + <translation>Stor</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/> <source>The text to the right will be posted as the description with your dive profile graph to Facebook. The album name is required (the profile graph will be posted to that album).</source> - <translation type="unfinished"/> + <translation>Teksten til høyre vil bli postet til Facebook som beskrivelse sammen med dykkeprofilen. Albumnavnet er påkrevet (profilen vil bli postet til det albumet).</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="57"/> @@ -6793,7 +6805,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/> <source>Image Size</source> - <translation type="unfinished"/> + <translation>Bildestørrelse</translation> </message> </context> <context> @@ -6801,12 +6813,12 @@ Files with inappropriate date/time</source> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> - <translation type="unfinished"/> + <translation>For å bruke Subsurface-mobile med skylagring, skriv brukernavn og passord.<br/><br/>Hvis dette er første gang du bruker skylagring med Subsurface, skriv inn epostadresse (bare små bokstaver) og passord (bare bokstaver og tall).<br/><br/>For å bruke Subsurface-mobile uten skylagring, velg "ingen skylagring" over.</translation> </message> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> - <translation type="unfinished"/> + <translation>Takk for at du registrerte deg hos Subsurface. Vi sendte <b>%1</b> en PIN-kode for å fullføre registreringen. Hvis du ikke mottar en epost fra oss innen 15 minutter, dobbelt sjekk at du har skrevet epostadressen rett, og sjekk søppelpostmappa di.<br/><br/>Hvis du fremdeles har problemer, kontakt oss på brukerforumet vårt (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> </context> <context> @@ -7016,7 +7028,7 @@ Files with inappropriate date/time</source> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/> <source>d</source> - <translation type="unfinished"/> + <translation>d</translation> </message> </context> <context> @@ -7202,7 +7214,7 @@ fra luft og bruker: <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="133"/> <source>and</source> - <translation type="unfinished"/> + <translation>og</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="135"/> @@ -7450,107 +7462,120 @@ fra luft og bruker: <translation>(%1 vist)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Dybde(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>t</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Vekt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gass</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Bilder før/under/etter dykk</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Sted</translation> </message> @@ -8035,7 +8060,8 @@ Snitt</translation> <location filename="../core/profile.c" line="1364"/> <source>Density: %.1fg/ℓ </source> - <translation type="unfinished"/> + <translation>Tetthet: %.1fg/ℓ +</translation> </message> </context> <context> @@ -8294,17 +8320,18 @@ Snitt</translation> <location filename="../core/datatrak.c" line="513"/> <source>[Warning] Manual dive # %d </source> - <translation type="unfinished"/> + <translation>[Advarsel] Manuelt dykk # %d +</translation> </message> <message> <location filename="../core/datatrak.c" line="539"/> <source>[Error] Out of memory for dive %d. Abort parsing.</source> - <translation type="unfinished"/> + <translation>[Feil] Tomt for minne for dykk %d. Avslutter innlesing.</translation> </message> <message> <location filename="../core/datatrak.c" line="585"/> <source>[Error] File is not a DataTrak file. Aborted</source> - <translation type="unfinished"/> + <translation>[Feil] Loggen er ikke en DataTrak-fil. Avbryter.</translation> </message> <message> <location filename="../core/datatrak.c" line="598"/> @@ -8567,22 +8594,22 @@ Snitt</translation> <message> <location filename="../core/file.c" line="950"/> <source>No dive profile found from '%s'</source> - <translation type="unfinished"/> + <translation>Ingen dykkeprofil funnet i '%s'</translation> </message> <message> <location filename="../core/git-access.c" line="56"/> <source>Checkout from storage (%lu/%lu)</source> - <translation type="unfinished"/> + <translation>Henter ut fra lager (%lu/%lu)</translation> </message> <message> <location filename="../core/git-access.c" line="87"/> <source>Transfer from storage (%d/%d)</source> - <translation type="unfinished"/> + <translation>Henter fra lager (%d/%d)</translation> </message> <message> <location filename="../core/git-access.c" line="99"/> <source>Transfer to storage (%d/%d)</source> - <translation type="unfinished"/> + <translation>Laster opp til lager (%d/%d)</translation> </message> <message> <location filename="../core/git-access.c" line="135"/> @@ -8638,42 +8665,42 @@ Snitt</translation> <message> <location filename="../core/git-access.c" line="469"/> <source>Update local storage to match cloud storage</source> - <translation type="unfinished"/> + <translation>Oppdaterer lokalt lager til å matche skylager</translation> </message> <message> <location filename="../core/git-access.c" line="477"/> <source>Push local changes to cloud storage</source> - <translation type="unfinished"/> + <translation>Dytter lokale endringer til skyen</translation> </message> <message> <location filename="../core/git-access.c" line="495"/> <source>Try to merge local changes into cloud storage</source> - <translation type="unfinished"/> + <translation>Prøver å slå sammen lokale endringer til skylager</translation> </message> <message> <location filename="../core/git-access.c" line="537"/> <source>Store data into cloud storage</source> - <translation type="unfinished"/> + <translation>Lagrer data til skylager</translation> </message> <message> <location filename="../core/git-access.c" line="561"/> <source>Sync with cloud storage</source> - <translation type="unfinished"/> + <translation>Synkroniserer med skylager</translation> </message> <message> <location filename="../core/git-access.c" line="588"/> <source>Can't reach cloud server, working with local data</source> - <translation type="unfinished"/> + <translation>Kunne ikke nå skyserver, bruker isteden lokal data</translation> </message> <message> <location filename="../core/git-access.c" line="601"/> <source>Successful cloud connection, fetch remote</source> - <translation type="unfinished"/> + <translation>Koblet til skylager, henter data</translation> </message> <message> <location filename="../core/git-access.c" line="616"/> <source>Done syncing with cloud storage</source> - <translation type="unfinished"/> + <translation>Ferdig å synkroniserer med skylager</translation> </message> <message> <location filename="../core/git-access.c" line="752"/> @@ -8688,11 +8715,11 @@ Snitt</translation> <message> <location filename="../core/git-access.c" line="778"/> <source>Synchronising data file</source> - <translation type="unfinished"/> + <translation>Synkroniserer datafil</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>ukjent</translation> @@ -8851,7 +8878,7 @@ Snitt</translation> <message> <location filename="../core/libdivecomputer.c" line="805"/> <source>Already downloaded dive at %s</source> - <translation type="unfinished"/> + <translation>Ferdig å laste ned dykk på %s</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="939"/> @@ -8861,7 +8888,7 @@ Snitt</translation> <message> <location filename="../core/libdivecomputer.c" line="958"/> <source>model=%s firmware=%u serial=%u</source> - <translation type="unfinished"/> + <translation>model=%s firmware=%u serial=%u</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="1020"/> @@ -8893,16 +8920,18 @@ Snitt</translation> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> - <translation type="unfinished"/> + <translation>Kunne ikke åpne enhet %s %s (%s). +I de fleste tilfeller vil en logg fra libdivecomputer være nyttig for å feilsøke. +Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen.</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="1128"/> <source>No new dives downloaded from dive computer</source> - <translation type="unfinished"/> + <translation>Ingen dykk lastet ned fra dykkecomputer</translation> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>Flere GPS-posisjoner for dette steder; også %s @@ -8910,7 +8939,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>ytterligere navn for sted: %s @@ -8919,12 +8948,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/load-git.c" line="1703"/> <source>Load dives from local cache</source> - <translation type="unfinished"/> + <translation>Last inn dykk fra lokal cache</translation> </message> <message> <location filename="../core/load-git.c" line="1707"/> <source>Successfully opened dive data</source> - <translation type="unfinished"/> + <translation>Åpnet dykkelogg</translation> </message> <message> <location filename="../core/ostctools.c" line="93"/> @@ -8938,19 +8967,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Feil - %s - leser dykk %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Rar lesing av prosent %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Kunne ikke lese '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åpne stilark %s</translation> </message> @@ -9106,7 +9135,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/plannernotes.c" line="105"/> <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> + <translation>Kjøretid: %dmin VARIATIONS<br></div></translation> </message> <message> <location filename="../core/plannernotes.c" line="324"/> @@ -9151,7 +9180,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/plannernotes.c" line="421"/> <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> + <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gass</span> (basert på %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> </message> <message> <location filename="../core/plannernotes.c" line="432"/> @@ -9271,21 +9300,26 @@ D: %.1f%s <location filename="../core/profile.c" line="1325"/> <source>P: %d%s (%s) </source> - <translation type="unfinished"/> + <translation>P: %d%s (%s) +</translation> </message> <message> <location filename="../core/profile.c" line="1357"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> - <translation type="unfinished"/> + <translation>EAD: %d%s +EADD: %d%s / %.1fg/ℓ +</translation> </message> <message> <location filename="../core/profile.c" line="1361"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> - <translation type="unfinished"/> + <translation>END: %d%s +EADD: %d%s / %.1fg/ℓ +</translation> </message> <message> <location filename="../core/profile.c" line="1378"/> @@ -9503,7 +9537,7 @@ EADD: %d%s / %.1fg/ℓ <message> <location filename="../core/qthelper.cpp" line="965"/> <source>more than %1 days</source> - <translation type="unfinished"/> + <translation>mer enn %1 dager</translation> </message> <message> <location filename="../core/save-html.c" line="472"/> @@ -10284,22 +10318,22 @@ Er Uemis Zurich plugget i ordentlig?</translation> <message> <location filename="../core/save-git.c" line="985"/> <source>Start saving data</source> - <translation type="unfinished"/> + <translation>Lagrer data</translation> </message> <message> <location filename="../core/save-git.c" line="994"/> <source>Start saving dives</source> - <translation type="unfinished"/> + <translation>Lagrer dykk</translation> </message> <message> <location filename="../core/save-git.c" line="1027"/> <source>Done creating local cache</source> - <translation type="unfinished"/> + <translation>Opprettet lokal cache</translation> </message> <message> <location filename="../core/save-git.c" line="1258"/> <source>Preparing to save data</source> - <translation type="unfinished"/> + <translation>Forbereder lagring av data</translation> </message> </context> <context> @@ -10322,12 +10356,12 @@ Er Uemis Zurich plugget i ordentlig?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="133"/> <source>Dive management</source> - <translation type="unfinished"/> + <translation>Administrasjon av dyk</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="234"/> <source>Disable location service</source> - <translation type="unfinished"/> + <translation>Skru av lokasjonstjeneste</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="250"/> @@ -10342,12 +10376,12 @@ Er Uemis Zurich plugget i ordentlig?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="146"/> <source>Download from DC</source> - <translation type="unfinished"/> + <translation>Lastet ned fra DC</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="155"/> <source>Apply GPS Fixes</source> - <translation type="unfinished"/> + <translation>Legg til GPS-fiks</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="162"/> @@ -10367,7 +10401,7 @@ Er Uemis Zurich plugget i ordentlig?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="186"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> - <translation type="unfinished"/> + <translation>Ved å skru av automatisk skysynkronisering vil all data bli lagret lokalt. Dette kan være nyttig ved begrenset eller ingen nettverkstilgang. Velg "Manuell synk med skyen" hvis du har nettverkstilgang og ønsker å synke til skyen.</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="195"/> @@ -10427,7 +10461,7 @@ Er Uemis Zurich plugget i ordentlig?</translation> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/main.qml" line="28"/> <source>Hello World</source> - <translation type="unfinished"/> + <translation>Hei verden</translation> </message> </context> <context> @@ -10630,12 +10664,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> <source>Compute variations of plan (performance cost)</source> - <translation type="unfinished"/> + <translation>Regn ut variasjoner i planen (kan gå treigt)</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> <source>Display plan variations</source> - <translation type="unfinished"/> + <translation>Vis variasjoner i planen</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index ad1c16498..35cab0e92 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -2301,12 +2301,12 @@ GPS locatie:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Maak een nieuwe duikstek, door relevante informatie van de huidige duikstek te kopiëren. </translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Nieuwe duikstek aanmaken onder deze naam</translation> </message> @@ -3172,7 +3172,7 @@ GPS locatie:</translation> <message> <location filename="../desktop-widgets/diveshareexportdialog.ui" line="129"/> <source>Upload dive data</source> - <translation>Duikgegevens opladen</translation> + <translation>Upload duikgegevens</translation> </message> <message> <location filename="../desktop-widgets/diveshareexportdialog.ui" line="174"/> @@ -3191,142 +3191,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Waardering</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Diepte</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Pak</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Fles</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>Gasverbruik</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Foto's</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Locatie</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Diepte (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Gewicht (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>Gasverbruik (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Foto's voor/gedurende/na duik</translation> </message> @@ -3346,7 +3346,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="187"/> <source>failed to create zip file for upload: %s</source> - <translation>kan zip bestand voor opladen niet aanmaken: %s</translation> + <translation>kan zip bestand voor upload niet aanmaken: %s</translation> </message> <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/> @@ -3416,17 +3416,17 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> <source>Upload finished</source> - <translation>Opladen klaar</translation> + <translation>Upload klaar</translation> </message> <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> <source>Upload failed</source> - <translation>Opladen mislukt</translation> + <translation>Upload mislukt</translation> </message> <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> <source>Upload successful</source> - <translation>Opladen gelukt</translation> + <translation>Upload gelukt</translation> </message> <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> @@ -3929,27 +3929,27 @@ p, li { white-space: pre-wrap; } <translation>Coördinaten</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Omgekeerde geo locatie opzoeken</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Duikstekken op dezelfde positie</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Trefwoorden</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Land</translation> </message> @@ -3976,7 +3976,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Beheer duikstekken</translation> </message> @@ -3998,7 +3998,7 @@ p, li { white-space: pre-wrap; } Bent u zeker?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>U bent een duikstek aan het bewerken</translation> </message> @@ -4923,74 +4923,74 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Laatste stop op 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% gem. diepte tot 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20ft tot oppervlakte</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Laatste stop op 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% gem. diepte tot 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m tot oppervlakte</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5686,21 +5686,31 @@ Deze worden gebruikt "as-is". Dit is mogelijk niet wat u bedoeld. Zie </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation>Duiklijst tabel</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation>Toon eenheden in duiklijst tabel</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>GPS coördinaten</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Locatie tonen</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>traditioneel (dms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>decimaal</translation> </message> @@ -5738,7 +5748,7 @@ Deze worden gebruikt "as-is". Dit is mogelijk niet wat u bedoeld. Zie <message> <location filename="../desktop-widgets/printoptions.ui" line="41"/> <source>&Dive list print</source> - <translation>&Duik lijst print</translation> + <translation>&Duiklijst print</translation> </message> <message> <location filename="../desktop-widgets/printoptions.ui" line="57"/> @@ -5939,148 +5949,148 @@ Deze worden gebruikt "as-is". Dit is mogelijk niet wat u bedoeld. Zie <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation>Open lokale duikgegevens</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation>Open lokale duikgegevens mislukt</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 duiken geladen uit de lokale duikgegevens</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>werkt met lokale data</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation>Fout bij het verwerken van de lokale opslag, opgegeven</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>Geen cloud rechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Voer geldige cloud rechten in</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation>Ongeldig formaat voor e-mailadres</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Probeert cloud opslag te openen met nieuwe rechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Cloud rechten worden gecontroleerd</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>Geen antwoord van de cloud server bij het valideren van de inlogrechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation>Onjuiste cloud rechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Kan niet verbinden met de Subsurface cloud opslag - cloud account niet geverifieerd</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Cloud rechten zijn ongeldig</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kan cloud opslag niet openen: Fout bij aanmaken https verbinding</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Kan cloud opslag niet openen: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Kan niet verbinden met de Subsurface cloud opslag</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud rechten zijn geldig. duiken ophalen...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Cloud opslag fout: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Duiken laden uit de lokale opslag ('no cloud' mode)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation> Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud opslag succesvol geopend. Geen duiken in de duiklijst.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Onbekende GPS locatie</translation> </message> @@ -7453,107 +7463,120 @@ worden uit lucht en: <translation>(%1 getoond)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Waardering</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Diepte (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Fles</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Gewicht (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Pak</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>Gasverbruik (%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Foto's voor/gedurende/na duik</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Locatie</translation> </message> @@ -8698,7 +8721,7 @@ Maximum</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>onbekend</translation> @@ -8910,7 +8933,7 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>meedere GPS locaties voor deze duikstek; ook %s @@ -8918,7 +8941,7 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>extra naam voor duikstek: %s @@ -8946,19 +8969,19 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve <translation>Fout - %s - verwerking duik %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Vreemde percentage %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Fout bij analyse van '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Kan de stylesheet %s niet openen</translation> </message> @@ -10394,7 +10417,7 @@ Is de Uemis Zurich correct aangesloten?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="200"/> <source>Upload GPS data</source> - <translation>GPS data opladen</translation> + <translation>Upload GPS data</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="208"/> diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index 77fa9c9b2..92c0bd509 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -2296,12 +2296,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Utwórz nowe miejsce nurkowe, skopiuj istotne informacje z bieżącego nurkowania.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Utwórz nowe miejsce nurkowe z tą nazwą</translation> </message> @@ -3186,142 +3186,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>Nr</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Ocena</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Głębokość</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Balast</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Skafander</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Butla</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Zdjęcia</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Kraj</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Miejsce</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Głębokość(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Balast(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> @@ -3924,27 +3924,27 @@ p, li { white-space: pre-wrap; } <translation>Współrzędne</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Miejsca nurkowań z tymi samymi współrzędnymi </translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Tagi</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Kraj</translation> </message> @@ -3971,7 +3971,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Zarządzanie miejscami nurkowymi</translation> </message> @@ -3993,7 +3993,7 @@ p, li { white-space: pre-wrap; } Czy na pewno kontynuować?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Edytujesz miejsce nurkowania</translation> </message> @@ -4915,74 +4915,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Ostatni przystanek na gł. 20 stóp</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% śr. głębokości do 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20ft do powierzchni</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Ostatni przystanek na 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% śr. głębokości do 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m do powierzchni</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5677,21 +5677,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>Współrzędne GPS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Wyświetlanie współrzędnych</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>tradycyjne</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>dziesiętne</translation> </message> @@ -5930,147 +5940,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Adres email i hasło do przechowywania danych w chmurze może zawierać jedynie litery, cyfry oraz znaki '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -7444,107 +7454,120 @@ z powietrza przy użyciu: <translation> (%1 pokazane)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>Nr</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Ocena</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Głębokość(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Butla</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Balast(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Skafander</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Kraj</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Miejsce</translation> </message> @@ -8681,7 +8704,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>nieznana</translation> @@ -8891,7 +8914,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>jest kilka lokalizacji GPS dla tego miejsca; także %s @@ -8899,7 +8922,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>dodatkowa nazwa dla miejsca: %s @@ -8927,19 +8950,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Błąd - %s - przetwarzanie nurkowania %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Podejrzany skład procentowy %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Nie udało się przetworzyć '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Nie można otworzyć arkusza stylów %s</translation> </message> diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index e186bc7b8..906cfb5c6 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -2301,12 +2301,12 @@ Localização GPS:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -3187,142 +3187,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Roupa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Cilindro</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>CNS Máximo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Fotos</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> @@ -3924,27 +3924,27 @@ p, li { white-space: pre-wrap; } <translation>Coordenadas</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Rótulos</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation type="unfinished"/> </message> @@ -3971,7 +3971,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3992,7 +3992,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4913,74 +4913,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>pés/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Ultima parada em 20 pés</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Ultima parada em 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5675,21 +5675,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>Coordenadas do GPS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation type="unfinished"/> </message> @@ -5928,147 +5938,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -7433,107 +7443,120 @@ misturados com ar usando: <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Cilindro</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Roupa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Local</translation> </message> @@ -8672,7 +8695,7 @@ Médio</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>desconhecido</translation> @@ -8882,14 +8905,14 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8916,7 +8939,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Percentagem estranha na leitura %s @@ -8924,12 +8947,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Falha na análise de '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Falha na abertura da folha de estilo %s</translation> </message> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index b4ebe1634..abd810e6d 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -36,7 +36,7 @@ <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/> <source>Navigate Back</source> - <translation type="unfinished"/> + <translation>Regressar</translation> </message> </context> <context> @@ -359,7 +359,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> <source>Register</source> - <translation type="unfinished"/> + <translation>Registar</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> @@ -2301,12 +2301,12 @@ do GPS actual:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Criar um novo local de mergulho, copiando a informação relevante do mergulho actual.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Criar um novo local de mergulho com este nome</translation> </message> @@ -3191,142 +3191,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Fato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Garrafa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>Consumo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>CNS Máx</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Fotos</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>País</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Profundidade(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>pés</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>libras</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Fotos antes/durante/depois do mergulho</translation> </message> @@ -3929,27 +3929,27 @@ p, li { white-space: pre-wrap; } <translation>Coordenadas</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Busca geográfica inversa</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Locais de mergulho com as mesmas coordenadas</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Etiquetas</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>País</translation> </message> @@ -3976,7 +3976,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Gestão de locais de mergulho</translation> </message> @@ -3998,7 +3998,7 @@ p, li { white-space: pre-wrap; } Tem a certeza que quer continuar?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Está a editar um local de mergulho</translation> </message> @@ -4922,74 +4922,74 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Última paragem aos 20 ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% da profundidade média para 6 m/20 ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>6 m/20 ft para a superfície</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>pé</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Última paragem aos 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% da profundidade média para 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6 m para a superfície</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5686,21 +5686,31 @@ Ver: http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>Coordenadas GPS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Apresentação dos locais</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>tradicional (gms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>decimal</translation> </message> @@ -5939,147 +5949,147 @@ Ver: http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>A inicial...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation>Abrir ficheiro local com dados de mergulho</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation>Não foi possível abrir o ficheiro local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 mergulhos carregados a partir do ficheiro local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>A trabalhar em modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation>Erro na análise do armazenamento local, a cancelar</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>Não existem credenciais da nuvem</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Por favor insira credenciais de nuvem válidas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>O endereço de email e a palavra-chave para o armazenamento remoto apenas pode conter letras, números e '.', '-', '_', e '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation>Formato de endereço de correio electrónico inválido</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>A tentar abrir o armazenamento remoto com as novas credenciais</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>A testar as credenciais da nuvem</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>Não houve resposta do servidor remoto para validar as credenciais</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation>Credenciais remotas inválidas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Não foi possível ligar-se ao armazenamento remoto - conta remota não verificada</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>As credenciais são inválidas</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Não foi possível abrir o armazenamento remoto: erro ao criar a ligação HTTPS</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Não é possível abrir o armazenamento remoto: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Não é possível ligar-se com o armazenamento remoto</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation>Credenciais remotas válidas, a carregar os mergulhos...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Erro no armazenamento remoto: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>A carregar mergulhos do armazenamento local (modo 'no cloud')</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Falha na ligação ao servidor remoto. A passar para modo local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Armazenamento remoto aberto com sucesso. Não existem mergulhos na lista.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>seg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Localização GPS desconhecida</translation> </message> @@ -7452,107 +7462,120 @@ obtidos a partir do ar usando: <translation>(%1 mostrados)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Profundidade(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>pé</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Garrafa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>CNS Máx.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>libra</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Fato</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Fotos antes/durante/depois do mergulho</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>País</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Local</translation> </message> @@ -8697,7 +8720,7 @@ Média</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>desconhecido</translation> @@ -8909,7 +8932,7 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>várias posições GPS para este local; ver também %s @@ -8917,7 +8940,7 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>nome adicional para o local: %s @@ -8945,19 +8968,19 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo <translation>Erro - %s - ao analisar o mergulho %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Leitura estranha das percentagens %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Falha na análise de '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Não é possível abrir a folha de estilos %s</translation> </message> diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts index e03df9db4..6e6024d0f 100644 --- a/translations/subsurface_ro_RO.ts +++ b/translations/subsurface_ro_RO.ts @@ -2301,12 +2301,12 @@ GPS curenta:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Crearea unei noi locații de scufundare prin copierea informațiilor relevante din cea curentă.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Crearea unei noi locații de scufundare cu numele curent</translation> </message> @@ -3191,142 +3191,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Dată</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Adâncime</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Greutate</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Costum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Butelie</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>CNS maxim</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Fotografii</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Locație</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Adâncime(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Greutate(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Fotografii înainte/în timpul/după scufundare</translation> </message> @@ -3929,27 +3929,27 @@ p, li { white-space: pre-wrap; } <translation>Coordonate</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Căutare geo inversă</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Locații de scufundări cu aceleași coordonate</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Etichete</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation type="unfinished"/> </message> @@ -3976,7 +3976,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Administrarea locației pentru scufundare</translation> </message> @@ -3998,7 +3998,7 @@ p, li { white-space: pre-wrap; } Sigur doriți să continuați?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Sunteți in modul de editare a locației de scufundare</translation> </message> @@ -4922,74 +4922,74 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Ultima oprire la 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% adâncime medie până la 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20ft pană la suprafață</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Ultima oprire la 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% adâncime medie pană la 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m pană la suprafață</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>metri cubi/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>livre pe inch pătrat</translation> </message> @@ -5686,21 +5686,31 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>Coordonate GPS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Afișare Locație</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>tradițional (dms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>zecimal</translation> </message> @@ -5939,147 +5949,147 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Se incarcă...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation>Deschide fișier local cu scufundări</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation>Eroare deschidere fișier cu scufundări local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 scufundări încărcate din fișier local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>operare în mod local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-mailul și parola de cloud pot conține doar litere, numere și '.', '-', '_', și '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Locatie GPS necunoscuta</translation> </message> @@ -7449,107 +7459,120 @@ mixate cu aer și folosite:</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Dată</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Adâncime(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Butelie</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Greutate(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Costum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Fotografii înainte/în timpul/după scufundare</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Locație</translation> </message> @@ -8691,7 +8714,7 @@ Medie</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>necunoscut</translation> @@ -8901,14 +8924,14 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8935,19 +8958,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Valoare procentuală neobișnuită %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Nu s-a putut parsa '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Nu s-a putut deschide stylesheet-ul %s</translation> </message> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index d6a05a963..dd8b02a39 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -2301,12 +2301,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Создать новый дайв-сайт, заполнив данными из текущего погружения.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Создать дайв-сайт с этим наванием</translation> </message> @@ -3191,142 +3191,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Темп.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Баллон</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Смесь</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Фотографии</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Страна</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Глубина(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Темп.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Вес(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Фото до/во время/после погружения</translation> </message> @@ -3929,27 +3929,27 @@ p, li { white-space: pre-wrap; } <translation>Координаты</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Обратный геопоиск</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Дайв-сайты с такими же координатами</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Страна</translation> </message> @@ -3976,7 +3976,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Управление дайв-сайтами</translation> </message> @@ -3998,7 +3998,7 @@ p, li { white-space: pre-wrap; } Вы желаете продолжить?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Редактирование дайв-сайта</translation> </message> @@ -4922,74 +4922,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Последняя остановка на 20фт</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% ср. глубины - 20фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20фут - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Последняя остановка на 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% ср. глубины - 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6м - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>куб.фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5686,21 +5686,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>Координаты GPS</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Отображение координат</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>обычное (гмс)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>десятичное</translation> </message> @@ -5939,147 +5949,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Адрес почты и пароль для могут содержать только буквы, цифры и '.', '-', '_', и '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Попытка открыть облачное хранилище с новыми учетными данными</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Проверка учетных данных</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>Нет ответа от сервера в облаке чтобы проверить учетные данные</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Невозможно подключиться к облачному хранилищу - учетная запись не проверена</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Учетные данные неверны</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Невозможно открыть облачное хранилище: Ошибка защищенного подключения</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Невозможно открыть облачное хранилище: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Невозможно подключиться к облачному хранилищу</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> @@ -7452,107 +7462,120 @@ mixed from Air and using: <translation> (показано %1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Глубина(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Темп.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Баллон</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>ч</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>мин</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Вес(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Смесь</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Фото до/во время/после погружения</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Страна</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -8695,7 +8718,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>неизвестно</translation> @@ -8905,7 +8928,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>множественные GPS координаты для дайв-сайта, также %s @@ -8913,7 +8936,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>другое название дайв-сайта: %s @@ -8941,19 +8964,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Ошибка %s в погружении %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Странное значение процентов %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Ошибка разбора '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index 7f5b6b895..e77aa3415 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -2296,12 +2296,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -3182,142 +3182,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Hodnotenie</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Hĺbka</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Hmotnosť</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Fľaša</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Zmes</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>Spotreba plynu</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Fotografie</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Miesto</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Hĺbka(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Záťaž(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> @@ -3920,27 +3920,27 @@ p, li { white-space: pre-wrap; } <translation>Súradnice</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Značky</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation type="unfinished"/> </message> @@ -3967,7 +3967,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3988,7 +3988,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4909,74 +4909,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Posledná zastávka v 20 stopách</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% priemernej hĺbky do 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20ft na hladinu</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Posledná zastávka v 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% priemernej hĺbky do 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m na povrch</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5671,21 +5671,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>GPS súradnice</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation type="unfinished"/> </message> @@ -5924,147 +5934,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -7429,107 +7439,120 @@ vytvorene zo vzduchu a: <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Hodnotenie</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Hĺbka(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Fľaša</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Záťaž(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Zmes</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Miesto</translation> </message> @@ -8665,7 +8688,7 @@ Maximum</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>neznámy</translation> @@ -8875,14 +8898,14 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8909,19 +8932,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Zvláštne percenta v %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Chyba pri spracovaní '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Neviem otvoriť šablónu %s</translation> </message> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index 34c97c6e3..bb741d53d 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -2301,12 +2301,12 @@ GPS position:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Skapa en ny dykplats, kopiera relevant information från detta dyk.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Skapa en ny dykplats med detta namn</translation> </message> @@ -3191,142 +3191,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Rankning</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Djup</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Vikt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Dräkt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Flaska</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Bilder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Plats</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Ljup(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Vikt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Foton före/under/efter dyket</translation> </message> @@ -3929,27 +3929,27 @@ p, li { white-space: pre-wrap; } <translation>Koordinater</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Revers geouppslag</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Dykplatser vid samma koordinater</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Taggar</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Land</translation> </message> @@ -3976,7 +3976,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Dykplats administration</translation> </message> @@ -3998,7 +3998,7 @@ p, li { white-space: pre-wrap; } Är du säker att du vill fortsätta?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>Du redigerar en dykplats</translation> </message> @@ -4922,74 +4922,74 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Sista stoppet på 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% av snittdjup till 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20ft till ytan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Sista stoppet på 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% av snittdjup till 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m till ytan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5686,21 +5686,31 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>GPS kordinater</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Platsvisning</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>traditionell (dms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>decimal</translation> </message> @@ -5939,147 +5949,147 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Startar...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>Arbetar i molnfritt läge</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>inga moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Vänligen ange giltiga moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Molnlagrings email och lösenord kan bara beså av bokstäver, siffror samt '.', '-', '_' och '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Försöker öppna moln lagring med nya referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Testar moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>Inget svar från molnservern för verifiering av referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Kan inte ansluta till moln lagring - molnkonto inte verifierat</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Moln referenser är ogiltiga</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kan inte öppna moln lagring: Gick inte skapa https koppling</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Kan inte öppna molnlagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Kan inte ansluta till moln lagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Molnlagrings fel: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Misslyckades ansluta till moln server, återgår till molnfri status</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Molnlagring öppnades framgångsrikt. Inga dyk i dyklistan</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>Min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Okänd GPS position</translation> </message> @@ -7452,107 +7462,120 @@ mixas av luft och: <translation>(%1 visad)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Rankning</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Ljup(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Flaska</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>Min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Vikt(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Dräkt</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Foton före/under/efter dyket</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Land</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Plats</translation> </message> @@ -8691,7 +8714,7 @@ Medel</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>okänd</translation> @@ -8901,7 +8924,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>multipla GPS positioner för denna dykplats; även %s @@ -8909,7 +8932,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>alternativt namn för platsen: %s @@ -8937,19 +8960,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Fel - %s - vid läsning av dyk %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Konstig procent läsning %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Kunde inte läsa '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Kunde inte öppna formatmall %s</translation> </message> diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts index a3de6ede5..2a5f468c6 100644 --- a/translations/subsurface_tr.ts +++ b/translations/subsurface_tr.ts @@ -2294,12 +2294,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -3180,142 +3180,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Tarih</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Değerlendirme</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Derinlik</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Ağırlık</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OZB</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Azami MSS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Fotoğraflar</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Konum</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>libre</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> @@ -3917,27 +3917,27 @@ p, li { white-space: pre-wrap; } <translation>Koordinatlar</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Etiketler</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation type="unfinished"/> </message> @@ -3964,7 +3964,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3985,7 +3985,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4906,74 +4906,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>fit/dak</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>20 fit son durak</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>Yüzeye 20 fit</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/dak</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>6m son durak</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>yüzeye 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5668,21 +5668,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>GPS koordinatları</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation type="unfinished"/> </message> @@ -5921,147 +5931,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>dak</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -7427,107 +7437,120 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Tarih</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Değerlendirme</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>dak</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>libre</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OZB</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Konum</translation> </message> @@ -8668,7 +8691,7 @@ Ortalama</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>bilinmeyen</translation> @@ -8878,14 +8901,14 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8912,18 +8935,18 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index e1ba62e63..2fc699299 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -2294,12 +2294,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -3180,142 +3180,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Xilan</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Địa điểm</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/nhỏ nhất</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> @@ -3916,27 +3916,27 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation type="unfinished"/> </message> @@ -3963,7 +3963,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3984,7 +3984,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4905,74 +4905,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5667,21 +5667,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> - <source>GPS coordinates</source> + <source>Dive list table</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> + <source>GPS coordinates</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation type="unfinished"/> </message> @@ -5920,147 +5930,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -7423,107 +7433,120 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Xilan</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>CNS tối đa</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>nhỏ nhất</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/nhỏ nhất</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Địa điểm</translation> </message> @@ -8651,7 +8674,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>chưa rõ</translation> @@ -8861,14 +8884,14 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8895,19 +8918,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Đang đọc tỉ lệ lạ %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Thất bại khi chuyển thông số '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index 353cdd755..f3596e52b 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -2301,12 +2301,12 @@ GPS位置:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>建立新的潛點, 從潛水紀錄複製相關資訊. </translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>以此名稱建立新的潛點</translation> </message> @@ -3191,142 +3191,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>日期</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>評分</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>深度</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>重量</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>防寒衣</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>溫度</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>氣瓶</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>氣體</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>耗氣率</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>最大 CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>照片</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>國家</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>位置</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>深度(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>溫度 (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>重量(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>潛水前/中/後的照片</translation> </message> @@ -3929,27 +3929,27 @@ p, li { white-space: pre-wrap; } <translation>座標</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>反向座標位置搜尋</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>相同位置的潛點</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>標籤</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>國家</translation> </message> @@ -3976,7 +3976,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>潛點管理</translation> </message> @@ -3998,7 +3998,7 @@ p, li { white-space: pre-wrap; } 請注意是否要繼續? </translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>您正在編輯潛點</translation> </message> @@ -4922,74 +4922,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>上一次在20英呎停留</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>水面下 20 英尺</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% avg. depth to 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>水面下 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5686,21 +5686,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>GPS座標</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>位置顯示</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>傳統的 (dms)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>十進制</translation> </message> @@ -5939,147 +5949,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>開始...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation>開啟本機端潛水資料檔</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation>開啟本機端檔案失敗</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 潛水記錄載入自本機端潛水資料檔案</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>於非雲端模式工作</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation>本機端解析錯誤, 中斷</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>無雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>請輸入合法的雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>雲端裝置 email 與密碼只接受使用字母, 數字, 與 '.', '-', '_', 和 '+'. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Attempting to open cloud storage with new credentials</source> <translation>嘗試使用新的憑證開啟雲端儲存</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>測試雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <source>No response from cloud server to validate the credentials</source> <translation>雲端伺服器認證憑證無回應</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>無法連結雲端儲存 - 未認證的帳號</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>不合法的雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>無法開啟雲端儲存: 建立 https 連線錯誤</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>無法開啟雲端儲存: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>無法連結雲端儲存</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation>雲端認證成功, 載入日誌</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>雲端儲存錯誤: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>從本機端載入日誌 (本機模式)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>連結雲端伺服器失敗, 返回非雲端狀態</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>成功開啟雲端儲存. 列表無潛水記錄. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>未知的GPS位置</translation> </message> @@ -7453,107 +7463,120 @@ mixed from Air and using: <translation>(%1 顯示)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>日期</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>評分</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>深度(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>溫度 (%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>氣瓶</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>最大 CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>重量(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>防寒衣</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>氣體</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>潛水前/中/後的照片</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>國家</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>位置</translation> </message> @@ -8698,7 +8721,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>未知</translation> @@ -8908,7 +8931,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>此潛點有複數個 GPS位置; 並 %s @@ -8916,7 +8939,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>潛點別名: %s @@ -8944,19 +8967,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>錯誤 - %s - 解析潛水 %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>有問題的讀取比例 %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>無法解析訊息 '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>無法開啟樣式 %s</translation> </message> |