diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-07-24 13:47:56 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-07-24 13:47:56 -0700 |
| commit | aa28a16946408bd1381ed4952474cd18d9b229d9 (patch) | |
| tree | 3875344ad36a38e310a740608bca6ce0a1e48466 /translations | |
| parent | 796d0a98f9f25127bc3ca6d9adeca7d74c21fe09 (diff) | |
| download | subsurface-aa28a16946408bd1381ed4952474cd18d9b229d9.tar.gz | |
Latest translations
As always, I am not the author (except for the German translation)
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations')
| -rw-r--r-- | translations/subsurface_bg_BG.ts | 721 | ||||
| -rw-r--r-- | translations/subsurface_de_DE.ts | 711 | ||||
| -rw-r--r-- | translations/subsurface_en_GB.ts | 721 | ||||
| -rw-r--r-- | translations/subsurface_fr_FR.ts | 1091 | ||||
| -rw-r--r-- | translations/subsurface_hr_HR.ts | 709 | ||||
| -rw-r--r-- | translations/subsurface_id.ts | 709 | ||||
| -rw-r--r-- | translations/subsurface_pl_PL.ts | 721 | ||||
| -rw-r--r-- | translations/subsurface_pt_PT.ts | 823 | ||||
| -rw-r--r-- | translations/subsurface_sv_SE.ts | 711 | ||||
| -rw-r--r-- | translations/subsurface_vi.ts | 765 |
10 files changed, 3930 insertions, 3752 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index 66aa02a2a..fe9e07c72 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -104,18 +104,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="107"/> <source>Bailing out to OC</source> <translation>Връщане към OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="103"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="109"/> <source> begin</source> <comment>Starts with space!</comment> <translation> начало</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="104"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="110"/> <source> end</source> <comment>Starts with space!</comment> <translation> край</translation> @@ -137,87 +137,87 @@ <translation>Покажи Търсене</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="705"/> + <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>Expand all</source> <translation>Разшири всички</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="706"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>Collapse all</source> <translation>Свиване на всички</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="707"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>Collapse others</source> <translation>Свиване на други</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="709"/> + <location filename="../qt-ui/divelistview.cpp" line="711"/> <source>Remove dive(s) from trip</source> <translation>Изтрий гмуркане (гмуркания) от пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="712"/> <source>Create new trip above</source> <translation>Създай ново пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>Add dive(s) to trip immediately above</source> <translation>Добави гмуркане (гмуркания) веднага над пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="726"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>Add dive(s) to trip immediately below</source> <translation>Добави гмуркане(гмуркания) веднага под пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>Merge trip with trip above</source> <translation>Слей пътуване с горно пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="731"/> + <location filename="../qt-ui/divelistview.cpp" line="733"/> <source>Merge trip with trip below</source> <translation>Слей пътуване с долно пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="737"/> <source>Delete dive(s)</source> <translation>Изтрий гмуркане (гмуркания)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="737"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>Mark dive(s) invalid</source> <translation>Маркирай гмуркания (гмуркане) като невалидни</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="741"/> + <location filename="../qt-ui/divelistview.cpp" line="743"/> <source>Merge selected dives</source> <translation>Слей избраните гмуркания</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="745"/> <source>Renumber dive(s)</source> <translation>Преномерирай гмуркане (гмуркания)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="746"/> <source>Shift times</source> <translation>Измести времена</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="747"/> <source>Load images</source> <translation>Зареди изображения</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Open image files</source> <translation>Отвори изображения</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -225,59 +225,59 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="30"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="35"/> <source>Export format</source> <translation>Експорт формат</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="42"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="47"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="61"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="66"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="74"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="79"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="84"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="89"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="94"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="99"/> <source>Worldmap</source> <translation>Световна карта</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="112"/> <source>Selection</source> <translation>Селекция</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="116"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="121"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="208"/> <source>Selected dives</source> <translation>Избрани гмуркания</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="126"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="131"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="234"/> <source>All dives</source> <translation>Всички гмуркания</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="178"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="183"/> <source>HTML</source> <translation>HTML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="216"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="221"/> <source>Minimum Javascript</source> <translation>Минимален Javascript</translation> </message> @@ -287,87 +287,87 @@ <translation>Експортирай гмуркания</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="24"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="29"/> <source>General export</source> <translation>Общ експорт</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="184"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>General settings</source> <translation>Общи настройки</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="190"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="195"/> <source>Subsurface numbers</source> <translation>Subsurface числа</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="239"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export list only</source> <translation>Експортирай само списъка</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="252"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="257"/> <source>Style options</source> <translation>Стилови настройки</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="264"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="269"/> <source>Font</source> <translation>Шрифт</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="274"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="279"/> <source>Font size</source> <translation>Големина на шрифта</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="285"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="320"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="323"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="328"/> <source>Theme</source> <translation>Тема</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> <source>Light</source> <translation>Светла</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Sand</source> <translation>Пясък</translation> </message> @@ -628,42 +628,42 @@ <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="137"/> + <location filename="../qt-ui/diveplanner.cpp" line="135"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="622"/> + <location filename="../qt-ui/diveplanner.cpp" line="634"/> <source>Final depth</source> <translation>Финална дълбочина</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="624"/> + <location filename="../qt-ui/diveplanner.cpp" line="636"/> <source>Run time</source> <translation>Teчащо време</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="626"/> + <location filename="../qt-ui/diveplanner.cpp" line="638"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="628"/> + <location filename="../qt-ui/diveplanner.cpp" line="640"/> <source>Used gas</source> <translation>Използван газ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="630"/> + <location filename="../qt-ui/diveplanner.cpp" line="642"/> <source>CC set point</source> <translation>CC поставена точка</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="925"/> + <location filename="../qt-ui/diveplanner.cpp" line="938"/> <source>Discard the plan?</source> <translation>Изтрий плана?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="926"/> + <location filename="../qt-ui/diveplanner.cpp" line="939"/> <source>You are about to discard your plan.</source> <translation>Вие ще изтриете плана.</translation> </message> @@ -671,17 +671,17 @@ <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="255"/> + <location filename="../qt-ui/diveplanner.cpp" line="254"/> <source>Dive planner points</source> <translation>Точки в гмуркачески плановик</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="259"/> + <location filename="../qt-ui/diveplanner.cpp" line="258"/> <source>Available gases</source> <translation>Достъпни газове</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="282"/> + <location filename="../qt-ui/diveplanner.cpp" line="281"/> <source>Add dive data point</source> <translation>Добави точка в гмуркането</translation> </message> @@ -855,70 +855,70 @@ <translation>вътрешна грешка</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="636"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="832"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="637"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> <source>Done</source> <translation>Готово</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="667"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="668"/> <source>Uploading dive list...</source> <translation>Обновяване на списъка от гмуркания...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="698"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="699"/> <source>Downloading dive list...</source> <translation>Изтегляне на списък от гмуркания...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="747"/> <source>Downloading %1 dives...</source> <translation>Изтегляне на %1 гмуркания...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="790"/> <source>Download finished - %1</source> <translation>Изтеглянето приключи - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> <source>Corrupted download</source> <translation>Неправилно изтегляне</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> <source>The archive could not be opened: %1</source> <translation>Архива не може да бъде отворен: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/> <source>Upload failed</source> <translation>Грешка при качването</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="850"/> <source>Upload successful</source> <translation>Успешно качване</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="853"/> <source>Login failed</source> <translation>Грешка при логин</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="855"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/> <source>Cannot parse response</source> <translation>Не може да бъде направен разбор на отговора</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="867"/> <source>Error: %1</source> <translation>Грешка: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="834"/> <source>Upload finished</source> <translation>Качването приключи</translation> </message> @@ -1050,7 +1050,7 @@ <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="450"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -1091,27 +1091,27 @@ </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="415"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Dive notes</source> <translation>Бележки</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="607"/> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="245"/> <source>Air temp.</source> <translation>Темп. на въздух</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="626"/> - <location filename="../qt-ui/maintab.cpp" line="245"/> + <location filename="../qt-ui/maintab.cpp" line="246"/> <source>Water temp.</source> <translation>Темп. на водата</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="440"/> + <location filename="../qt-ui/maintab.cpp" line="451"/> <source>Notes</source> <translation>Бележки</translation> </message> @@ -1228,114 +1228,116 @@ <translation>Снимки</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="88"/> + <location filename="../qt-ui/maintab.cpp" line="89"/> <source>Cylinders</source> <translation>Бутилки</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="89"/> + <location filename="../qt-ui/maintab.cpp" line="90"/> <source>Add Cylinder</source> <translation>Добави бутилка</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="93"/> <source>Weights</source> <translation>Тежести</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="93"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Add Weight System</source> <translation>Добави система за тежест</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="48"/> + <location filename="../qt-ui/maintab.cpp" line="49"/> <source>Save</source> <translation>Запиши</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="52"/> + <location filename="../qt-ui/maintab.cpp" line="53"/> <source>Cancel</source> <translation>Отмяна</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="241"/> + <location filename="../qt-ui/maintab.cpp" line="242"/> <source>Air temp. [%1]</source> <translation>Tемп. на въздуха [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="242"/> + <location filename="../qt-ui/maintab.cpp" line="243"/> <source>Water temp. [%1]</source> <translation>Темп. на водата [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="277"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>This trip is being edited.</source> <translation>Това пътуване се редактира.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="284"/> + <location filename="../qt-ui/maintab.cpp" line="285"/> <source>Multiple dives are being edited.</source> <translation>Редактира се повече от едно гмуркане.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="286"/> + <location filename="../qt-ui/maintab.cpp" line="287"/> <source>This dive is being edited.</source> <translation>Това гмуркане се редактира.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="386"/> - <location filename="../qt-ui/maintab.cpp" line="410"/> + <location filename="../qt-ui/maintab.cpp" line="397"/> + <location filename="../qt-ui/maintab.cpp" line="421"/> <source>Trip notes</source> <translation>Бележки за пътуване</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="408"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> <source>Trip location</source> <translation>Местонахождение на пътуване</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="461"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> - <location filename="../qt-ui/maintab.cpp" line="502"/> - <location filename="../qt-ui/maintab.cpp" line="503"/> - <location filename="../qt-ui/maintab.cpp" line="504"/> + <location filename="../qt-ui/maintab.cpp" line="472"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> + <location filename="../qt-ui/maintab.cpp" line="513"/> + <location filename="../qt-ui/maintab.cpp" line="514"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> <source>/min</source> <translation>/м</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="463"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="500"/> + <location filename="../qt-ui/maintab.cpp" line="511"/> <source>Deepest dive</source> <translation>Най-дълбоко гмуркане</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="501"/> + <location filename="../qt-ui/maintab.cpp" line="512"/> <source>Shallowest dive</source> <translation>Най-плитко гмуркане</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="556"/> <source>These gases could be mixed from Air and using: </source> - <translation type="unfinished"/> + <translation>Тези газове могат да бъдат +съставени от въздух и: +</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="549"/> + <location filename="../qt-ui/maintab.cpp" line="560"/> <source> and </source> - <translation type="unfinished"/> + <translation>и</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="797"/> + <location filename="../qt-ui/maintab.cpp" line="808"/> <source>Discard the changes?</source> <translation>Изтрий промените?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="798"/> + <location filename="../qt-ui/maintab.cpp" line="809"/> <source>You are about to discard your changes.</source> <translation>Вие ще изтриете промените.</translation> </message> @@ -1687,12 +1689,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="446"/> <source>Toggle pO₂ Graph</source> - <translation type="unfinished"/> + <translation>Превключи pО₂ диаграма</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="475"/> <source>Toggle pN₂ Graph</source> - <translation type="unfinished"/> + <translation>Превключи pN₂ диаграма</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="821"/> @@ -1815,70 +1817,70 @@ p, li { white-space: pre-wrap; } <translation>Моля запишете или отменете текущата редакция на гмуркане преди да добавите гмуркане.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="421"/> + <location filename="../qt-ui/mainwindow.cpp" line="422"/> <source>Print runtime table</source> <translation>Напечатай рунтайм таблица</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="516"/> + <location filename="../qt-ui/mainwindow.cpp" line="522"/> <source>Yearly statistics</source> <translation>Годишни статистики</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="701"/> + <location filename="../qt-ui/mainwindow.cpp" line="707"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Желаете ли да запишете промените във файла %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="703"/> + <location filename="../qt-ui/mainwindow.cpp" line="709"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Желаете ли да запишете промените във файла с данни?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="708"/> + <location filename="../qt-ui/mainwindow.cpp" line="714"/> <source>Save changes?</source> <translation>Запиши промените?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1066"/> + <location filename="../qt-ui/mainwindow.cpp" line="1072"/> <source>Save file as</source> <translation>Запиши файла като</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1190"/> + <location filename="../qt-ui/mainwindow.cpp" line="1196"/> <source>Open dive log file</source> <translation>Отвори регистър файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1191"/> + <location filename="../qt-ui/mainwindow.cpp" line="1197"/> <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source> <translation>Регистър файлове (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Files (*.xml);;UDDF/UDCF Files(*.uddf *.udcf);;JDiveLog Files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="709"/> + <location filename="../qt-ui/mainwindow.cpp" line="715"/> <source>Changes will be lost if you don't save them.</source> <translation>Промените ще бъдат изгубени ако не ги запишете.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="251"/> <location filename="../qt-ui/mainwindow.cpp" line="390"/> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="188"/> - <location filename="../qt-ui/mainwindow.cpp" line="1050"/> + <location filename="../qt-ui/mainwindow.cpp" line="1056"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Моля запишете или отменете текущата редакция на гмуркане преди да отворите нов файл.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1067"/> + <location filename="../qt-ui/mainwindow.cpp" line="1073"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation> </message> @@ -1886,15 +1888,45 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="444"/> + <location filename="../qt-ui/diveplanner.cpp" line="450"/> + <source>ft/min</source> + <translation>фута/мин</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="451"/> <source>Last stop at 20ft</source> <translation>Последен стоп на 20фута</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="451"/> + <location filename="../qt-ui/diveplanner.cpp" line="452"/> + <source>50% avg. depth to 20ft</source> + <translation>50% средна дълбочина до 20фута</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="453"/> + <source>20ft to surface</source> + <translation>20фута то повърхността</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="455"/> + <source>m/min</source> + <translation>м/мин</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="456"/> <source>Last stop at 6m</source> <translation>Последен стоп на 6 метра</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="457"/> + <source>50% avg. depth to 6m</source> + <translation>50% средна дълбочина до 6м</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="458"/> + <source>6m to surface</source> + <translation>6м до повърхността</translation> + </message> </context> <context> <name>PreferencesDialog</name> @@ -1940,146 +1972,151 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/preferences.ui" line="198"/> + <source>Use default</source> + <translation>По подразбиране</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="247"/> + <location filename="../qt-ui/preferences.ui" line="257"/> <source>Animations</source> <translation>Анимации</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="253"/> + <location filename="../qt-ui/preferences.ui" line="263"/> <source>Speed</source> <translation>Скорост</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Clear all settings</source> <translation>Изтрий всички настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="312"/> + <location filename="../qt-ui/preferences.ui" line="322"/> <source>Reset all settings to their default value</source> <translation>Върни всики настройки по подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="341"/> + <location filename="../qt-ui/preferences.ui" line="351"/> <source>System</source> <translation>Състема</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="348"/> + <location filename="../qt-ui/preferences.ui" line="358"/> <source>Metric</source> <translation>Метрична</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="358"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Imperial</source> <translation>Империална</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="368"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Personalize</source> <translation>Настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="392"/> + <location filename="../qt-ui/preferences.ui" line="402"/> <source>Depth</source> <translation>Дълбочина</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="399"/> + <location filename="../qt-ui/preferences.ui" line="409"/> <source>meter</source> <translation>метър</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="409"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>feet</source> <translation>фута</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="426"/> + <location filename="../qt-ui/preferences.ui" line="436"/> <source>bar</source> <translation>бара</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="436"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="453"/> + <location filename="../qt-ui/preferences.ui" line="463"/> <source>liter</source> <translation>литра</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="463"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>cu ft</source> <translation>кб. фут</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="490"/> <source>celsius</source> <translation>целзии</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="490"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>fahrenheit</source> <translation>фаренхайт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="507"/> + <location filename="../qt-ui/preferences.ui" line="517"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="772"/> + <location filename="../qt-ui/preferences.ui" line="782"/> <source>System default</source> <translation>По подразбиране на системата</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="811"/> + <location filename="../qt-ui/preferences.ui" line="821"/> <source>Proxy</source> <translation>Прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="817"/> + <location filename="../qt-ui/preferences.ui" line="827"/> <source>Proxy type</source> <translation>Прокси тип</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="830"/> + <location filename="../qt-ui/preferences.ui" line="840"/> <source>Host</source> <translation>Хост</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="856"/> + <location filename="../qt-ui/preferences.ui" line="866"/> <source>Port</source> <translation>Порт</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="882"/> + <location filename="../qt-ui/preferences.ui" line="892"/> <source>Requires authentication</source> <translation>Изисква автентификация</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="912"/> <source>Username</source> <translation>Потребителско име</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="925"/> + <location filename="../qt-ui/preferences.ui" line="935"/> <source>Password</source> <translation>Парола</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="802"/> <source>Filter</source> <translation>Филтър</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="419"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>Pressure</source> <translation>Налягане</translation> </message> @@ -2094,82 +2131,82 @@ p, li { white-space: pre-wrap; } <translation>Файл по подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="207"/> + <location filename="../qt-ui/preferences.ui" line="217"/> <source>Display invalid</source> <translation>Невалиден дисплей</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="224"/> + <location filename="../qt-ui/preferences.ui" line="234"/> <source>Default cylinder</source> <translation>Бутилка по подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="230"/> + <location filename="../qt-ui/preferences.ui" line="240"/> <source>Use default cylinder</source> <translation>Използвай бутилка по подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="280"/> + <location filename="../qt-ui/preferences.ui" line="290"/> <source>Subsurface web service</source> <translation>Subsurface уеб услуга</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="286"/> + <location filename="../qt-ui/preferences.ui" line="296"/> <source>Default user ID</source> <translation>Потребителски ID по подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Save user ID locally?</source> <translation>Запази потребителски ID локално</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="446"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>Volume</source> <translation>Обем</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="473"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>Temperature</source> <translation>Температура:</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="500"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>Weight</source> <translation>Тежест</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="517"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="532"/> + <location filename="../qt-ui/preferences.ui" line="542"/> <source>Time units</source> <translation>Единици за време</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="545"/> + <location filename="../qt-ui/preferences.ui" line="555"/> <source>Minutes</source> <translation>Минути</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="555"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Seconds</source> <translation>Секунди</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="587"/> + <location filename="../qt-ui/preferences.ui" line="597"/> <source>Show</source> <translation>Покажи</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="756"/> + <location filename="../qt-ui/preferences.ui" line="766"/> <source>GFLow at max depth</source> <translation>GFLow на макс. дълбочина</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="716"/> + <location filename="../qt-ui/preferences.ui" line="726"/> <source>Misc</source> <translation>Общи</translation> </message> @@ -2179,52 +2216,52 @@ p, li { white-space: pre-wrap; } <translation>Настройки</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="538"/> + <location filename="../qt-ui/preferences.ui" line="548"/> <source>Ascent/descent speed denominator</source> <translation>Знаменател за скорост на изкачване/спускане</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="598"/> + <location filename="../qt-ui/preferences.ui" line="608"/> <source>Threshold when showing pO₂</source> <translation>Праг при показване на pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="619"/> + <location filename="../qt-ui/preferences.ui" line="629"/> <source>Threshold when showing pN₂</source> <translation>Праг при показване на pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="640"/> + <location filename="../qt-ui/preferences.ui" line="650"/> <source>Threshold when showing pHe</source> <translation>Праг при показване на pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="661"/> + <location filename="../qt-ui/preferences.ui" line="671"/> <source>Max pO₂ when showing MOD</source> <translation>Макс. pO₂ при показване на MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="682"/> + <location filename="../qt-ui/preferences.ui" line="692"/> <source>Draw dive computer reported ceiling red</source> <translation>Покажи таван на гмуркачески компютър в червено</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="693"/> + <location filename="../qt-ui/preferences.ui" line="703"/> <source>Show unused cylinders in Equipment tab</source> <translation>Покажи неизползвани бутилки в екипировка</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="704"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Show average depth</source> <translation>Покажи средна дълбочина</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="722"/> + <location filename="../qt-ui/preferences.ui" line="732"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="739"/> + <location filename="../qt-ui/preferences.ui" line="749"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> @@ -2249,32 +2286,32 @@ p, li { white-space: pre-wrap; } <translation>SOCKS прокси</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="245"/> + <location filename="../qt-ui/preferences.cpp" line="247"/> <source>Restart required</source> <translation>Нужен рестарт</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="246"/> + <location filename="../qt-ui/preferences.cpp" line="248"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>За да смените успешно език е необходим рестарт на Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="395"/> + <location filename="../qt-ui/preferences.cpp" line="398"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Ако изберете OK, всички настройки на Subsurface ще бъдат върнати по подразбиране. Това ще бъде изпълнено веднага.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Open default log file</source> <translation>Отвори файла по подразбиране</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="394"/> + <location filename="../qt-ui/preferences.cpp" line="397"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -2369,51 +2406,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/printoptions.ui" line="145"/> + <source>1 dive per page</source> + <translation>1 гмуркане на стр.</translation> + </message> + <message> + <location filename="../qt-ui/printoptions.ui" line="158"/> <source>Table print</source> <translation>Печат на таблица</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="162"/> + <location filename="../qt-ui/printoptions.ui" line="175"/> <source>Ordering</source> <translation>Подредба</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="180"/> + <location filename="../qt-ui/printoptions.ui" line="193"/> <source>Profile on top</source> <translation>Профил от горе</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="202"/> + <location filename="../qt-ui/printoptions.ui" line="215"/> <source>Notes on top</source> <translation>Бележки от горе</translation> </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="219"/> - <source>Sizing heights (% of layout)</source> - <translation>Размер по височина (% от оформлението)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="256"/> - <source>Profile height (43% - 85%)</source> - <translation>Височина на профила (43% - 85%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="278"/> - <source>Other data height (8% - 17%)</source> - <translation>Височина на други данни (8% - 17%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="338"/> - <source>Notes height (0% - 52%)</source> - <translation>Височина на бележките (0% - 52%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="354"/> - <location filename="../qt-ui/printoptions.ui" line="370"/> - <location filename="../qt-ui/printoptions.ui" line="386"/> - <source>0</source> - <translation>0</translation> - </message> </context> <context> <name>ProfilePrintModel</name> @@ -2491,77 +2506,77 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="520"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="515"/> <source> (#%1 of %2)</source> <translation> (№%1 от %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="898"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="895"/> <source>Make first divecomputer</source> <translation>Направи първи гмуркачески компютър</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="900"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="897"/> <source>Delete this divecomputer</source> <translation>Изтрий този гмуркачески компютър</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="907"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/> <source>Add gas change</source> <translation>Добави промяна на газа</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="918"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="915"/> <source>Add bookmark</source> <translation>Добави бележка</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="922"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="919"/> <source>Remove event</source> <translation>Премахни събитие</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/> <source>Hide similar events</source> <translation>Премахни малки събития</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="930"/> <source>Edit name</source> <translation>Редактирай име</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="947"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="944"/> <source>Unhide all events</source> <translation>Покажи всички събития</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide events</source> <translation>Скрий събития</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide all %1 events?</source> <translation>Скрий всички %1 събития?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1016"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1013"/> <source>Remove the selected event?</source> <translation>Премахни избраните събития?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1017"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1014"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1082"/> <source>Edit name of bookmark</source> <translation>Редактирай име в показалец</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1086"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1083"/> <source>Custom name:</source> <translation>Потребителско име:</translation> </message> @@ -2574,7 +2589,7 @@ p, li { white-space: pre-wrap; } <translation>Въздух</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="212"/> + <location filename="../qt-ui/diveplanner.cpp" line="210"/> <source>Remove this point</source> <translation>Изтрий тази точка</translation> </message> @@ -2644,22 +2659,22 @@ p, li { white-space: pre-wrap; } <translation>кб.фута</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/> <source>Invalid response from server</source> <translation>Грешен отговор от сървъра</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="529"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Очакван XML таг 'DiveDateReader', вместо това получен '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="575"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Очакван XML таг 'DiveDates' не беше намерен</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> <source>Malformed XML response. Line %1: %2</source> <translation>Грешен XML отговор. Ред %1: %2</translation> </message> @@ -2824,42 +2839,47 @@ p, li { white-space: pre-wrap; } <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="337"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="338"/> <source>Webservice</source> <translation>Уеб услуга</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="401"/> <source>Connecting...</source> <translation>Свръзване...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="420"/> <source>Download finished</source> <translation>Изтеглянето приключи</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="433"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="434"/> <source>Download error: %1</source> <translation>Грешка при изтеглянето: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/> <source>Connection error: </source> <translation>Грешка при връзка: </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/> <source>Download successful</source> <translation>Успешно изтегляне</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="447"/> <source>Invalid user identifier!</source> <translation>Грешен потребителски ключ</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="321"/> + <source>Enter User ID and click Download</source> + <translation>Въведете потребителски ID и натиснете "Изтегли"</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/> <source>Cannot parse response!</source> <translation>Не може да бъде напревен разряд!</translation> </message> @@ -2901,42 +2921,42 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="35"/> + <location filename="../qt-ui/updatemanager.cpp" line="33"/> <source>Check for updates.</source> <translation>Провери за обновления</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <location filename="../qt-ui/updatemanager.cpp" line="34"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface не успя да провери за обновления.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="41"/> + <location filename="../qt-ui/updatemanager.cpp" line="39"/> <source>The following error occurred:</source> <translation>Грешка:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <location filename="../qt-ui/updatemanager.cpp" line="40"/> <source>Please check your internet connection.</source> <translation>Моля проверете интернет връзката си.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="51"/> + <location filename="../qt-ui/updatemanager.cpp" line="49"/> <source>You are using the latest version of subsurface.</source> <translation>Вие използватe последната версия на Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="53"/> + <location filename="../qt-ui/updatemanager.cpp" line="51"/> <source>A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Има нова версия на Subsruface.<br/>Щракнете на:<br/><a href="%1">%1</a><br/> за да я изтеглите.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="56"/> + <location filename="../qt-ui/updatemanager.cpp" line="54"/> <source><b>A new version of subsurface is available.</b><br/><br/>%1</source> <translation><b>Има нова версия на Subsurface.</b><br/><br/>%1</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="57"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>Настъпи грешка при проверката за обновления.<br/><br/>%1</translation> </message> @@ -2949,8 +2969,8 @@ p, li { white-space: pre-wrap; } <translation>Ръководство за потребителя</translation> </message> <message> - <location filename="../qt-ui/usermanual.cpp" line="70"/> - <location filename="../qt-ui/usermanual.cpp" line="76"/> + <location filename="../qt-ui/usermanual.cpp" line="72"/> + <location filename="../qt-ui/usermanual.cpp" line="78"/> <source>Cannot find the Subsurface manual</source> <translation>Начъчника на Subsurface не може да бъде намерен</translation> </message> @@ -3039,27 +3059,27 @@ Language: %1</source> Език: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="74"/> + <location filename="../qt-ui/usersurvey.cpp" line="72"/> <source>Should we ask you later?</source> <translation>Да ви попитаме ли по-късно?</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="75"/> + <location filename="../qt-ui/usersurvey.cpp" line="73"/> <source>Don't ask me again</source> <translation>Не ме питайте отново</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="76"/> + <location filename="../qt-ui/usersurvey.cpp" line="74"/> <source>Ask later</source> <translation>Попитайте ме отново</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="96"/> + <location filename="../qt-ui/usersurvey.cpp" line="94"/> <source>Submit user survey.</source> <translation>Изпрати потребителско изследване</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="77"/> + <location filename="../qt-ui/usersurvey.cpp" line="75"/> <source>Ask again?</source> <translation>Да ви попитаме отново?</translation> </message> @@ -3071,27 +3091,27 @@ OS CPU Architecture: %1</source> OS CPU архитектура %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="97"/> + <location filename="../qt-ui/usersurvey.cpp" line="95"/> <source>Subsurface was unable to submit the user survey.</source> <translation>Subsurface не успя да изпрати потребителското изследване.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="102"/> + <location filename="../qt-ui/usersurvey.cpp" line="100"/> <source>The following error occurred:</source> <translation>Грешка:</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="103"/> + <location filename="../qt-ui/usersurvey.cpp" line="101"/> <source>Please check your internet connection.</source> <translation>Моля проверете интернет връзката си.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="112"/> + <location filename="../qt-ui/usersurvey.cpp" line="110"/> <source>Survey successfully submitted.</source> <translation>Потребителското изследване изпратено успешно</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="117"/> + <location filename="../qt-ui/usersurvey.cpp" line="115"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>Настъпи грешка при проверката за обновления.<br/><br/>%1</translation> </message> @@ -3271,13 +3291,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="128"/> - <location filename="../qt-gui.cpp" line="323"/> + <location filename="../qt-gui.cpp" line="329"/> <source>bar</source> <translation>бара</translation> </message> <message> <location filename="../dive.c" line="132"/> - <location filename="../qt-gui.cpp" line="326"/> + <location filename="../qt-gui.cpp" line="332"/> <source>psi</source> <translation>psi</translation> </message> @@ -3288,16 +3308,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="203"/> - <location filename="../qt-gui.cpp" line="205"/> - <location filename="../qt-gui.cpp" line="220"/> + <location filename="../qt-gui.cpp" line="211"/> + <location filename="../qt-gui.cpp" line="226"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>м</translation> </message> <message> <location filename="../dive.c" line="208"/> - <location filename="../qt-gui.cpp" line="208"/> - <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="214"/> + <location filename="../qt-gui.cpp" line="228"/> <source>ft</source> <translation>фута</translation> </message> @@ -3323,15 +3343,15 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="259"/> - <location filename="../qt-gui.cpp" line="231"/> - <location filename="../qt-gui.cpp" line="241"/> + <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="247"/> <source>lbs</source> <translation>паунда</translation> </message> <message> <location filename="../dive.c" line="263"/> - <location filename="../qt-gui.cpp" line="229"/> - <location filename="../qt-gui.cpp" line="239"/> + <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="245"/> <source>kg</source> <translation>кг</translation> </message> @@ -3341,36 +3361,36 @@ Maximum</source> <translation>(%s) или (%s)</translation> </message> <message> - <location filename="../divelist.c" line="467"/> - <location filename="../equipment.c" line="104"/> - <location filename="../planner.c" line="986"/> - <location filename="../planner.c" line="989"/> + <location filename="../divelist.c" line="460"/> + <location filename="../equipment.c" line="79"/> + <location filename="../planner.c" line="988"/> + <location filename="../planner.c" line="991"/> <location filename="../statistics.c" line="355"/> <source>air</source> <translation>въздух</translation> </message> <message> - <location filename="../equipment.c" line="210"/> + <location filename="../equipment.c" line="185"/> <source>integrated</source> <translation>вградена</translation> </message> <message> - <location filename="../equipment.c" line="211"/> + <location filename="../equipment.c" line="186"/> <source>belt</source> <translation>колан</translation> </message> <message> - <location filename="../equipment.c" line="212"/> + <location filename="../equipment.c" line="187"/> <source>ankle</source> <translation>глезен</translation> </message> <message> - <location filename="../equipment.c" line="213"/> + <location filename="../equipment.c" line="188"/> <source>backplate weight</source> <translation>нагръбна</translation> </message> <message> - <location filename="../equipment.c" line="214"/> + <location filename="../equipment.c" line="189"/> <source>clip-on</source> <translation>щипка</translation> </message> @@ -3681,131 +3701,130 @@ Maximum</source> <translation>Не може да бъде отворен стилов файл %s</translation> </message> <message> - <location filename="../equipment.c" line="106"/> + <location filename="../equipment.c" line="81"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="159"/> - <location filename="../planner.c" line="761"/> + <location filename="../planner.c" line="763"/> <source>Can't find gas %s</source> <translation>Не може да бъде намерен газ %s</translation> </message> <message> - <location filename="../planner.c" line="345"/> + <location filename="../planner.c" line="347"/> <source>Too many gas mixes</source> <translation>Твърде много газови смеси</translation> </message> <message> - <location filename="../planner.c" line="526"/> + <location filename="../planner.c" line="528"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>ВНИМАНИЕ: ТОВА Е НОВО ИЗПЪЛНЕНИЕ НА АГЛОРИТЪМА НА БУЛМАН И НА ПЛАНОВИКА, КОИТО НЕ СА ТЕСТВАНИ ДОСТАТЪЧНО. МОЛЯ НЕ ПЛАНУВАЙТЕ ИЗТИНСКИ ГМУРКАНИЯ БАЗИРАНИ НА ДАННИТЕ ТУК!</translation> </message> <message> - <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="537"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>базирано на GFlow = %d и GFHigh = %d</translation> </message> <message> - <location filename="../planner.c" line="538"/> + <location filename="../planner.c" line="540"/> <source>Subsurface dive plan</source> <translation>Subsurface гмуркачески план</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="544"/> <source>depth</source> <translation>дълбочина</translation> </message> <message> - <location filename="../planner.c" line="545"/> + <location filename="../planner.c" line="547"/> <source>runtime</source> <translation>времетраене</translation> </message> <message> - <location filename="../planner.c" line="548"/> + <location filename="../planner.c" line="550"/> <source>duration</source> <translation>продължителност</translation> </message> <message> - <location filename="../planner.c" line="551"/> + <location filename="../planner.c" line="553"/> <source>gas</source> <translation>газ</translation> </message> <message> - <location filename="../planner.c" line="585"/> + <location filename="../planner.c" line="587"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s</translation> </message> <message> - <location filename="../planner.c" line="595"/> + <location filename="../planner.c" line="597"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s</translation> </message> <message> - <location filename="../planner.c" line="606"/> + <location filename="../planner.c" line="608"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="609"/> - <location filename="../planner.c" line="613"/> + <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="615"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../planner.c" line="629"/> + <location filename="../planner.c" line="631"/> <source>Switch gas to %s</source> <translation>Превключи газ на %s</translation> </message> <message> - <location filename="../planner.c" line="642"/> + <location filename="../planner.c" line="644"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="644"/> + <location filename="../planner.c" line="646"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="649"/> <source>Gas consumption:</source> <translation>Консумация на газ:</translation> </message> <message> - <location filename="../planner.c" line="667"/> - <location filename="../planner.c" line="672"/> - <location filename="../planner.c" line="695"/> + <location filename="../planner.c" line="669"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="697"/> <source>Warning:</source> <translation>Предупреждение:</translation> </message> <message> - <location filename="../planner.c" line="668"/> + <location filename="../planner.c" line="670"/> <source>this is more gas than available in the specified cylinder!</source> <translation>има повече газ от този на разположение в избраната бултилка</translation> </message> <message> - <location filename="../planner.c" line="673"/> + <location filename="../planner.c" line="675"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>няма достатъчно резерв за газово споделяне при изкачване!</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="677"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s от %s (%.0f%s/%.0f%s в планирано покачване)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="679"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s по време на плануваното изкачване) на %s</translation> </message> <message> - <location filename="../planner.c" line="692"/> + <location filename="../planner.c" line="694"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>висока pO₂ стойност %.2f при %d:%02u с газ %s на дълбочина %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="990"/> + <location filename="../planner.c" line="992"/> <source>ean</source> <translation>ean</translation> </message> @@ -4042,22 +4061,22 @@ EADD: %d%s <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="281"/> + <location filename="../qt-gui.cpp" line="287"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="284"/> + <location filename="../qt-gui.cpp" line="290"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="417"/> + <location filename="../qt-gui.cpp" line="427"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 гмуркания)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="422"/> + <location filename="../qt-gui.cpp" line="432"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 гмуркане)</translation> </message> @@ -4207,97 +4226,97 @@ EADD: %d%s <translation>(няма гмуркания)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sun</source> <translation>Нед</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Mon</source> <translation>Пон</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Tue</source> <translation>Вт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Wed</source> <translation>Ср</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Thu</source> <translation>Чет</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Fri</source> <translation>Пет</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sat</source> <translation>Съб</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jan</source> <translation>Ян</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mar</source> <translation>Март</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jun</source> <translation>Юни</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Jul</source> <translation>Юли</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Sep</source> <translation>Сеп</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Nov</source> <translation>Нов</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Dec</source> <translation>Дек</translation> </message> @@ -4619,21 +4638,6 @@ Uemis Zurich включен ли е правилно?</translation> <translation>м/мин</translation> </message> <message> - <location filename="../qt-ui/plannerSettings.ui" line="94"/> - <source>75%-50% avg. depth</source> - <translation>75%-50% средна дълбочина</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="111"/> - <source>50% avg. depth - 6m/20ft</source> - <translation>50% средна дълбочина - 6м/20фута</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="128"/> - <source>6m/20ft to surface</source> - <translation>6м/20фута до повърхността</translation> - </message> - <message> <location filename="../qt-ui/plannerSettings.ui" line="148"/> <source>Descent</source> <translation>Спускане</translation> @@ -4665,8 +4669,8 @@ Uemis Zurich включен ли е правилно?</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="288"/> - <source>Last Stop at 6m/20ft</source> - <translation>Последен стоп на 6м/20фута</translation> + <source>Last stop at 6m</source> + <translation>Последен стоп на 6 метра</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="295"/> @@ -4730,6 +4734,21 @@ Uemis Zurich включен ли е правилно?</translation> <translation>бара</translation> </message> <message> + <location filename="../qt-ui/plannerSettings.ui" line="94"/> + <source>75% to 50% avg. depth</source> + <translation>75% до 50% средна дълбочина</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="111"/> + <source>50% avg. depth to 6m</source> + <translation>50% средна дълбочина до 6м</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="128"/> + <source>6m to surface</source> + <translation>6м до повърхността</translation> + </message> + <message> <location filename="../qt-ui/plannerSettings.ui" line="442"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Покажи времетраене (абсолютно време) на стоповете в гмуркаческия план</translation> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index 9d2fab427..5512f3e89 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -103,18 +103,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="107"/> <source>Bailing out to OC</source> <translation>Notausstieg mit offenem System</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="103"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="109"/> <source> begin</source> <comment>Starts with space!</comment> <translation> Anfang</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="104"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="110"/> <source> end</source> <comment>Starts with space!</comment> <translation> Ende</translation> @@ -136,87 +136,87 @@ <translation>Suchfeld anzeigen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="705"/> + <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>Expand all</source> <translation>Alle ausfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="706"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>Collapse all</source> <translation>Alle einfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="707"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>Collapse others</source> <translation>Andere einklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="709"/> + <location filename="../qt-ui/divelistview.cpp" line="711"/> <source>Remove dive(s) from trip</source> <translation>Entferne Tauchgäng(e) aus Reise</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="712"/> <source>Create new trip above</source> <translation>Neue Reise darüber einfügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>Add dive(s) to trip immediately above</source> <translation>Tauchgäng(e) zur Reise darüber hinzufügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="726"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>Add dive(s) to trip immediately below</source> <translation>Tauchgäng(e) zur Reise darunter hinzufügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>Merge trip with trip above</source> <translation>Reise mit der darüber verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="731"/> + <location filename="../qt-ui/divelistview.cpp" line="733"/> <source>Merge trip with trip below</source> <translation>Reise mit der darunter verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="737"/> <source>Delete dive(s)</source> <translation>Tauchgäng(e) löschen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="737"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>Mark dive(s) invalid</source> <translation>Tauchgäng(e) als ungültig markieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="741"/> + <location filename="../qt-ui/divelistview.cpp" line="743"/> <source>Merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="745"/> <source>Renumber dive(s)</source> <translation>Tauchgänge neu nummerieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="746"/> <source>Shift times</source> <translation>Zeiten verschieben</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="747"/> <source>Load images</source> <translation>Bilder laden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Open image files</source> <translation>Öffne Bilddateien</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -224,59 +224,59 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="30"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="35"/> <source>Export format</source> <translation>Export Format</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="42"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="47"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="61"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="66"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="74"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="79"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="84"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="89"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="94"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="99"/> <source>Worldmap</source> <translation>Weltkarte</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="112"/> <source>Selection</source> <translation>Auswahl</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="116"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="121"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="208"/> <source>Selected dives</source> <translation>Ausgewählte Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="126"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="131"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="234"/> <source>All dives</source> <translation>Alle Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="178"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="183"/> <source>HTML</source> <translation>HTML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="216"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="221"/> <source>Minimum Javascript</source> <translation>Minimum Javascript</translation> </message> @@ -286,87 +286,87 @@ <translation>Exportiere Tauchlog Dateien</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="24"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="29"/> <source>General export</source> <translation>Allgemeiner Export</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="184"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>General settings</source> <translation>Allg. Einstellungen</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="190"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="195"/> <source>Subsurface numbers</source> <translation>Subsurface Nummern</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="239"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export list only</source> <translation>Nur Liste exportieren</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="252"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="257"/> <source>Style options</source> <translation>Stiloptionen</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="264"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="269"/> <source>Font</source> <translation>Schriftart</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="274"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="279"/> <source>Font size</source> <translation>Schriftgröße</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="285"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="320"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="323"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="328"/> <source>Theme</source> <translation>Motiv</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> <source>Light</source> <translation>Licht</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Sand</source> <translation>Sand</translation> </message> @@ -627,42 +627,42 @@ <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="137"/> + <location filename="../qt-ui/diveplanner.cpp" line="135"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="622"/> + <location filename="../qt-ui/diveplanner.cpp" line="634"/> <source>Final depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="624"/> + <location filename="../qt-ui/diveplanner.cpp" line="636"/> <source>Run time</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="626"/> + <location filename="../qt-ui/diveplanner.cpp" line="638"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="628"/> + <location filename="../qt-ui/diveplanner.cpp" line="640"/> <source>Used gas</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="630"/> + <location filename="../qt-ui/diveplanner.cpp" line="642"/> <source>CC set point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="925"/> + <location filename="../qt-ui/diveplanner.cpp" line="938"/> <source>Discard the plan?</source> <translation>Diese Planung verwerfen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="926"/> + <location filename="../qt-ui/diveplanner.cpp" line="939"/> <source>You are about to discard your plan.</source> <translation>Du bist dabei Deinen Plan zu verwerfen.</translation> </message> @@ -670,17 +670,17 @@ <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="255"/> + <location filename="../qt-ui/diveplanner.cpp" line="254"/> <source>Dive planner points</source> <translation>Planerpunkte</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="259"/> + <location filename="../qt-ui/diveplanner.cpp" line="258"/> <source>Available gases</source> <translation>Verfügbare Gase</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="282"/> + <location filename="../qt-ui/diveplanner.cpp" line="281"/> <source>Add dive data point</source> <translation>Datenpunkt hinzufügen</translation> </message> @@ -854,70 +854,70 @@ <translation>ein interner Fehler ist aufgetreten</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="636"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="832"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="637"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> <source>Done</source> <translation>Fertig</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="667"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="668"/> <source>Uploading dive list...</source> <translation>Übertrage Liste der Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="698"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="699"/> <source>Downloading dive list...</source> <translation>Liste der Tauchgänge herunterladen...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="747"/> <source>Downloading %1 dives...</source> <translation>Lade %1 Tauchgänge vom Server...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="790"/> <source>Download finished - %1</source> <translation>Herunterladen beendet - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> <source>Corrupted download</source> <translation>Heruntergeladene Daten sind beschädigt.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> <source>The archive could not be opened: %1</source> <translation>Das Archiv konnte nicht geöffnet werden %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/> <source>Upload failed</source> <translation>Übertragung fehlgeschlagen</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="850"/> <source>Upload successful</source> <translation>Übertragung erfolgreich</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="853"/> <source>Login failed</source> <translation>Login fehlgeschlagen</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="855"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/> <source>Cannot parse response</source> <translation>Verstehe die Antwort nicht</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="867"/> <source>Error: %1</source> <translation>Fehler: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="834"/> <source>Upload finished</source> <translation>Übertragung beendet</translation> </message> @@ -1049,7 +1049,7 @@ <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="450"/> <source>Location</source> <translation>Ort</translation> </message> @@ -1090,27 +1090,27 @@ </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="415"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Dive notes</source> <translation>Notizen</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="607"/> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="245"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="626"/> - <location filename="../qt-ui/maintab.cpp" line="245"/> + <location filename="../qt-ui/maintab.cpp" line="246"/> <source>Water temp.</source> <translation>Wassertemp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="440"/> + <location filename="../qt-ui/maintab.cpp" line="451"/> <source>Notes</source> <translation>Notizen</translation> </message> @@ -1227,97 +1227,97 @@ <translation>Bilder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="88"/> + <location filename="../qt-ui/maintab.cpp" line="89"/> <source>Cylinders</source> <translation>Flaschen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="89"/> + <location filename="../qt-ui/maintab.cpp" line="90"/> <source>Add Cylinder</source> <translation>Flasche hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="93"/> <source>Weights</source> <translation>Blei</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="93"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Add Weight System</source> <translation>Blei hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="48"/> + <location filename="../qt-ui/maintab.cpp" line="49"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="52"/> + <location filename="../qt-ui/maintab.cpp" line="53"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="241"/> + <location filename="../qt-ui/maintab.cpp" line="242"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="242"/> + <location filename="../qt-ui/maintab.cpp" line="243"/> <source>Water temp. [%1]</source> <translation>Wassertemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="277"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>This trip is being edited.</source> <translation>Diese Reise wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="284"/> + <location filename="../qt-ui/maintab.cpp" line="285"/> <source>Multiple dives are being edited.</source> <translation>Mehrere Tauchgänge werden bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="286"/> + <location filename="../qt-ui/maintab.cpp" line="287"/> <source>This dive is being edited.</source> <translation>Dieser Tauchgang wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="386"/> - <location filename="../qt-ui/maintab.cpp" line="410"/> + <location filename="../qt-ui/maintab.cpp" line="397"/> + <location filename="../qt-ui/maintab.cpp" line="421"/> <source>Trip notes</source> <translation>Reisenotizen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="408"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> <source>Trip location</source> <translation>Ziel der Reise</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="461"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> - <location filename="../qt-ui/maintab.cpp" line="502"/> - <location filename="../qt-ui/maintab.cpp" line="503"/> - <location filename="../qt-ui/maintab.cpp" line="504"/> + <location filename="../qt-ui/maintab.cpp" line="472"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> + <location filename="../qt-ui/maintab.cpp" line="513"/> + <location filename="../qt-ui/maintab.cpp" line="514"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="463"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="500"/> + <location filename="../qt-ui/maintab.cpp" line="511"/> <source>Deepest dive</source> <translation>Tiefster Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="501"/> + <location filename="../qt-ui/maintab.cpp" line="512"/> <source>Shallowest dive</source> <translation>Flachster Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="556"/> <source>These gases could be mixed from Air and using: </source> @@ -1326,17 +1326,17 @@ den folgenden Gasen gemischt werden: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="549"/> + <location filename="../qt-ui/maintab.cpp" line="560"/> <source> and </source> <translation>und</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="797"/> + <location filename="../qt-ui/maintab.cpp" line="808"/> <source>Discard the changes?</source> <translation>Änderungen verwerfen?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="798"/> + <location filename="../qt-ui/maintab.cpp" line="809"/> <source>You are about to discard your changes.</source> <translation>Sie sind im Begriff, die Änderungen zu Verwerfen.</translation> </message> @@ -1816,70 +1816,70 @@ p, li { white-space: pre-wrap; } <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchgang hinzugefügt werden kann.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="421"/> + <location filename="../qt-ui/mainwindow.cpp" line="422"/> <source>Print runtime table</source> <translation>Zeige Laufzeit Tabelle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="516"/> + <location filename="../qt-ui/mainwindow.cpp" line="522"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="701"/> + <location filename="../qt-ui/mainwindow.cpp" line="707"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="703"/> + <location filename="../qt-ui/mainwindow.cpp" line="709"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Möchtest Du die Änderungen in der Daten-Datei speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="708"/> + <location filename="../qt-ui/mainwindow.cpp" line="714"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1066"/> + <location filename="../qt-ui/mainwindow.cpp" line="1072"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1190"/> + <location filename="../qt-ui/mainwindow.cpp" line="1196"/> <source>Open dive log file</source> <translation>Öffne Tauchlog Datei</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1191"/> + <location filename="../qt-ui/mainwindow.cpp" line="1197"/> <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source> <translation>Tauchlog Dateien (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Dateien (*.xml);;UDDF/UDCF Dateien(*.uddf *.udcf);;JDiveLog Dateien(*.jlb);;Suunto Dateien(*.sde *.db);;CSV Files(*.csv);;Alle Dateien(*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="709"/> + <location filename="../qt-ui/mainwindow.cpp" line="715"/> <source>Changes will be lost if you don't save them.</source> <translation>Änderungen gehen verloren, wenn Du sie nicht speicherst.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="251"/> <location filename="../qt-ui/mainwindow.cpp" line="390"/> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="188"/> - <location filename="../qt-ui/mainwindow.cpp" line="1050"/> + <location filename="../qt-ui/mainwindow.cpp" line="1056"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neues Logbuch geöffnet werden kann.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1067"/> + <location filename="../qt-ui/mainwindow.cpp" line="1073"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Bitte zuerst die aktuelle Bearbeitung abschließen um eine neue zu beginnen.</translation> </message> @@ -1887,15 +1887,45 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="444"/> + <location filename="../qt-ui/diveplanner.cpp" line="450"/> + <source>ft/min</source> + <translation>ft/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="451"/> <source>Last stop at 20ft</source> <translation>Letzter Stopp auf 20 Fuß</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="451"/> + <location filename="../qt-ui/diveplanner.cpp" line="452"/> + <source>50% avg. depth to 20ft</source> + <translation>50% mitlerer Tiefe bis 20ft</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="453"/> + <source>20ft to surface</source> + <translation>20ft bis Oberfläche</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="455"/> + <source>m/min</source> + <translation>m/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="456"/> <source>Last stop at 6m</source> <translation>Letzter Stopp auf 6m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="457"/> + <source>50% avg. depth to 6m</source> + <translation>50% mitlerer Tiefe bis 6m</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="458"/> + <source>6m to surface</source> + <translation>6m bis Oberfläche</translation> + </message> </context> <context> <name>PreferencesDialog</name> @@ -1941,146 +1971,151 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/preferences.ui" line="198"/> + <source>Use default</source> + <translation>Standardeinstellungen verwenden</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="247"/> + <location filename="../qt-ui/preferences.ui" line="257"/> <source>Animations</source> <translation>Animationen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="253"/> + <location filename="../qt-ui/preferences.ui" line="263"/> <source>Speed</source> <translation>Geschwindigkeit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Clear all settings</source> <translation>Alle Einstellungen zurücksetzen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="312"/> + <location filename="../qt-ui/preferences.ui" line="322"/> <source>Reset all settings to their default value</source> <translation>Alle Einstellungen auf Standardwert setzen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="341"/> + <location filename="../qt-ui/preferences.ui" line="351"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="348"/> + <location filename="../qt-ui/preferences.ui" line="358"/> <source>Metric</source> <translation>Metrisch</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="358"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Imperial</source> <translation>Zöllig</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="368"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Personalize</source> <translation>Personalisieren</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="392"/> + <location filename="../qt-ui/preferences.ui" line="402"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="399"/> + <location filename="../qt-ui/preferences.ui" line="409"/> <source>meter</source> <translation>Meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="409"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>feet</source> <translation>Fuß</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="426"/> + <location filename="../qt-ui/preferences.ui" line="436"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="436"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="453"/> + <location filename="../qt-ui/preferences.ui" line="463"/> <source>liter</source> <translation>Liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="463"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="490"/> <source>celsius</source> <translation>Celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="490"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>fahrenheit</source> <translation>Fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="507"/> + <location filename="../qt-ui/preferences.ui" line="517"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="772"/> + <location filename="../qt-ui/preferences.ui" line="782"/> <source>System default</source> <translation>Standardeinstellungen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="811"/> + <location filename="../qt-ui/preferences.ui" line="821"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="817"/> + <location filename="../qt-ui/preferences.ui" line="827"/> <source>Proxy type</source> <translation>Proxy Typ</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="830"/> + <location filename="../qt-ui/preferences.ui" line="840"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="856"/> + <location filename="../qt-ui/preferences.ui" line="866"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="882"/> + <location filename="../qt-ui/preferences.ui" line="892"/> <source>Requires authentication</source> <translation>Anmeldung erforderlich</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="912"/> <source>Username</source> <translation>Benutzername</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="925"/> + <location filename="../qt-ui/preferences.ui" line="935"/> <source>Password</source> <translation>Passwort</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="802"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="419"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>Pressure</source> <translation>Druck</translation> </message> @@ -2095,82 +2130,82 @@ p, li { white-space: pre-wrap; } <translation>Standard Tauchlog Datei</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="207"/> + <location filename="../qt-ui/preferences.ui" line="217"/> <source>Display invalid</source> <translation>Auch ungültige anzeigen?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="224"/> + <location filename="../qt-ui/preferences.ui" line="234"/> <source>Default cylinder</source> <translation>Standardflasche</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="230"/> + <location filename="../qt-ui/preferences.ui" line="240"/> <source>Use default cylinder</source> <translation>Standardflasche verwenden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="280"/> + <location filename="../qt-ui/preferences.ui" line="290"/> <source>Subsurface web service</source> <translation>Subsurface Webservice</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="286"/> + <location filename="../qt-ui/preferences.ui" line="296"/> <source>Default user ID</source> <translation>Standard Benutzerkennung</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Save user ID locally?</source> <translation>Benutzerkennung lokal speichern?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="446"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>Volume</source> <translation>Volumen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="473"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="500"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="517"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="532"/> + <location filename="../qt-ui/preferences.ui" line="542"/> <source>Time units</source> <translation>Zeiteinheiten</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="545"/> + <location filename="../qt-ui/preferences.ui" line="555"/> <source>Minutes</source> <translation>Minuten</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="555"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Seconds</source> <translation>Sekunden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="587"/> + <location filename="../qt-ui/preferences.ui" line="597"/> <source>Show</source> <translation>Anzeigen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="756"/> + <location filename="../qt-ui/preferences.ui" line="766"/> <source>GFLow at max depth</source> <translation>GF low bei maximaler Tiefe anwenden</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="716"/> + <location filename="../qt-ui/preferences.ui" line="726"/> <source>Misc</source> <translation>Sonstiges</translation> </message> @@ -2180,52 +2215,52 @@ p, li { white-space: pre-wrap; } <translation>Einstellungen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="538"/> + <location filename="../qt-ui/preferences.ui" line="548"/> <source>Ascent/descent speed denominator</source> <translation>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="598"/> + <location filename="../qt-ui/preferences.ui" line="608"/> <source>Threshold when showing pO₂</source> <translation>Schwellenwert bei pO₂ Anzeige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="619"/> + <location filename="../qt-ui/preferences.ui" line="629"/> <source>Threshold when showing pN₂</source> <translation>Schwellenwert bei pN₂ Anzeige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="640"/> + <location filename="../qt-ui/preferences.ui" line="650"/> <source>Threshold when showing pHe</source> <translation>Schwellenwert bei pHe Anzeige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="661"/> + <location filename="../qt-ui/preferences.ui" line="671"/> <source>Max pO₂ when showing MOD</source> <translation>max pO₂ bei MOD Anzeige</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="682"/> + <location filename="../qt-ui/preferences.ui" line="692"/> <source>Draw dive computer reported ceiling red</source> <translation>Zeichne Auftauchgrenze des Tauchcomputers in rot</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="693"/> + <location filename="../qt-ui/preferences.ui" line="703"/> <source>Show unused cylinders in Equipment tab</source> <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="704"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Show average depth</source> <translation>Durchschnittstiefe anzeigen</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="722"/> + <location filename="../qt-ui/preferences.ui" line="732"/> <source>GFLow</source> <translation>GF low</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="739"/> + <location filename="../qt-ui/preferences.ui" line="749"/> <source>GFHigh</source> <translation>GF high</translation> </message> @@ -2250,32 +2285,32 @@ p, li { white-space: pre-wrap; } <translation>SOCKS Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="245"/> + <location filename="../qt-ui/preferences.cpp" line="247"/> <source>Restart required</source> <translation>Bitte Programm neu starten</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="246"/> + <location filename="../qt-ui/preferences.cpp" line="248"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="395"/> + <location filename="../qt-ui/preferences.cpp" line="398"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Mit OK werden alle Einstellungen zurückgesetzt. Dies hat sofortige Wirkung.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Open default log file</source> <translation>Standard Logfile öffnen</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="394"/> + <location filename="../qt-ui/preferences.cpp" line="397"/> <source>Warning</source> <translation>Warnung</translation> </message> @@ -2370,51 +2405,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/printoptions.ui" line="145"/> + <source>1 dive per page</source> + <translation>1 Tauchgang pro Seite</translation> + </message> + <message> + <location filename="../qt-ui/printoptions.ui" line="158"/> <source>Table print</source> <translation>Tabellendruck</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="162"/> + <location filename="../qt-ui/printoptions.ui" line="175"/> <source>Ordering</source> <translation>Reihenfolge</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="180"/> + <location filename="../qt-ui/printoptions.ui" line="193"/> <source>Profile on top</source> <translation>Profil oben</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="202"/> + <location filename="../qt-ui/printoptions.ui" line="215"/> <source>Notes on top</source> <translation>Notizen oben</translation> </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="219"/> - <source>Sizing heights (% of layout)</source> - <translation>Höhe (% des Layouts)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="256"/> - <source>Profile height (43% - 85%)</source> - <translation>Höhe des Profils (43% - 85%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="278"/> - <source>Other data height (8% - 17%)</source> - <translation>Höhe der anderen Daten (8% - 17%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="338"/> - <source>Notes height (0% - 52%)</source> - <translation>Höhe der Notizen (0% - 52%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="354"/> - <location filename="../qt-ui/printoptions.ui" line="370"/> - <location filename="../qt-ui/printoptions.ui" line="386"/> - <source>0</source> - <translation>0</translation> - </message> </context> <context> <name>ProfilePrintModel</name> @@ -2492,77 +2505,77 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="520"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="515"/> <source> (#%1 of %2)</source> <translation> (#%1 von %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="898"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="895"/> <source>Make first divecomputer</source> <translation>Primärer Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="900"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="897"/> <source>Delete this divecomputer</source> <translation>Lösche diesen Tauchcomputer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="907"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/> <source>Add gas change</source> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="918"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="915"/> <source>Add bookmark</source> <translation>Markierung setzen</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="922"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="919"/> <source>Remove event</source> <translation>Entferne Ereignis</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/> <source>Hide similar events</source> <translation>Ähnliche Ereignisse ausblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="930"/> <source>Edit name</source> <translation>Name bearbeiten</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="947"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="944"/> <source>Unhide all events</source> <translation>Alle Ereignisse einblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide events</source> <translation>Ereignisse ausblenden</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide all %1 events?</source> <translation>Alle %1 Ereignisse ausblenden?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1016"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1013"/> <source>Remove the selected event?</source> <translation>Ausgewähltes Ereignis entfernen?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1017"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1014"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1082"/> <source>Edit name of bookmark</source> <translation>Name der Markierung bearbeiten</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1086"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1083"/> <source>Custom name:</source> <translation>Benutzerdefinierter Name:</translation> </message> @@ -2575,7 +2588,7 @@ p, li { white-space: pre-wrap; } <translation>Luft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="212"/> + <location filename="../qt-ui/diveplanner.cpp" line="210"/> <source>Remove this point</source> <translation>Diesen Punkt entfernen</translation> </message> @@ -2645,22 +2658,22 @@ p, li { white-space: pre-wrap; } <translation>cuft</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/> <source>Invalid response from server</source> <translation>Ungültige Serverantwort</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="529"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>%1 anstelle des erwarteten XML Tags 'DiveDateReader'.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="575"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>XML Tag 'DiveDates' nicht gefunden.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> <source>Malformed XML response. Line %1: %2</source> <translation>Ungültige XML Antwort. Zeile %1: %2</translation> </message> @@ -2825,42 +2838,47 @@ p, li { white-space: pre-wrap; } <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="337"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="338"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="401"/> <source>Connecting...</source> <translation>Verbinde...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="420"/> <source>Download finished</source> <translation>Herunterladen beendet</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="433"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="434"/> <source>Download error: %1</source> <translation>Fehler beim Herunterladen: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/> <source>Connection error: </source> <translation>Verbindungsfehler: </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/> <source>Download successful</source> <translation>Erfolgreich geladen!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="447"/> <source>Invalid user identifier!</source> <translation>Ungültige Benutzerkennung</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="321"/> + <source>Enter User ID and click Download</source> + <translation>Benutzerkennung eingeben und Herunterladen klicken</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/> <source>Cannot parse response!</source> <translation>Verstehe die Antwort nicht!</translation> </message> @@ -2902,42 +2920,42 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="35"/> + <location filename="../qt-ui/updatemanager.cpp" line="33"/> <source>Check for updates.</source> <translation>Neue Version suchen</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <location filename="../qt-ui/updatemanager.cpp" line="34"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface konnte nicht nach neuen Versionen suchen.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="41"/> + <location filename="../qt-ui/updatemanager.cpp" line="39"/> <source>The following error occurred:</source> <translation>Fehlermeldung erhalten:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <location filename="../qt-ui/updatemanager.cpp" line="40"/> <source>Please check your internet connection.</source> <translation>Bitte Internet-Verbindung überprüfen.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="51"/> + <location filename="../qt-ui/updatemanager.cpp" line="49"/> <source>You are using the latest version of subsurface.</source> <translation>Dies ist die neuste Version von Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="53"/> + <location filename="../qt-ui/updatemanager.cpp" line="51"/> <source>A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Eine neuere Subsurface-Version kann hier heruntergeladen werden<br/><a href="%1">%1</a></translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="56"/> + <location filename="../qt-ui/updatemanager.cpp" line="54"/> <source><b>A new version of subsurface is available.</b><br/><br/>%1</source> <translation><b>Eine neue Subsurface-Version wurde freigegeben.</b><br/><br/>%1</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="57"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>Während der Suche nach einer neuen Version ist ein Fehler aufgetreten.<br/><br/>%1</translation> </message> @@ -2950,8 +2968,8 @@ p, li { white-space: pre-wrap; } <translation>Benutzerhandbuch</translation> </message> <message> - <location filename="../qt-ui/usermanual.cpp" line="70"/> - <location filename="../qt-ui/usermanual.cpp" line="76"/> + <location filename="../qt-ui/usermanual.cpp" line="72"/> + <location filename="../qt-ui/usermanual.cpp" line="78"/> <source>Cannot find the Subsurface manual</source> <translation>Das Subsurface-Handbuch kann nicht gefunden werden</translation> </message> @@ -3040,27 +3058,27 @@ Language: %1</source> Sprache: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="74"/> + <location filename="../qt-ui/usersurvey.cpp" line="72"/> <source>Should we ask you later?</source> <translation>Sollen wir später noch einmal fragen?</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="75"/> + <location filename="../qt-ui/usersurvey.cpp" line="73"/> <source>Don't ask me again</source> <translation>Fragt mich nicht mehr</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="76"/> + <location filename="../qt-ui/usersurvey.cpp" line="74"/> <source>Ask later</source> <translation>Später nochmal fragen</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="96"/> + <location filename="../qt-ui/usersurvey.cpp" line="94"/> <source>Submit user survey.</source> <translation>Unfrageergebnis übertragen.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="77"/> + <location filename="../qt-ui/usersurvey.cpp" line="75"/> <source>Ask again?</source> <translation>Fragt noch einmal?</translation> </message> @@ -3072,27 +3090,27 @@ OS CPU Architecture: %1</source> Prozessor Architektur (laut Betriebsystem): %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="97"/> + <location filename="../qt-ui/usersurvey.cpp" line="95"/> <source>Subsurface was unable to submit the user survey.</source> <translation>Subsurface konnte die Benutzerumfrage nicht übertragen.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="102"/> + <location filename="../qt-ui/usersurvey.cpp" line="100"/> <source>The following error occurred:</source> <translation>Fehlermeldung erhalten:</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="103"/> + <location filename="../qt-ui/usersurvey.cpp" line="101"/> <source>Please check your internet connection.</source> <translation>Bitte Internet-Verbindung überprüfen.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="112"/> + <location filename="../qt-ui/usersurvey.cpp" line="110"/> <source>Survey successfully submitted.</source> <translation>Benutzerumfrage erfolgreich übertragen.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="117"/> + <location filename="../qt-ui/usersurvey.cpp" line="115"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>Während der Suche nach einer neuen Version ist ein Fehler aufgetreten.<br/><br/>%1</translation> </message> @@ -3272,13 +3290,13 @@ Durchschnitt</translation> </message> <message> <location filename="../dive.c" line="128"/> - <location filename="../qt-gui.cpp" line="323"/> + <location filename="../qt-gui.cpp" line="329"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="132"/> - <location filename="../qt-gui.cpp" line="326"/> + <location filename="../qt-gui.cpp" line="332"/> <source>psi</source> <translation>psi</translation> </message> @@ -3289,16 +3307,16 @@ Durchschnitt</translation> </message> <message> <location filename="../dive.c" line="203"/> - <location filename="../qt-gui.cpp" line="205"/> - <location filename="../qt-gui.cpp" line="220"/> + <location filename="../qt-gui.cpp" line="211"/> + <location filename="../qt-gui.cpp" line="226"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="208"/> - <location filename="../qt-gui.cpp" line="208"/> - <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="214"/> + <location filename="../qt-gui.cpp" line="228"/> <source>ft</source> <translation>ft</translation> </message> @@ -3324,15 +3342,15 @@ Durchschnitt</translation> </message> <message> <location filename="../dive.c" line="259"/> - <location filename="../qt-gui.cpp" line="231"/> - <location filename="../qt-gui.cpp" line="241"/> + <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="247"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> <location filename="../dive.c" line="263"/> - <location filename="../qt-gui.cpp" line="229"/> - <location filename="../qt-gui.cpp" line="239"/> + <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="245"/> <source>kg</source> <translation>kg</translation> </message> @@ -3342,36 +3360,36 @@ Durchschnitt</translation> <translation>(%s) oder (%s)</translation> </message> <message> - <location filename="../divelist.c" line="467"/> - <location filename="../equipment.c" line="104"/> - <location filename="../planner.c" line="986"/> - <location filename="../planner.c" line="989"/> + <location filename="../divelist.c" line="460"/> + <location filename="../equipment.c" line="79"/> + <location filename="../planner.c" line="988"/> + <location filename="../planner.c" line="991"/> <location filename="../statistics.c" line="355"/> <source>air</source> <translation>Luft</translation> </message> <message> - <location filename="../equipment.c" line="210"/> + <location filename="../equipment.c" line="185"/> <source>integrated</source> <translation>integriert</translation> </message> <message> - <location filename="../equipment.c" line="211"/> + <location filename="../equipment.c" line="186"/> <source>belt</source> <translation>Gürtel</translation> </message> <message> - <location filename="../equipment.c" line="212"/> + <location filename="../equipment.c" line="187"/> <source>ankle</source> <translation>Fussblei</translation> </message> <message> - <location filename="../equipment.c" line="213"/> + <location filename="../equipment.c" line="188"/> <source>backplate weight</source> <translation>Backplate-Gewicht</translation> </message> <message> - <location filename="../equipment.c" line="214"/> + <location filename="../equipment.c" line="189"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -3682,131 +3700,130 @@ Durchschnitt</translation> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> <message> - <location filename="../equipment.c" line="106"/> + <location filename="../equipment.c" line="81"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="159"/> - <location filename="../planner.c" line="761"/> + <location filename="../planner.c" line="763"/> <source>Can't find gas %s</source> <translation>Kann Gas %s nicht finden</translation> </message> <message> - <location filename="../planner.c" line="345"/> + <location filename="../planner.c" line="347"/> <source>Too many gas mixes</source> <translation>Zu viele Gasgemische</translation> </message> <message> - <location filename="../planner.c" line="526"/> + <location filename="../planner.c" line="528"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>HAFTUNGSAUSSCHLUSS / WARNUNG: DIES IST EINE NEUE IMPLEMENTIERUNG DES "BÜHLMANN ZH-L16"-ALGORITHMUS UND EINES DARAUF AUFBAUENDEN TAUCHGANGPLANERS, DIE NUR EINGESCHRÄNKT GETESTET WURDE. WIR RATEN DRINGENST, KEINE TAUCHGÄNGE DURCHZUFÜHREN, DIE NUR AUF DEN HIER ERSTELLTEN DATEN BERUHEN.</translation> </message> <message> - <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="537"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>basierend auf GFlow = %d und GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="538"/> + <location filename="../planner.c" line="540"/> <source>Subsurface dive plan</source> <translation>Subsurface Tauchplan</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="544"/> <source>depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../planner.c" line="545"/> + <location filename="../planner.c" line="547"/> <source>runtime</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../planner.c" line="548"/> + <location filename="../planner.c" line="550"/> <source>duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../planner.c" line="551"/> + <location filename="../planner.c" line="553"/> <source>gas</source> <translation>Gas</translation> </message> <message> - <location filename="../planner.c" line="585"/> + <location filename="../planner.c" line="587"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Aufstieg auf %.*f %s in %d:%02d min - Laufzeit %d:%02u mit %s</translation> </message> <message> - <location filename="../planner.c" line="595"/> + <location filename="../planner.c" line="597"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Beib auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s</translation> </message> <message> - <location filename="../planner.c" line="606"/> + <location filename="../planner.c" line="608"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="609"/> - <location filename="../planner.c" line="613"/> + <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="615"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="629"/> + <location filename="../planner.c" line="631"/> <source>Switch gas to %s</source> <translation>Gaswechsel zu %s</translation> </message> <message> - <location filename="../planner.c" line="642"/> + <location filename="../planner.c" line="644"/> <source>CNS</source> <translation>CND</translation> </message> <message> - <location filename="../planner.c" line="644"/> + <location filename="../planner.c" line="646"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="649"/> <source>Gas consumption:</source> <translation>Gasverbrauch:</translation> </message> <message> - <location filename="../planner.c" line="667"/> - <location filename="../planner.c" line="672"/> - <location filename="../planner.c" line="695"/> + <location filename="../planner.c" line="669"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="697"/> <source>Warning:</source> <translation>Warnung:</translation> </message> <message> - <location filename="../planner.c" line="668"/> + <location filename="../planner.c" line="670"/> <source>this is more gas than available in the specified cylinder!</source> <translation>Dies ist mehr Gas, als in der Flasche verfügbar ist!</translation> </message> <message> - <location filename="../planner.c" line="673"/> + <location filename="../planner.c" line="675"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Keine ausreichende Reserve für Aufstieg unter Wechselatmung!</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="677"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s während geplantem Aufstieg)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="679"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s während des geplanten Aufstiegs) von %s</translation> </message> <message> - <location filename="../planner.c" line="692"/> + <location filename="../planner.c" line="694"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>hoher pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="990"/> + <location filename="../planner.c" line="992"/> <source>ean</source> <translation>ean</translation> </message> @@ -4041,22 +4058,22 @@ EADD: %d%s <translation>%s %sDruck:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="281"/> + <location filename="../qt-gui.cpp" line="287"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="284"/> + <location filename="../qt-gui.cpp" line="290"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="417"/> + <location filename="../qt-gui.cpp" line="427"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 Tauchgänge)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="422"/> + <location filename="../qt-gui.cpp" line="432"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 Tauchgang)</translation> </message> @@ -4206,97 +4223,97 @@ EADD: %d%s <translation>(keine Tauchgänge)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sun</source> <translation>So</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Mon</source> <translation>Mo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Tue</source> <translation>Di</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Wed</source> <translation>Mi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Thu</source> <translation>Do</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Fri</source> <translation>Fr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sat</source> <translation>Sa</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mar</source> <translation>Mär</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Dec</source> <translation>Dez</translation> </message> @@ -4618,21 +4635,6 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/plannerSettings.ui" line="94"/> - <source>75%-50% avg. depth</source> - <translation>75%-50% mittlerer Tiefe</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="111"/> - <source>50% avg. depth - 6m/20ft</source> - <translation>50% mitlerer Tiefe - 6m/20ft</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="128"/> - <source>6m/20ft to surface</source> - <translation>6m/20ft bis Oberfläche</translation> - </message> - <message> <location filename="../qt-ui/plannerSettings.ui" line="148"/> <source>Descent</source> <translation>Abstieg</translation> @@ -4664,8 +4666,8 @@ Ist der Uemis Zürich korrekt verbunden?</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="288"/> - <source>Last Stop at 6m/20ft</source> - <translation>Letzter Stopp auf 6m/20ft</translation> + <source>Last stop at 6m</source> + <translation>Letzter Stopp auf 6m</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="295"/> @@ -4729,6 +4731,21 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>bar</translation> </message> <message> + <location filename="../qt-ui/plannerSettings.ui" line="94"/> + <source>75% to 50% avg. depth</source> + <translation>75% bis 50% mittlerer Tiefe</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="111"/> + <source>50% avg. depth to 6m</source> + <translation>50% mitlerer Tiefe bis 6m</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="128"/> + <source>6m to surface</source> + <translation>6m bis Oberfläche</translation> + </message> + <message> <location filename="../qt-ui/plannerSettings.ui" line="442"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Zeige runtime (absolute Zeit) der Stopps im Tauchplan</translation> diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index 62f3bb4bb..a156e3ba9 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -104,18 +104,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="107"/> <source>Bailing out to OC</source> <translation>Bailing out to OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="103"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="109"/> <source> begin</source> <comment>Starts with space!</comment> <translation> begin</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="104"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="110"/> <source> end</source> <comment>Starts with space!</comment> <translation> end</translation> @@ -137,87 +137,87 @@ <translation>Show search box</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="705"/> + <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>Expand all</source> <translation>Expand all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="706"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>Collapse all</source> <translation>Collapse all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="707"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>Collapse others</source> <translation>Collapse others</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="709"/> + <location filename="../qt-ui/divelistview.cpp" line="711"/> <source>Remove dive(s) from trip</source> <translation>Remove dive(s) from trip</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="712"/> <source>Create new trip above</source> <translation>Create new trip above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>Add dive(s) to trip immediately above</source> <translation>Add dive(s) to trip immediately above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="726"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>Add dive(s) to trip immediately below</source> <translation>Add dive(s) to trip immediately below</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>Merge trip with trip above</source> <translation>Merge trip with trip above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="731"/> + <location filename="../qt-ui/divelistview.cpp" line="733"/> <source>Merge trip with trip below</source> <translation>Merge trip with trip below</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="737"/> <source>Delete dive(s)</source> <translation>Delete dive(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="737"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>Mark dive(s) invalid</source> <translation>Mark dive(s) invalid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="741"/> + <location filename="../qt-ui/divelistview.cpp" line="743"/> <source>Merge selected dives</source> <translation>Merge selected dives</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="745"/> <source>Renumber dive(s)</source> <translation>Renumber dive(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="746"/> <source>Shift times</source> <translation>Shift times</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="747"/> <source>Load images</source> <translation>Load images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Open image files</source> <translation>Open image files</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -225,59 +225,59 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="30"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="35"/> <source>Export format</source> <translation>Export format</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="42"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="47"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="61"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="66"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="74"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="79"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="84"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="89"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="94"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="99"/> <source>Worldmap</source> <translation>Worldmap</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="112"/> <source>Selection</source> <translation>Selection</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="116"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="121"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="208"/> <source>Selected dives</source> <translation>Selected dives</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="126"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="131"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="234"/> <source>All dives</source> <translation>All dives</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="178"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="183"/> <source>HTML</source> <translation>HTML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="216"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="221"/> <source>Minimum Javascript</source> <translation>Minimum Javascript</translation> </message> @@ -287,87 +287,87 @@ <translation>Export dive log files</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="24"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="29"/> <source>General export</source> <translation>General export</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="184"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>General settings</source> <translation>General settings</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="190"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="195"/> <source>Subsurface numbers</source> <translation>Subsurface numbers</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="239"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export list only</source> <translation>Export list only</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="252"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="257"/> <source>Style options</source> <translation>Style options</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="264"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="269"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="274"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="279"/> <source>Font size</source> <translation>Font size</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="285"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="320"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="323"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="328"/> <source>Theme</source> <translation>Theme</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> <source>Light</source> <translation>Light</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Sand</source> <translation>Sand</translation> </message> @@ -628,42 +628,42 @@ <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="137"/> + <location filename="../qt-ui/diveplanner.cpp" line="135"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="622"/> + <location filename="../qt-ui/diveplanner.cpp" line="634"/> <source>Final depth</source> <translation>Final depth</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="624"/> + <location filename="../qt-ui/diveplanner.cpp" line="636"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="626"/> + <location filename="../qt-ui/diveplanner.cpp" line="638"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="628"/> + <location filename="../qt-ui/diveplanner.cpp" line="640"/> <source>Used gas</source> <translation>Used gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="630"/> + <location filename="../qt-ui/diveplanner.cpp" line="642"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="925"/> + <location filename="../qt-ui/diveplanner.cpp" line="938"/> <source>Discard the plan?</source> <translation>Discard the plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="926"/> + <location filename="../qt-ui/diveplanner.cpp" line="939"/> <source>You are about to discard your plan.</source> <translation>You are about to discard your plan.</translation> </message> @@ -671,17 +671,17 @@ <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="255"/> + <location filename="../qt-ui/diveplanner.cpp" line="254"/> <source>Dive planner points</source> <translation>Dive planner points</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="259"/> + <location filename="../qt-ui/diveplanner.cpp" line="258"/> <source>Available gases</source> <translation>Available gases</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="282"/> + <location filename="../qt-ui/diveplanner.cpp" line="281"/> <source>Add dive data point</source> <translation>Add dive data point</translation> </message> @@ -855,70 +855,70 @@ <translation>internal error</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="636"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="832"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="637"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> <source>Done</source> <translation>Done</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="667"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="668"/> <source>Uploading dive list...</source> <translation>Uploading dive list...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="698"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="699"/> <source>Downloading dive list...</source> <translation>Downloading dive list...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="747"/> <source>Downloading %1 dives...</source> <translation>Downloading %1 dives...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="790"/> <source>Download finished - %1</source> <translation>Download finished - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> <source>Corrupted download</source> <translation>Corrupted download</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> <source>The archive could not be opened: %1</source> <translation>The archive could not be opened: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/> <source>Upload failed</source> <translation>Upload failed</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="850"/> <source>Upload successful</source> <translation>Upload successful</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="853"/> <source>Login failed</source> <translation>Login failed</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="855"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/> <source>Cannot parse response</source> <translation>Cannot parse response</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="867"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="834"/> <source>Upload finished</source> <translation>Upload finished</translation> </message> @@ -1050,7 +1050,7 @@ <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="450"/> <source>Location</source> <translation>Location</translation> </message> @@ -1091,27 +1091,27 @@ </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="415"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Dive notes</source> <translation>Dive notes</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="607"/> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="245"/> <source>Air temp.</source> <translation>Air temp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="626"/> - <location filename="../qt-ui/maintab.cpp" line="245"/> + <location filename="../qt-ui/maintab.cpp" line="246"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="440"/> + <location filename="../qt-ui/maintab.cpp" line="451"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -1228,114 +1228,116 @@ <translation>Photos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="88"/> + <location filename="../qt-ui/maintab.cpp" line="89"/> <source>Cylinders</source> <translation>Cylinders</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="89"/> + <location filename="../qt-ui/maintab.cpp" line="90"/> <source>Add Cylinder</source> <translation>Add Cylinder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="93"/> <source>Weights</source> <translation>Weights</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="93"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Add Weight System</source> <translation>Add Weight System</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="48"/> + <location filename="../qt-ui/maintab.cpp" line="49"/> <source>Save</source> <translation>Save</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="52"/> + <location filename="../qt-ui/maintab.cpp" line="53"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="241"/> + <location filename="../qt-ui/maintab.cpp" line="242"/> <source>Air temp. [%1]</source> <translation>Air temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="242"/> + <location filename="../qt-ui/maintab.cpp" line="243"/> <source>Water temp. [%1]</source> <translation>Water temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="277"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>This trip is being edited.</source> <translation>This trip is being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="284"/> + <location filename="../qt-ui/maintab.cpp" line="285"/> <source>Multiple dives are being edited.</source> <translation>Multiple dives are being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="286"/> + <location filename="../qt-ui/maintab.cpp" line="287"/> <source>This dive is being edited.</source> <translation>This dive is being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="386"/> - <location filename="../qt-ui/maintab.cpp" line="410"/> + <location filename="../qt-ui/maintab.cpp" line="397"/> + <location filename="../qt-ui/maintab.cpp" line="421"/> <source>Trip notes</source> <translation>Trip notes</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="408"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> <source>Trip location</source> <translation>Trip location</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="461"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> - <location filename="../qt-ui/maintab.cpp" line="502"/> - <location filename="../qt-ui/maintab.cpp" line="503"/> - <location filename="../qt-ui/maintab.cpp" line="504"/> + <location filename="../qt-ui/maintab.cpp" line="472"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> + <location filename="../qt-ui/maintab.cpp" line="513"/> + <location filename="../qt-ui/maintab.cpp" line="514"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="463"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="500"/> + <location filename="../qt-ui/maintab.cpp" line="511"/> <source>Deepest dive</source> <translation>Deepest dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="501"/> + <location filename="../qt-ui/maintab.cpp" line="512"/> <source>Shallowest dive</source> <translation>Shallowest dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="556"/> <source>These gases could be mixed from Air and using: </source> - <translation type="unfinished"/> + <translation>These gases could be +mixed from Air and using: +</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="549"/> + <location filename="../qt-ui/maintab.cpp" line="560"/> <source> and </source> - <translation type="unfinished"/> + <translation> and </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="797"/> + <location filename="../qt-ui/maintab.cpp" line="808"/> <source>Discard the changes?</source> <translation>Discard the changes?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="798"/> + <location filename="../qt-ui/maintab.cpp" line="809"/> <source>You are about to discard your changes.</source> <translation>You are about to discard your changes.</translation> </message> @@ -1687,12 +1689,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="446"/> <source>Toggle pO₂ Graph</source> - <translation type="unfinished"/> + <translation>Toggle pO₂ Graph</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="475"/> <source>Toggle pN₂ Graph</source> - <translation type="unfinished"/> + <translation>Toggle pN₂ Graph</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="821"/> @@ -1815,70 +1817,70 @@ p, li { white-space: pre-wrap; } <translation>Please save or cancel the current dive edit before trying to add a dive.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="421"/> + <location filename="../qt-ui/mainwindow.cpp" line="422"/> <source>Print runtime table</source> <translation>Print runtime table</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="516"/> + <location filename="../qt-ui/mainwindow.cpp" line="522"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="701"/> + <location filename="../qt-ui/mainwindow.cpp" line="707"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Do you want to save the changes that you made in the file %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="703"/> + <location filename="../qt-ui/mainwindow.cpp" line="709"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Do you want to save the changes that you made in the data file?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="708"/> + <location filename="../qt-ui/mainwindow.cpp" line="714"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1066"/> + <location filename="../qt-ui/mainwindow.cpp" line="1072"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1190"/> + <location filename="../qt-ui/mainwindow.cpp" line="1196"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1191"/> + <location filename="../qt-ui/mainwindow.cpp" line="1197"/> <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source> <translation>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="709"/> + <location filename="../qt-ui/mainwindow.cpp" line="715"/> <source>Changes will be lost if you don't save them.</source> <translation>Changes will be lost if you don't save them.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="251"/> <location filename="../qt-ui/mainwindow.cpp" line="390"/> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Warning</source> <translation>Warning</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="188"/> - <location filename="../qt-ui/mainwindow.cpp" line="1050"/> + <location filename="../qt-ui/mainwindow.cpp" line="1056"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Please save or cancel the current dive edit before opening a new file.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1067"/> + <location filename="../qt-ui/mainwindow.cpp" line="1073"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Please, first finish the current edition before trying to do another.</translation> </message> @@ -1886,15 +1888,45 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="444"/> + <location filename="../qt-ui/diveplanner.cpp" line="450"/> + <source>ft/min</source> + <translation>ft/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="451"/> <source>Last stop at 20ft</source> <translation>Last stop at 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="451"/> + <location filename="../qt-ui/diveplanner.cpp" line="452"/> + <source>50% avg. depth to 20ft</source> + <translation>50% avg. depth to 20ft</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="453"/> + <source>20ft to surface</source> + <translation>20ft to surface</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="455"/> + <source>m/min</source> + <translation>m/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="456"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="457"/> + <source>50% avg. depth to 6m</source> + <translation>50% avg. depth to 6m</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="458"/> + <source>6m to surface</source> + <translation>6m to surface</translation> + </message> </context> <context> <name>PreferencesDialog</name> @@ -1940,146 +1972,151 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/preferences.ui" line="198"/> + <source>Use default</source> + <translation>Use default</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="247"/> + <location filename="../qt-ui/preferences.ui" line="257"/> <source>Animations</source> <translation>Animations</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="253"/> + <location filename="../qt-ui/preferences.ui" line="263"/> <source>Speed</source> <translation>Speed</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Clear all settings</source> <translation>Clear all settings</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="312"/> + <location filename="../qt-ui/preferences.ui" line="322"/> <source>Reset all settings to their default value</source> <translation>Reset all settings to their default value</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="341"/> + <location filename="../qt-ui/preferences.ui" line="351"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="348"/> + <location filename="../qt-ui/preferences.ui" line="358"/> <source>Metric</source> <translation>Metric</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="358"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="368"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Personalize</source> <translation>Personalize</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="392"/> + <location filename="../qt-ui/preferences.ui" line="402"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="399"/> + <location filename="../qt-ui/preferences.ui" line="409"/> <source>meter</source> <translation>metre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="409"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>feet</source> <translation>feet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="426"/> + <location filename="../qt-ui/preferences.ui" line="436"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="436"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="453"/> + <location filename="../qt-ui/preferences.ui" line="463"/> <source>liter</source> <translation>litre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="463"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="490"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="490"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="507"/> + <location filename="../qt-ui/preferences.ui" line="517"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="772"/> + <location filename="../qt-ui/preferences.ui" line="782"/> <source>System default</source> <translation>System default</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="811"/> + <location filename="../qt-ui/preferences.ui" line="821"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="817"/> + <location filename="../qt-ui/preferences.ui" line="827"/> <source>Proxy type</source> <translation>Proxy type</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="830"/> + <location filename="../qt-ui/preferences.ui" line="840"/> <source>Host</source> <translation>Hostname</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="856"/> + <location filename="../qt-ui/preferences.ui" line="866"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="882"/> + <location filename="../qt-ui/preferences.ui" line="892"/> <source>Requires authentication</source> <translation>Requires authentication</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="912"/> <source>Username</source> <translation>Username</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="925"/> + <location filename="../qt-ui/preferences.ui" line="935"/> <source>Password</source> <translation>Password</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="802"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="419"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>Pressure</source> <translation>Pressure</translation> </message> @@ -2094,82 +2131,82 @@ p, li { white-space: pre-wrap; } <translation>Default dive log file</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="207"/> + <location filename="../qt-ui/preferences.ui" line="217"/> <source>Display invalid</source> <translation>Display invalid</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="224"/> + <location filename="../qt-ui/preferences.ui" line="234"/> <source>Default cylinder</source> <translation>Default cylinder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="230"/> + <location filename="../qt-ui/preferences.ui" line="240"/> <source>Use default cylinder</source> <translation>Use default cylinder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="280"/> + <location filename="../qt-ui/preferences.ui" line="290"/> <source>Subsurface web service</source> <translation>Subsurface web service</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="286"/> + <location filename="../qt-ui/preferences.ui" line="296"/> <source>Default user ID</source> <translation>Default user ID</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Save user ID locally?</source> <translation>Save user ID locally?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="446"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="473"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>Temperature</source> <translation>Temperature</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="500"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="517"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="532"/> + <location filename="../qt-ui/preferences.ui" line="542"/> <source>Time units</source> <translation>Time units</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="545"/> + <location filename="../qt-ui/preferences.ui" line="555"/> <source>Minutes</source> <translation>Minutes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="555"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Seconds</source> <translation>Seconds</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="587"/> + <location filename="../qt-ui/preferences.ui" line="597"/> <source>Show</source> <translation>Show</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="756"/> + <location filename="../qt-ui/preferences.ui" line="766"/> <source>GFLow at max depth</source> <translation>GFLow at max depth</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="716"/> + <location filename="../qt-ui/preferences.ui" line="726"/> <source>Misc</source> <translation>Misc</translation> </message> @@ -2179,52 +2216,52 @@ p, li { white-space: pre-wrap; } <translation>Preferences</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="538"/> + <location filename="../qt-ui/preferences.ui" line="548"/> <source>Ascent/descent speed denominator</source> <translation>Ascent/descent speed denominator</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="598"/> + <location filename="../qt-ui/preferences.ui" line="608"/> <source>Threshold when showing pO₂</source> <translation>Threshold when showing pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="619"/> + <location filename="../qt-ui/preferences.ui" line="629"/> <source>Threshold when showing pN₂</source> <translation>Threshold when showing pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="640"/> + <location filename="../qt-ui/preferences.ui" line="650"/> <source>Threshold when showing pHe</source> <translation>Threshold when showing pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="661"/> + <location filename="../qt-ui/preferences.ui" line="671"/> <source>Max pO₂ when showing MOD</source> <translation>Max pO₂ when showing MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="682"/> + <location filename="../qt-ui/preferences.ui" line="692"/> <source>Draw dive computer reported ceiling red</source> <translation>Draw dive computer reported ceiling red</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="693"/> + <location filename="../qt-ui/preferences.ui" line="703"/> <source>Show unused cylinders in Equipment tab</source> <translation>Show unused cylinders in Equipment tab</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="704"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Show average depth</source> <translation>Show average depth</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="722"/> + <location filename="../qt-ui/preferences.ui" line="732"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="739"/> + <location filename="../qt-ui/preferences.ui" line="749"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> @@ -2249,32 +2286,32 @@ p, li { white-space: pre-wrap; } <translation>SOCKS proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="245"/> + <location filename="../qt-ui/preferences.cpp" line="247"/> <source>Restart required</source> <translation>Restart required</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="246"/> + <location filename="../qt-ui/preferences.cpp" line="248"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>To correctly load a new language you must restart Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="395"/> + <location filename="../qt-ui/preferences.cpp" line="398"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Open default log file</source> <translation>Open default log file</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="394"/> + <location filename="../qt-ui/preferences.cpp" line="397"/> <source>Warning</source> <translation>Warning</translation> </message> @@ -2369,51 +2406,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/printoptions.ui" line="145"/> + <source>1 dive per page</source> + <translation>1 dive per page</translation> + </message> + <message> + <location filename="../qt-ui/printoptions.ui" line="158"/> <source>Table print</source> <translation>Table print</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="162"/> + <location filename="../qt-ui/printoptions.ui" line="175"/> <source>Ordering</source> <translation>Ordering</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="180"/> + <location filename="../qt-ui/printoptions.ui" line="193"/> <source>Profile on top</source> <translation>Profile on top</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="202"/> + <location filename="../qt-ui/printoptions.ui" line="215"/> <source>Notes on top</source> <translation>Notes on top</translation> </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="219"/> - <source>Sizing heights (% of layout)</source> - <translation>Sizing heights (% of layout)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="256"/> - <source>Profile height (43% - 85%)</source> - <translation>Profile height (43% - 85%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="278"/> - <source>Other data height (8% - 17%)</source> - <translation>Other data height (8% - 17%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="338"/> - <source>Notes height (0% - 52%)</source> - <translation>Notes height (0% - 52%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="354"/> - <location filename="../qt-ui/printoptions.ui" line="370"/> - <location filename="../qt-ui/printoptions.ui" line="386"/> - <source>0</source> - <translation>0</translation> - </message> </context> <context> <name>ProfilePrintModel</name> @@ -2491,77 +2506,77 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="520"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="515"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="898"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="895"/> <source>Make first divecomputer</source> <translation>Make first dive computer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="900"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="897"/> <source>Delete this divecomputer</source> <translation>Delete this dive computer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="907"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/> <source>Add gas change</source> <translation>Add gas change</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="918"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="915"/> <source>Add bookmark</source> <translation>Add bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="922"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="919"/> <source>Remove event</source> <translation>Remove event</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/> <source>Hide similar events</source> <translation>Hide similar events</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="930"/> <source>Edit name</source> <translation>Edit name</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="947"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="944"/> <source>Unhide all events</source> <translation>Unhide all events</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide events</source> <translation>Hide events</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide all %1 events?</source> <translation>Hide all %1 events?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1016"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1013"/> <source>Remove the selected event?</source> <translation>Remove the selected event?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1017"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1014"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1082"/> <source>Edit name of bookmark</source> <translation>Edit name of bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1086"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1083"/> <source>Custom name:</source> <translation>Custom name:</translation> </message> @@ -2574,7 +2589,7 @@ p, li { white-space: pre-wrap; } <translation>AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="212"/> + <location filename="../qt-ui/diveplanner.cpp" line="210"/> <source>Remove this point</source> <translation>Remove this point</translation> </message> @@ -2644,22 +2659,22 @@ p, li { white-space: pre-wrap; } <translation>cuft</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/> <source>Invalid response from server</source> <translation>Invalid response from server</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="529"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Expected XML tag 'DiveDateReader', got instead '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="575"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Expected XML tag 'DiveDates' not found</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> <source>Malformed XML response. Line %1: %2</source> <translation>Malformed XML response. Line %1: %2</translation> </message> @@ -2824,42 +2839,47 @@ p, li { white-space: pre-wrap; } <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="337"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="338"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="401"/> <source>Connecting...</source> <translation>Connecting...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="420"/> <source>Download finished</source> <translation>Download finished</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="433"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="434"/> <source>Download error: %1</source> <translation>Download error: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/> <source>Connection error: </source> <translation>Connection error: </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/> <source>Download successful</source> <translation>Download successful</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="447"/> <source>Invalid user identifier!</source> <translation>Invalid user identifier!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="321"/> + <source>Enter User ID and click Download</source> + <translation>Enter User ID and click download</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/> <source>Cannot parse response!</source> <translation>Cannot parse response!</translation> </message> @@ -2901,42 +2921,42 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="35"/> + <location filename="../qt-ui/updatemanager.cpp" line="33"/> <source>Check for updates.</source> <translation>Check for updates.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <location filename="../qt-ui/updatemanager.cpp" line="34"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface was unable to check for updates.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="41"/> + <location filename="../qt-ui/updatemanager.cpp" line="39"/> <source>The following error occurred:</source> <translation>The following error occurred:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <location filename="../qt-ui/updatemanager.cpp" line="40"/> <source>Please check your internet connection.</source> <translation>Please check your internet connection.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="51"/> + <location filename="../qt-ui/updatemanager.cpp" line="49"/> <source>You are using the latest version of subsurface.</source> <translation>You are using the latest version of subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="53"/> + <location filename="../qt-ui/updatemanager.cpp" line="51"/> <source>A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="56"/> + <location filename="../qt-ui/updatemanager.cpp" line="54"/> <source><b>A new version of subsurface is available.</b><br/><br/>%1</source> <translation><b>A new version of subsurface is available.</b><br/><br/>%1</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="57"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>There was an error while trying to check for updates.<br/><br/>%1</translation> </message> @@ -2949,8 +2969,8 @@ p, li { white-space: pre-wrap; } <translation>User Manual</translation> </message> <message> - <location filename="../qt-ui/usermanual.cpp" line="70"/> - <location filename="../qt-ui/usermanual.cpp" line="76"/> + <location filename="../qt-ui/usermanual.cpp" line="72"/> + <location filename="../qt-ui/usermanual.cpp" line="78"/> <source>Cannot find the Subsurface manual</source> <translation>Cannot find the Subsurface manual</translation> </message> @@ -3039,27 +3059,27 @@ Language: %1</source> Language: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="74"/> + <location filename="../qt-ui/usersurvey.cpp" line="72"/> <source>Should we ask you later?</source> <translation>Should we ask you later?</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="75"/> + <location filename="../qt-ui/usersurvey.cpp" line="73"/> <source>Don't ask me again</source> <translation>Don't ask me again</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="76"/> + <location filename="../qt-ui/usersurvey.cpp" line="74"/> <source>Ask later</source> <translation>Ask later</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="96"/> + <location filename="../qt-ui/usersurvey.cpp" line="94"/> <source>Submit user survey.</source> <translation>Submit user survey.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="77"/> + <location filename="../qt-ui/usersurvey.cpp" line="75"/> <source>Ask again?</source> <translation>Ask again?</translation> </message> @@ -3071,27 +3091,27 @@ OS CPU Architecture: %1</source> OS CPU Architecture: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="97"/> + <location filename="../qt-ui/usersurvey.cpp" line="95"/> <source>Subsurface was unable to submit the user survey.</source> <translation>Subsurface was unable to submit the user survey.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="102"/> + <location filename="../qt-ui/usersurvey.cpp" line="100"/> <source>The following error occurred:</source> <translation>The following error occurred:</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="103"/> + <location filename="../qt-ui/usersurvey.cpp" line="101"/> <source>Please check your internet connection.</source> <translation>Please check your internet connection.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="112"/> + <location filename="../qt-ui/usersurvey.cpp" line="110"/> <source>Survey successfully submitted.</source> <translation>Survey successfully submitted.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="117"/> + <location filename="../qt-ui/usersurvey.cpp" line="115"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>There was an error while trying to check for updates.<br/><br/>%1</translation> </message> @@ -3271,13 +3291,13 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="128"/> - <location filename="../qt-gui.cpp" line="323"/> + <location filename="../qt-gui.cpp" line="329"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="132"/> - <location filename="../qt-gui.cpp" line="326"/> + <location filename="../qt-gui.cpp" line="332"/> <source>psi</source> <translation>psi</translation> </message> @@ -3288,16 +3308,16 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="203"/> - <location filename="../qt-gui.cpp" line="205"/> - <location filename="../qt-gui.cpp" line="220"/> + <location filename="../qt-gui.cpp" line="211"/> + <location filename="../qt-gui.cpp" line="226"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="208"/> - <location filename="../qt-gui.cpp" line="208"/> - <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="214"/> + <location filename="../qt-gui.cpp" line="228"/> <source>ft</source> <translation>ft</translation> </message> @@ -3323,15 +3343,15 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="259"/> - <location filename="../qt-gui.cpp" line="231"/> - <location filename="../qt-gui.cpp" line="241"/> + <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="247"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="263"/> - <location filename="../qt-gui.cpp" line="229"/> - <location filename="../qt-gui.cpp" line="239"/> + <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="245"/> <source>kg</source> <translation>kg</translation> </message> @@ -3341,36 +3361,36 @@ Maximum</translation> <translation>(%s) or (%s)</translation> </message> <message> - <location filename="../divelist.c" line="467"/> - <location filename="../equipment.c" line="104"/> - <location filename="../planner.c" line="986"/> - <location filename="../planner.c" line="989"/> + <location filename="../divelist.c" line="460"/> + <location filename="../equipment.c" line="79"/> + <location filename="../planner.c" line="988"/> + <location filename="../planner.c" line="991"/> <location filename="../statistics.c" line="355"/> <source>air</source> <translation>air</translation> </message> <message> - <location filename="../equipment.c" line="210"/> + <location filename="../equipment.c" line="185"/> <source>integrated</source> <translation>integrated</translation> </message> <message> - <location filename="../equipment.c" line="211"/> + <location filename="../equipment.c" line="186"/> <source>belt</source> <translation>belt</translation> </message> <message> - <location filename="../equipment.c" line="212"/> + <location filename="../equipment.c" line="187"/> <source>ankle</source> <translation>ankle</translation> </message> <message> - <location filename="../equipment.c" line="213"/> + <location filename="../equipment.c" line="188"/> <source>backplate weight</source> <translation>backplate weight</translation> </message> <message> - <location filename="../equipment.c" line="214"/> + <location filename="../equipment.c" line="189"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -3681,131 +3701,130 @@ Maximum</translation> <translation>Can't open stylesheet %s</translation> </message> <message> - <location filename="../equipment.c" line="106"/> + <location filename="../equipment.c" line="81"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="159"/> - <location filename="../planner.c" line="761"/> + <location filename="../planner.c" line="763"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> <message> - <location filename="../planner.c" line="345"/> + <location filename="../planner.c" line="347"/> <source>Too many gas mixes</source> <translation>Too many gas mixes</translation> </message> <message> - <location filename="../planner.c" line="526"/> + <location filename="../planner.c" line="528"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON IT, WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</translation> </message> <message> - <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="537"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>based on GFlow = %d and GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="538"/> + <location filename="../planner.c" line="540"/> <source>Subsurface dive plan</source> <translation>Subsurface dive plan</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="544"/> <source>depth</source> <translation>depth</translation> </message> <message> - <location filename="../planner.c" line="545"/> + <location filename="../planner.c" line="547"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="548"/> + <location filename="../planner.c" line="550"/> <source>duration</source> <translation>duration</translation> </message> <message> - <location filename="../planner.c" line="551"/> + <location filename="../planner.c" line="553"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="585"/> + <location filename="../planner.c" line="587"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../planner.c" line="595"/> + <location filename="../planner.c" line="597"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../planner.c" line="606"/> + <location filename="../planner.c" line="608"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="609"/> - <location filename="../planner.c" line="613"/> + <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="615"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="629"/> + <location filename="../planner.c" line="631"/> <source>Switch gas to %s</source> <translation>Switch gas to %s</translation> </message> <message> - <location filename="../planner.c" line="642"/> + <location filename="../planner.c" line="644"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="644"/> + <location filename="../planner.c" line="646"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="649"/> <source>Gas consumption:</source> <translation>Gas consumption:</translation> </message> <message> - <location filename="../planner.c" line="667"/> - <location filename="../planner.c" line="672"/> - <location filename="../planner.c" line="695"/> + <location filename="../planner.c" line="669"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="697"/> <source>Warning:</source> <translation>Warning:</translation> </message> <message> - <location filename="../planner.c" line="668"/> + <location filename="../planner.c" line="670"/> <source>this is more gas than available in the specified cylinder!</source> <translation>this is more gas than available in the specified cylinder!</translation> </message> <message> - <location filename="../planner.c" line="673"/> + <location filename="../planner.c" line="675"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>not enough reserve for gas sharing on ascent!</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="677"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="679"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s during planned ascent) of %s</translation> </message> <message> - <location filename="../planner.c" line="692"/> + <location filename="../planner.c" line="694"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="990"/> + <location filename="../planner.c" line="992"/> <source>ean</source> <translation>ean</translation> </message> @@ -4040,22 +4059,22 @@ EADD: %d%s <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="281"/> + <location filename="../qt-gui.cpp" line="287"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="284"/> + <location filename="../qt-gui.cpp" line="290"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="417"/> + <location filename="../qt-gui.cpp" line="427"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dives)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="422"/> + <location filename="../qt-gui.cpp" line="432"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 dive)</translation> </message> @@ -4205,97 +4224,97 @@ EADD: %d%s <translation>(no dives)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sun</source> <translation>Sun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Mon</source> <translation>Mon</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Tue</source> <translation>Tue</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Wed</source> <translation>Wed</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Thu</source> <translation>Thu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Fri</source> <translation>Fri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sat</source> <translation>Sat</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>May</source> <translation>May</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -4617,21 +4636,6 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/plannerSettings.ui" line="94"/> - <source>75%-50% avg. depth</source> - <translation>75%-50% avg. depth</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="111"/> - <source>50% avg. depth - 6m/20ft</source> - <translation>50% avg. depth - 6m/20ft</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="128"/> - <source>6m/20ft to surface</source> - <translation>6m/20ft to surface</translation> - </message> - <message> <location filename="../qt-ui/plannerSettings.ui" line="148"/> <source>Descent</source> <translation>Descent</translation> @@ -4663,8 +4667,8 @@ Is the Uemis Zurich plugged in correctly?</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="288"/> - <source>Last Stop at 6m/20ft</source> - <translation>Last Stop at 6m/20ft</translation> + <source>Last stop at 6m</source> + <translation>Last stop at 6m</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="295"/> @@ -4728,6 +4732,21 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>bar</translation> </message> <message> + <location filename="../qt-ui/plannerSettings.ui" line="94"/> + <source>75% to 50% avg. depth</source> + <translation>75% to 50% avg. depth</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="111"/> + <source>50% avg. depth to 6m</source> + <translation>50% avg. depth to 6m</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="128"/> + <source>6m to surface</source> + <translation>6m to surface</translation> + </message> + <message> <location filename="../qt-ui/plannerSettings.ui" line="442"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>In dive plan, show runtime (absolute time) of stops</translation> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index caeedf8bc..228b8230b 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -55,7 +55,7 @@ <message> <location filename="../qt-ui/models.cpp" line="366"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> - <translation type="unfinished"/> + <translation>Ce mélange est utilisé. Seuls les blocs qui ne sont pas utilisés dans la plongée peuvent être retirés.</translation> </message> </context> <context> @@ -63,7 +63,7 @@ <message> <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/> <source>Remove the selected dive computer?</source> - <translation type="unfinished"/> + <translation>Retirer l'ordinateur de plongée sélectionné?</translation> </message> <message> <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/> @@ -75,7 +75,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/divecomputermanagementdialog.ui" line="17"/> <source>Edit dive computer nicknames</source> - <translation type="unfinished"/> + <translation>Éditer les noms des ordinateurs de plongée</translation> </message> </context> <context> @@ -98,24 +98,24 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/models.cpp" line="1452"/> <source>Clicking here will remove this dive computer.</source> - <translation type="unfinished"/> + <translation>Cliquer ici enlèvera cet ordinateur</translation> </message> </context> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="107"/> <source>Bailing out to OC</source> <translation>Passer en CO</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="103"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="109"/> <source> begin</source> <comment>Starts with space!</comment> <translation> début</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="104"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="110"/> <source> end</source> <comment>Starts with space!</comment> <translation> fin</translation> @@ -134,240 +134,240 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/divelistview.cpp" line="53"/> <source>Show search box</source> - <translation type="unfinished"/> + <translation>Afficher la fenêtre de recherche</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="705"/> + <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>Expand all</source> <translation>Tout déplier</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="706"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>Collapse all</source> <translation>Tout replier</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="707"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>Collapse others</source> - <translation type="unfinished"/> + <translation>Replier les autres</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="709"/> + <location filename="../qt-ui/divelistview.cpp" line="711"/> <source>Remove dive(s) from trip</source> - <translation type="unfinished"/> + <translation>Supprimer la (les) plongée(s) du voyage</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="712"/> <source>Create new trip above</source> <translation>Créer un nouveau groupe au-dessus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>Add dive(s) to trip immediately above</source> - <translation type="unfinished"/> + <translation>Ajouter la(les) plongée(s) au voyage immédiatement au dessus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="726"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>Add dive(s) to trip immediately below</source> - <translation type="unfinished"/> + <translation>Ajouter la(les) plongée(s) au voyage immédiatement au dessous</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>Merge trip with trip above</source> <translation>Fusionner le groupe avec le groupe au dessus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="731"/> + <location filename="../qt-ui/divelistview.cpp" line="733"/> <source>Merge trip with trip below</source> <translation>Fusionner le groupe avec le groupe en dessous</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="737"/> <source>Delete dive(s)</source> - <translation type="unfinished"/> + <translation>Effacer la (les) plongée(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="737"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>Mark dive(s) invalid</source> - <translation type="unfinished"/> + <translation>Invalider la (les) plongée(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="741"/> + <location filename="../qt-ui/divelistview.cpp" line="743"/> <source>Merge selected dives</source> - <translation type="unfinished"/> + <translation>Fusionner les plongées sélectionnées</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="745"/> <source>Renumber dive(s)</source> - <translation type="unfinished"/> + <translation>Renuméroter les plongées</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="746"/> <source>Shift times</source> - <translation type="unfinished"/> + <translation>Heure de changement</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="747"/> <source>Load images</source> - <translation type="unfinished"/> + <translation>Charger les images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Open image files</source> - <translation type="unfinished"/> + <translation>Ouvrir les fichiers images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> - <translation type="unfinished"/> + <translation>Fichier d'images (</translation> </message> </context> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="30"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="35"/> <source>Export format</source> <translation>Format d'exportation</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="42"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="47"/> <source>Subsurface XML</source> <translation>XML Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="61"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="66"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="74"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="79"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="84"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="89"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="94"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="99"/> <source>Worldmap</source> - <translation type="unfinished"/> + <translation>Mappemonde</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="112"/> <source>Selection</source> - <translation type="unfinished"/> + <translation>Sélection</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="116"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="121"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="208"/> <source>Selected dives</source> <translation>Plongées sélectionnées</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="126"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="131"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="234"/> <source>All dives</source> <translation>Toutes les plongées</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="178"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="183"/> <source>HTML</source> <translation>HTML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="216"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="221"/> <source>Minimum Javascript</source> - <translation type="unfinished"/> + <translation>Version minimum de Javascript</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="14"/> <source>Export dive log files</source> - <translation type="unfinished"/> + <translation>Exporter les fichiers de plongées</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="24"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="29"/> <source>General export</source> - <translation type="unfinished"/> + <translation>Export générale</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="184"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>General settings</source> - <translation type="unfinished"/> + <translation>Préférences générales</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="190"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="195"/> <source>Subsurface numbers</source> - <translation type="unfinished"/> + <translation>Nombres Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="239"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export list only</source> - <translation type="unfinished"/> + <translation>Export de liste uniquement</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="252"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="257"/> <source>Style options</source> - <translation type="unfinished"/> + <translation>Options de style</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="264"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="269"/> <source>Font</source> <translation>Police</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="274"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="279"/> <source>Font size</source> <translation>Taille de police</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="285"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="320"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="323"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="328"/> <source>Theme</source> - <translation type="unfinished"/> + <translation>Thème</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> <source>Light</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Sand</source> <translation>Sable</translation> </message> @@ -384,42 +384,42 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="58"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> - <translation type="unfinished"/> + <translation>Format générique utilisé pour l'échange de données entre plusieurs logiciels de plongée</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="60"/> <source>Comma separated values that include the most relevant information of the dive profile.</source> - <translation type="unfinished"/> + <translation>Valeurs séparées par des virgules, qui incluent les informations les plus pertinentes du profile de plongée </translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="62"/> <source>Send the dive data to divelogs.de website.</source> - <translation type="unfinished"/> + <translation>Envoyer les données de la plongée au site divelogs.de</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="64"/> <source>HTML export of the dive locations, visualized on a world map.</source> - <translation type="unfinished"/> + <translation>Export HTML des lieux de plongées, indiqués sur la carte du monde</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="66"/> <source>Subsurface native XML format.</source> - <translation type="unfinished"/> + <translation>Format XML natif Subsurface</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="157"/> <source>Export UDDF file as</source> - <translation type="unfinished"/> + <translation>Exporter le fichier UDDF en</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="161"/> <source>Export CSV file as</source> - <translation type="unfinished"/> + <translation>Exporter le fichier CSV en</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="166"/> <source>Export world map</source> - <translation type="unfinished"/> + <translation>Exporter la carte mondiale</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/> @@ -430,12 +430,12 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="171"/> <source>Export Subsurface XML</source> - <translation type="unfinished"/> + <translation>Exporter vers fichier XML Subsurface</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="172"/> <source>XML files (*.xml *.ssrf)</source> - <translation type="unfinished"/> + <translation>Fichiers XML (*.xml *.ssrf)</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="180"/> @@ -494,12 +494,12 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="165"/> <source>NDL</source> - <translation type="unfinished"/> + <translation>LND</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="185"/> <source>TTS</source> - <translation type="unfinished"/> + <translation>DTR</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="205"/> @@ -510,7 +510,7 @@ l'ordinateur de plongée sélectionné ?</translation> <location filename="../qt-ui/divelogimportdialog.ui" line="231"/> <location filename="../qt-ui/divelogimportdialog.ui" line="538"/> <source>Field separator</source> - <translation type="unfinished"/> + <translation>Séparateur de champs</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="259"/> @@ -574,7 +574,7 @@ l'ordinateur de plongée sélectionné ?</translation> <location filename="../qt-ui/divelogimportdialog.ui" line="35"/> <location filename="../qt-ui/divelogimportdialog.ui" line="325"/> <source>Field configuration</source> - <translation type="unfinished"/> + <translation>Configuration des champs</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="382"/> @@ -607,12 +607,12 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/diveplanner.ui" line="106"/> <source>Planned dive time</source> - <translation type="unfinished"/> + <translation>Durée de plongée planifiée</translation> </message> <message> <location filename="../qt-ui/diveplanner.ui" line="141"/> <source>ATM pressure</source> - <translation type="unfinished"/> + <translation>Pression atmosphérique</translation> </message> <message> <location filename="../qt-ui/diveplanner.ui" line="148"/> @@ -628,42 +628,42 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="137"/> + <location filename="../qt-ui/diveplanner.cpp" line="135"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="622"/> + <location filename="../qt-ui/diveplanner.cpp" line="634"/> <source>Final depth</source> - <translation type="unfinished"/> + <translation>Profondeur finale</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="624"/> + <location filename="../qt-ui/diveplanner.cpp" line="636"/> <source>Run time</source> <translation>Temps de fonctionnement</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="626"/> + <location filename="../qt-ui/diveplanner.cpp" line="638"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="628"/> + <location filename="../qt-ui/diveplanner.cpp" line="640"/> <source>Used gas</source> - <translation type="unfinished"/> + <translation>Gaz utilisé</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="630"/> + <location filename="../qt-ui/diveplanner.cpp" line="642"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="925"/> + <location filename="../qt-ui/diveplanner.cpp" line="938"/> <source>Discard the plan?</source> - <translation type="unfinished"/> + <translation>Abandonner le plan ?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="926"/> + <location filename="../qt-ui/diveplanner.cpp" line="939"/> <source>You are about to discard your plan.</source> <translation>Vous allez annuler la planification.</translation> </message> @@ -671,19 +671,19 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="255"/> + <location filename="../qt-ui/diveplanner.cpp" line="254"/> <source>Dive planner points</source> - <translation type="unfinished"/> + <translation>Points du plannificateur</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="259"/> + <location filename="../qt-ui/diveplanner.cpp" line="258"/> <source>Available gases</source> <translation>Gaz disponibles</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="282"/> + <location filename="../qt-ui/diveplanner.cpp" line="281"/> <source>Add dive data point</source> - <translation type="unfinished"/> + <translation>Ajouter un point de donnée</translation> </message> </context> <context> @@ -741,12 +741,12 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/> <source>User entered</source> - <translation type="unfinished"/> + <translation>Entré par l'utilisateur</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/> <source>Cylinder index</source> - <translation type="unfinished"/> + <translation>index de la bouteille</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/> @@ -784,7 +784,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/models.cpp" line="1308"/> <source>Mins</source> - <translation type="unfinished"/> + <translation>Mins</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1317"/> @@ -799,7 +799,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/models.cpp" line="1332"/> <source>Max CNS</source> - <translation type="unfinished"/> + <translation>SNC max</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1335"/> @@ -842,7 +842,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/> <source>cannot create temporary file: %s</source> - <translation>Impossible d'ouvrir le fichier temporaire: %s</translation> + <translation>Impossible de créer le fichier temporaire: %s</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="163"/> @@ -855,70 +855,70 @@ l'ordinateur de plongée sélectionné ?</translation> <translation>Erreur interne</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="636"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="832"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="637"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> <source>Done</source> <translation>Terminé</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="667"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="668"/> <source>Uploading dive list...</source> <translation>Téléchargement de la liste des plongées</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="698"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="699"/> <source>Downloading dive list...</source> <translation>Téléchargement de la liste des plongées</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="747"/> <source>Downloading %1 dives...</source> <translation>%1 plongées en cours de téléchargement</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="790"/> <source>Download finished - %1</source> <translation>Téléchargement terminé - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> <source>Corrupted download</source> <translation>Téléchargement corrompu</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> <source>The archive could not be opened: %1</source> <translation>L'archive ne peut pas être ouverte: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/> <source>Upload failed</source> <translation>Echec du téléchargement</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="850"/> <source>Upload successful</source> <translation>Téléchargement terminé avec succès</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="853"/> <source>Login failed</source> <translation>Echec de connexion</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="855"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/> <source>Cannot parse response</source> <translation>Impossible d'analyser la réponse</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="867"/> <source>Error: %1</source> <translation>Erreur: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="834"/> <source>Upload finished</source> <translation>Téléchargement terminé</translation> </message> @@ -988,7 +988,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/> <source>Download from dive computer</source> - <translation type="unfinished"/> + <translation>Télécharger depuis l'ordinateur de plongée</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/> @@ -998,7 +998,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/> <source>Dive computer</source> - <translation type="unfinished"/> + <translation>Ordinateur de plongée</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/> @@ -1043,14 +1043,14 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/globe.cpp" line="120"/> <source>Edit selected dive locations</source> - <translation type="unfinished"/> + <translation>Éditer les lieux de plongée sélectionnés </translation> </message> </context> <context> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="450"/> <source>Location</source> <translation>Lieu</translation> </message> @@ -1091,27 +1091,27 @@ l'ordinateur de plongée sélectionné ?</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="415"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Dive notes</source> - <translation type="unfinished"/> + <translation>Notes de plongée</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="607"/> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="245"/> <source>Air temp.</source> - <translation type="unfinished"/> + <translation>Température de l'air</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="626"/> - <location filename="../qt-ui/maintab.cpp" line="245"/> + <location filename="../qt-ui/maintab.cpp" line="246"/> <source>Water temp.</source> - <translation type="unfinished"/> + <translation>Température de l'eau</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="440"/> + <location filename="../qt-ui/maintab.cpp" line="451"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -1123,37 +1123,37 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/maintab.ui" line="474"/> <source>Gases used</source> - <translation type="unfinished"/> + <translation>Gaz utilisés</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="493"/> <source>Gas consumed</source> - <translation type="unfinished"/> + <translation>Gaz consommé</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="531"/> <source>Max. depth</source> - <translation type="unfinished"/> + <translation>Profondeur Max.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="588"/> <source>Air pressure</source> - <translation type="unfinished"/> + <translation>Pression de l'air</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="645"/> <source>Dive time</source> - <translation type="unfinished"/> + <translation>Temps de plongée</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="816"/> <source>Total time</source> - <translation type="unfinished"/> + <translation>Temps total</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="874"/> <source>Gas consumption</source> - <translation type="unfinished"/> + <translation>Consommation de gaz</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="299"/> @@ -1169,7 +1169,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/maintab.ui" line="391"/> <source>Dive info</source> - <translation type="unfinished"/> + <translation>Info de la plongée</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="455"/> @@ -1185,7 +1185,7 @@ l'ordinateur de plongée sélectionné ?</translation> <message> <location filename="../qt-ui/maintab.ui" line="550"/> <source>Avg. depth</source> - <translation type="unfinished"/> + <translation>Profondeur moyenne</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="569"/> @@ -1228,97 +1228,97 @@ l'ordinateur de plongée sélectionné ?</translation> <translation>Photos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="88"/> + <location filename="../qt-ui/maintab.cpp" line="89"/> <source>Cylinders</source> <translation>Blocs</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="89"/> + <location filename="../qt-ui/maintab.cpp" line="90"/> <source>Add Cylinder</source> <translation>Ajouter un bloc</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="93"/> <source>Weights</source> <translation>Poids</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="93"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Add Weight System</source> <translation>Ajouter un système de poids</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="48"/> + <location filename="../qt-ui/maintab.cpp" line="49"/> <source>Save</source> <translation>Sauvegarder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="52"/> + <location filename="../qt-ui/maintab.cpp" line="53"/> <source>Cancel</source> <translation>Annuler</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="241"/> + <location filename="../qt-ui/maintab.cpp" line="242"/> <source>Air temp. [%1]</source> - <translation type="unfinished"/> + <translation>Température de l'air. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="242"/> + <location filename="../qt-ui/maintab.cpp" line="243"/> <source>Water temp. [%1]</source> - <translation type="unfinished"/> + <translation>Température de l'eau. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="277"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>This trip is being edited.</source> - <translation>Ce groupe est en train d'être édité.</translation> + <translation>Ce voyage est en train d'être édité.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="284"/> + <location filename="../qt-ui/maintab.cpp" line="285"/> <source>Multiple dives are being edited.</source> <translation>Plusieurs plongées sont en train d'être éditées.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="286"/> + <location filename="../qt-ui/maintab.cpp" line="287"/> <source>This dive is being edited.</source> <translation>Cette plongée est en train d'être éditée.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="386"/> - <location filename="../qt-ui/maintab.cpp" line="410"/> + <location filename="../qt-ui/maintab.cpp" line="397"/> + <location filename="../qt-ui/maintab.cpp" line="421"/> <source>Trip notes</source> - <translation type="unfinished"/> + <translation>Info sur le voyage</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="408"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> <source>Trip location</source> - <translation type="unfinished"/> + <translation>Lieu du voyage</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="461"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> - <location filename="../qt-ui/maintab.cpp" line="502"/> - <location filename="../qt-ui/maintab.cpp" line="503"/> - <location filename="../qt-ui/maintab.cpp" line="504"/> + <location filename="../qt-ui/maintab.cpp" line="472"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> + <location filename="../qt-ui/maintab.cpp" line="513"/> + <location filename="../qt-ui/maintab.cpp" line="514"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="463"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="500"/> + <location filename="../qt-ui/maintab.cpp" line="511"/> <source>Deepest dive</source> - <translation type="unfinished"/> + <translation>Plongée la plus profonde</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="501"/> + <location filename="../qt-ui/maintab.cpp" line="512"/> <source>Shallowest dive</source> - <translation type="unfinished"/> + <translation>Plongée la moins profonde</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="556"/> <source>These gases could be mixed from Air and using: </source> @@ -1327,17 +1327,17 @@ mélangés à partir de l'air avec: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="549"/> + <location filename="../qt-ui/maintab.cpp" line="560"/> <source> and </source> <translation>et</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="797"/> + <location filename="../qt-ui/maintab.cpp" line="808"/> <source>Discard the changes?</source> - <translation type="unfinished"/> + <translation>Abandonner les modifications ?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="798"/> + <location filename="../qt-ui/maintab.cpp" line="809"/> <source>You are about to discard your changes.</source> <translation>Vous allez perdre les modifications non enregistrées</translation> </message> @@ -1352,37 +1352,37 @@ mélangés à partir de l'air avec: <message> <location filename="../qt-ui/mainwindow.ui" line="128"/> <source>Toggle pHe graph</source> - <translation type="unfinished"/> + <translation>basculer l'affichage du graphique pHe</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="154"/> <source>Toggle calculating all tissues</source> - <translation type="unfinished"/> + <translation>activer la calcul de tout les compartiments</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="183"/> <source>Toggle DC reported ceiling</source> - <translation type="unfinished"/> + <translation>Afficher le plafond de l'ordinateur</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="212"/> <source>Toggle calculated ceiling</source> - <translation type="unfinished"/> + <translation>Afficher le plafond calculé</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="238"/> <source>Toggle NDL, TTS</source> - <translation type="unfinished"/> + <translation>Afficher LND / DTR</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="264"/> <source>Toggle calculated ceiling with 3m increments</source> - <translation type="unfinished"/> + <translation>Afficher le plafond calculé avec un incrémente de 3m</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="290"/> <source>Toggle heart rate</source> - <translation type="unfinished"/> + <translation>Afficher le rythme cardiaque</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="316"/> @@ -1392,27 +1392,27 @@ mélangés à partir de l'air avec: <message> <location filename="../qt-ui/mainwindow.ui" line="342"/> <source>Toggle EAD, END, EADD</source> - <translation type="unfinished"/> + <translation>Afficher PEA, PEEA, PEDA</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="368"/> <source>Toggle SAC rate</source> - <translation type="unfinished"/> + <translation>Afficher la consommation d'air</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="420"/> <source>Toggle ruler</source> - <translation type="unfinished"/> + <translation>afficher la règle</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="501"/> <source>Toggle viewing picture thumbnails</source> - <translation type="unfinished"/> + <translation>Activer l'affichage des image en miniature</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="593"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p><span style=" font-weight:600;">Détails du plan de plongée</span></p></body></html></translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="609"/> @@ -1531,7 +1531,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Import &GPS data from Subsurface web service</source> - <translation type="unfinished"/> + <translation>Importer les données &GPS depuis le service web Subsurface</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="890"/> @@ -1541,7 +1541,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="898"/> <source>&Info</source> - <translation type="unfinished"/> + <translation>&Informations</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="906"/> @@ -1551,17 +1551,17 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="922"/> <source>&Next DC</source> - <translation type="unfinished"/> + <translation>Ordinateur Suiva&nt</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="930"/> <source>&About Subsurface</source> - <translation>&A propos de Subsurface</translation> + <translation>&À propos de Subsurface</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="946"/> <source>&Globe</source> - <translation type="unfinished"/> + <translation>&Globe</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="968"/> @@ -1571,32 +1571,32 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="973"/> <source>Import &from divelogs.de</source> - <translation type="unfinished"/> + <translation>Importer &depuis divelogs.de</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="981"/> <source>&Full screen</source> - <translation type="unfinished"/> + <translation>Plein écran</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="984"/> <source>Toggle full screen</source> - <translation type="unfinished"/> + <translation>Basculer en mode plein ecran</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="1012"/> <source>&Check for updates</source> - <translation type="unfinished"/> + <translation>$Vérifier les mises à jour</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="1017"/> <source>&Export</source> - <translation>&Export</translation> + <translation>&Exporter</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="1020"/> <source>Export Dive Logs</source> - <translation>Exporter les plongée</translation> + <translation>Exporter les plongées</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="1023"/> @@ -1705,27 +1705,27 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>&Edit device names</source> - <translation type="unfinished"/> + <translation>&Éditer le nom de l'ordinateur de plongée</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="850"/> <source>&Add dive</source> - <translation type="unfinished"/> + <translation>$Ajouter une plongée</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="869"/> <source>Auto &group</source> - <translation type="unfinished"/> + <translation>&Groupement automatique</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>&Yearly statistics</source> - <translation type="unfinished"/> + <translation>&Statistiques annuelles</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>&Dive list</source> - <translation type="unfinished"/> + <translation>&Liste des plongées</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="885"/> @@ -1750,7 +1750,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="914"/> <source>P&revious DC</source> - <translation type="unfinished"/> + <translation>Ordinateur P&récédent</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="917"/> @@ -1765,7 +1765,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="938"/> <source>User &manual</source> - <translation type="unfinished"/> + <translation>&Manuel utilisateur</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="941"/> @@ -1780,12 +1780,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="954"/> <source>P&lan dive</source> - <translation type="unfinished"/> + <translation>P&lanifier une plongée</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="962"/> <source>&Import log files</source> - <translation type="unfinished"/> + <translation>&Importer des fichiers de log</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="965"/> @@ -1800,7 +1800,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.cpp" line="191"/> <source>Open file</source> - <translation type="unfinished"/> + <translation>Ouvrir un fichier</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="283"/> @@ -1813,70 +1813,70 @@ p, li { white-space: pre-wrap; } <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d'ajouter une nouvelle plongée.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="421"/> + <location filename="../qt-ui/mainwindow.cpp" line="422"/> <source>Print runtime table</source> <translation>Imprimer le runtime</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="516"/> + <location filename="../qt-ui/mainwindow.cpp" line="522"/> <source>Yearly statistics</source> - <translation type="unfinished"/> + <translation>Statistiques annuelles</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="701"/> + <location filename="../qt-ui/mainwindow.cpp" line="707"/> <source>Do you want to save the changes that you made in the file %1?</source> - <translation type="unfinished"/> + <translation>Voulez-vous enregistrer les modifications du fichier %1 ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="703"/> + <location filename="../qt-ui/mainwindow.cpp" line="709"/> <source>Do you want to save the changes that you made in the data file?</source> - <translation type="unfinished"/> + <translation>Voulez-vous enregistrer les modifications du fichier de données ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="708"/> + <location filename="../qt-ui/mainwindow.cpp" line="714"/> <source>Save changes?</source> - <translation type="unfinished"/> + <translation>Enregistrer les modifications?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1066"/> + <location filename="../qt-ui/mainwindow.cpp" line="1072"/> <source>Save file as</source> - <translation type="unfinished"/> + <translation>Enregistrer le fichier sous</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1190"/> + <location filename="../qt-ui/mainwindow.cpp" line="1196"/> <source>Open dive log file</source> - <translation type="unfinished"/> + <translation>Ouvrir un journal de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1191"/> + <location filename="../qt-ui/mainwindow.cpp" line="1197"/> <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source> - <translation type="unfinished"/> + <translation>Journaux de plongée (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Fichiers XML (*.xml);;Fichiers UDDF/UDCF (uddf *.udcf);;Fichiers JDiveLog (*.jlb);;Fichiers Suunto (*.sde *.db);;Fichiers CSV (*.csv);;Tous fichiers(*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="709"/> + <location filename="../qt-ui/mainwindow.cpp" line="715"/> <source>Changes will be lost if you don't save them.</source> <translation>Les modifications seront perdues si vous ne les enregistrez pas.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="251"/> <location filename="../qt-ui/mainwindow.cpp" line="390"/> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="188"/> - <location filename="../qt-ui/mainwindow.cpp" line="1050"/> + <location filename="../qt-ui/mainwindow.cpp" line="1056"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d'ouvrir un nouveau fichier.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1067"/> + <location filename="../qt-ui/mainwindow.cpp" line="1073"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Merci de finir l'édition en cours avant d'en commencer une autre.</translation> </message> @@ -1884,15 +1884,45 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="444"/> + <location filename="../qt-ui/diveplanner.cpp" line="450"/> + <source>ft/min</source> + <translation>ft/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="451"/> <source>Last stop at 20ft</source> <translation>Dernier palier à 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="451"/> + <location filename="../qt-ui/diveplanner.cpp" line="452"/> + <source>50% avg. depth to 20ft</source> + <translation>50% avg. depth to 20ft</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="453"/> + <source>20ft to surface</source> + <translation>20ft à la surface</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="455"/> + <source>m/min</source> + <translation>m/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="456"/> <source>Last stop at 6m</source> <translation>Dernier palier à 6m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="457"/> + <source>50% avg. depth to 6m</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="458"/> + <source>6m to surface</source> + <translation>6m à la surface</translation> + </message> </context> <context> <name>PreferencesDialog</name> @@ -1938,236 +1968,241 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/preferences.ui" line="198"/> + <source>Use default</source> + <translation>Utiliser les paramètres par défaut</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="247"/> + <location filename="../qt-ui/preferences.ui" line="257"/> <source>Animations</source> <translation>Animations</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="253"/> + <location filename="../qt-ui/preferences.ui" line="263"/> <source>Speed</source> <translation>Vitesse</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Clear all settings</source> <translation>Supprimer les paramètres</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="312"/> + <location filename="../qt-ui/preferences.ui" line="322"/> <source>Reset all settings to their default value</source> <translation>Remettre les paramètres par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="341"/> + <location filename="../qt-ui/preferences.ui" line="351"/> <source>System</source> <translation>Système</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="348"/> + <location filename="../qt-ui/preferences.ui" line="358"/> <source>Metric</source> <translation>Métrique</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="358"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Imperial</source> <translation>Impérial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="368"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Personalize</source> <translation>Personnalisé</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="392"/> + <location filename="../qt-ui/preferences.ui" line="402"/> <source>Depth</source> <translation>Profondeur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="399"/> + <location filename="../qt-ui/preferences.ui" line="409"/> <source>meter</source> <translation>mètre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="409"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>feet</source> <translation>pied</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="426"/> + <location filename="../qt-ui/preferences.ui" line="436"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="436"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="453"/> + <location filename="../qt-ui/preferences.ui" line="463"/> <source>liter</source> <translation>litre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="463"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>cu ft</source> <translation>pied cubique</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="490"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="490"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="507"/> + <location filename="../qt-ui/preferences.ui" line="517"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="772"/> + <location filename="../qt-ui/preferences.ui" line="782"/> <source>System default</source> - <translation type="unfinished"/> + <translation>Paramètre système par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="811"/> + <location filename="../qt-ui/preferences.ui" line="821"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="817"/> + <location filename="../qt-ui/preferences.ui" line="827"/> <source>Proxy type</source> <translation>Type de proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="830"/> + <location filename="../qt-ui/preferences.ui" line="840"/> <source>Host</source> <translation>Hôte</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="856"/> + <location filename="../qt-ui/preferences.ui" line="866"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="882"/> + <location filename="../qt-ui/preferences.ui" line="892"/> <source>Requires authentication</source> - <translation>Requiers une authentification</translation> + <translation>Requiert une authentification</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="912"/> <source>Username</source> <translation>nom d'utilisateur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="925"/> + <location filename="../qt-ui/preferences.ui" line="935"/> <source>Password</source> <translation>Mot de passe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="802"/> <source>Filter</source> <translation>Filtrer</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="419"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>Pressure</source> <translation>Pression</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="151"/> <source>Lists and tables</source> - <translation type="unfinished"/> + <translation>Listes et Tables</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="186"/> <source>Default dive log file</source> - <translation type="unfinished"/> + <translation>Fichier de plongée par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="207"/> + <location filename="../qt-ui/preferences.ui" line="217"/> <source>Display invalid</source> - <translation type="unfinished"/> + <translation>Afficher les plongées invalidées</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="224"/> + <location filename="../qt-ui/preferences.ui" line="234"/> <source>Default cylinder</source> - <translation type="unfinished"/> + <translation>Bloc par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="230"/> + <location filename="../qt-ui/preferences.ui" line="240"/> <source>Use default cylinder</source> - <translation type="unfinished"/> + <translation>Utiliser le bloc par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="280"/> + <location filename="../qt-ui/preferences.ui" line="290"/> <source>Subsurface web service</source> - <translation type="unfinished"/> + <translation>Service web de Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="286"/> + <location filename="../qt-ui/preferences.ui" line="296"/> <source>Default user ID</source> - <translation type="unfinished"/> + <translation>Identifiant de l'utilisateur par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Save user ID locally?</source> - <translation type="unfinished"/> + <translation>Sauvegarder l'identifiant de l'utilisateur?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="446"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="473"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>Temperature</source> <translation>Température</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="500"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>Weight</source> <translation>Poids</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="517"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>lbs</source> <translation>livre US</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="532"/> + <location filename="../qt-ui/preferences.ui" line="542"/> <source>Time units</source> <translation>Unités de temps</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="545"/> + <location filename="../qt-ui/preferences.ui" line="555"/> <source>Minutes</source> <translation>Minutes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="555"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Seconds</source> <translation>Secondes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="587"/> + <location filename="../qt-ui/preferences.ui" line="597"/> <source>Show</source> <translation>Montrer</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="756"/> + <location filename="../qt-ui/preferences.ui" line="766"/> <source>GFLow at max depth</source> <translation>GFLow à la profondeur max</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="716"/> + <location filename="../qt-ui/preferences.ui" line="726"/> <source>Misc</source> <translation>Divers</translation> </message> @@ -2177,52 +2212,52 @@ p, li { white-space: pre-wrap; } <translation>Préférences</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="538"/> + <location filename="../qt-ui/preferences.ui" line="548"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="598"/> + <location filename="../qt-ui/preferences.ui" line="608"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="619"/> + <location filename="../qt-ui/preferences.ui" line="629"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="640"/> + <location filename="../qt-ui/preferences.ui" line="650"/> <source>Threshold when showing pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="661"/> + <location filename="../qt-ui/preferences.ui" line="671"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="682"/> + <location filename="../qt-ui/preferences.ui" line="692"/> <source>Draw dive computer reported ceiling red</source> - <translation type="unfinished"/> + <translation>Afficher en rouge le plafond signalé par l'ordinateur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="693"/> + <location filename="../qt-ui/preferences.ui" line="703"/> <source>Show unused cylinders in Equipment tab</source> - <translation type="unfinished"/> + <translation>Afficher les blocs non utilisés dans l'onglet des Équipements</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="704"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Show average depth</source> - <translation type="unfinished"/> + <translation>Afficher la profondeur moyenne</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="722"/> + <location filename="../qt-ui/preferences.ui" line="732"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="739"/> + <location filename="../qt-ui/preferences.ui" line="749"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> @@ -2239,40 +2274,40 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/preferences.cpp" line="25"/> <source>HTTP proxy</source> - <translation>proxy HTTP</translation> + <translation>Proxy HTTP</translation> </message> <message> <location filename="../qt-ui/preferences.cpp" line="26"/> <source>SOCKS proxy</source> - <translation>proxy SOCKS</translation> + <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="245"/> + <location filename="../qt-ui/preferences.cpp" line="247"/> <source>Restart required</source> - <translation>Redémarrage necessaire</translation> + <translation>Redémarrage nécessaire</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="246"/> + <location filename="../qt-ui/preferences.cpp" line="248"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Vous devez redémarrer Subsurface pour prendre en compte la nouvelle langue.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="395"/> + <location filename="../qt-ui/preferences.cpp" line="398"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> - <translation type="unfinished"/> + <translation>Si vous cliquez sur OK, tous les paramètres de Subsurface vont être remis à leur valeur par défaut. Cela s'appliquera immédiatement.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Open default log file</source> - <translation type="unfinished"/> + <translation>Ouvrir le fichier de plongée par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="394"/> + <location filename="../qt-ui/preferences.cpp" line="397"/> <source>Warning</source> <translation>Avertissement</translation> </message> @@ -2367,51 +2402,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/printoptions.ui" line="145"/> + <source>1 dive per page</source> + <translation>1 plongée par page</translation> + </message> + <message> + <location filename="../qt-ui/printoptions.ui" line="158"/> <source>Table print</source> <translation>Impression du tableau</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="162"/> + <location filename="../qt-ui/printoptions.ui" line="175"/> <source>Ordering</source> <translation>Classer</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="180"/> + <location filename="../qt-ui/printoptions.ui" line="193"/> <source>Profile on top</source> <translation>Profil en haut</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="202"/> + <location filename="../qt-ui/printoptions.ui" line="215"/> <source>Notes on top</source> <translation>Notes en haut</translation> </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="219"/> - <source>Sizing heights (% of layout)</source> - <translation>Hauteurs (% de la page)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="256"/> - <source>Profile height (43% - 85%)</source> - <translation>Hauteur du profil (43% - 85%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="278"/> - <source>Other data height (8% - 17%)</source> - <translation>Hauteur des autres données (8% - 17%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="338"/> - <source>Notes height (0% - 52%)</source> - <translation>Hauteur des notes (0% - 52%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="354"/> - <location filename="../qt-ui/printoptions.ui" line="370"/> - <location filename="../qt-ui/printoptions.ui" line="386"/> - <source>0</source> - <translation>0</translation> - </message> </context> <context> <name>ProfilePrintModel</name> @@ -2423,7 +2436,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/models.cpp" line="1906"/> <source>Dive #%1 - %2</source> - <translation>Plongée #%1 - %2</translation> + <translation>Plongée n°%1 - %2</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1909"/> @@ -2438,12 +2451,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/models.cpp" line="1921"/> <source>Gas used:</source> - <translation type="unfinished"/> + <translation>Gaz utilisé:</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1923"/> <source>Tags:</source> - <translation type="unfinished"/> + <translation>Étiquettes</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1925"/> @@ -2489,77 +2502,77 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="520"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="515"/> <source> (#%1 of %2)</source> - <translation> (#%1 de %2)</translation> + <translation> (n°%1 de %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="898"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="895"/> <source>Make first divecomputer</source> - <translation type="unfinished"/> + <translation>Définir comme ordinateur de plongée principal</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="900"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="897"/> <source>Delete this divecomputer</source> <translation>Supprimer cet ordinateur de plongée</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="907"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/> <source>Add gas change</source> - <translation type="unfinished"/> + <translation>Ajouter un changement de gaz</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="918"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="915"/> <source>Add bookmark</source> - <translation type="unfinished"/> + <translation>Ajouter un signet</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="922"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="919"/> <source>Remove event</source> - <translation type="unfinished"/> + <translation>Supprimer l'événement</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/> <source>Hide similar events</source> <translation>Cacher les événements similaires</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="930"/> <source>Edit name</source> <translation>Modifier le nom</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="947"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="944"/> <source>Unhide all events</source> <translation>Dé-sélectionner tous les évènements</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide events</source> <translation>Cacher les événements</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide all %1 events?</source> <translation>Cacher tous les événements %1 ?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1016"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1013"/> <source>Remove the selected event?</source> <translation>Supprimer l'événement sélectionné ?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1017"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1014"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1082"/> <source>Edit name of bookmark</source> - <translation>Modifier le nom du marque-page</translation> + <translation>Modifier le nom du signet</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1086"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1083"/> <source>Custom name:</source> <translation>Nom personnalisé :</translation> </message> @@ -2572,9 +2585,9 @@ p, li { white-space: pre-wrap; } <translation>AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="212"/> + <location filename="../qt-ui/diveplanner.cpp" line="210"/> <source>Remove this point</source> - <translation type="unfinished"/> + <translation>Supprimer ce point</translation> </message> <message> <location filename="../qt-ui/kmessagewidget.cpp" line="58"/> @@ -2642,22 +2655,22 @@ p, li { white-space: pre-wrap; } <translation>pied³</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/> <source>Invalid response from server</source> <translation>Réponse invalide du serveur</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="529"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Le tag XML 'DiveDateReader' est attendu, '%1' a été lu</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="575"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Le tag XML 'DiveDates' n'a pas été trouvé</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> <source>Malformed XML response. Line %1: %2</source> <translation>Réponse XML mal formée. Ligne %1: %2</translation> </message> @@ -2704,22 +2717,22 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/shiftimagetimes.ui" line="23"/> <source>Shift selected image times</source> - <translation type="unfinished"/> + <translation>Décaler l'heure des images sélectionnées</translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="105"/> <source>Earlier</source> - <translation type="unfinished"/> + <translation>Plus tôt</translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="112"/> <source>Later</source> - <translation type="unfinished"/> + <translation>Plus tard</translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="148"/> <source>To compute the offset between the clocks of your dive computer and your camera use your camera to take a picture of your dive compuer displaying the current time. Download that image to your computer and press this button.</source> - <translation>Pour calculer le décalage entre l'horloge de votre ordinateur de plongée et celle de votre appareil photo, prenez une photo avec votre appareil photo de votre ordinateur de plongée affichant l'heure. Télécharger cette image sur votre ordinateur et appuyez sur ce bouton.</translation> + <translation>Pour calculer le décalage entre l'horloge de votre ordinateur de plongée et votre appareil photo, prenez une photo de votre ordinateur de plongée affichant l'heure. Téléchargez cette image sur votre ordinateur et appuyez sur ce bouton.</translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="158"/> @@ -2739,12 +2752,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="224"/> <source>Open image file</source> - <translation type="unfinished"/> + <translation>Ouvrir un fichier image</translation> </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="226"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> - <translation type="unfinished"/> + <translation>Fichier d'images (</translation> </message> </context> <context> @@ -2783,12 +2796,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>Earlier</source> - <translation type="unfinished"/> + <translation>Plus tôt</translation> </message> <message> <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>Later</source> - <translation type="unfinished"/> + <translation>Plus tard</translation> </message> </context> <context> @@ -2822,42 +2835,47 @@ p, li { white-space: pre-wrap; } <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="337"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="338"/> <source>Webservice</source> <translation>Serveur</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="401"/> <source>Connecting...</source> <translation>Connexion en cours...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="420"/> <source>Download finished</source> <translation>Téléchargement terminé</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="433"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="434"/> <source>Download error: %1</source> <translation>Erreur de téléchargement: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/> <source>Connection error: </source> - <translation type="unfinished"/> + <translation>Erreur de connexion : </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/> <source>Download successful</source> - <translation type="unfinished"/> + <translation>Téléchargement réussi</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="447"/> <source>Invalid user identifier!</source> <translation>Identifiant utilisateur incorrect.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="321"/> + <source>Enter User ID and click Download</source> + <translation>Entrez l'Id de l'utilisateur et cliquez sur télécharger</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/> <source>Cannot parse response!</source> <translation>Impossible de lire la réponse</translation> </message> @@ -2867,7 +2885,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/tableview.cpp" line="23"/> <source>Add cylinder</source> - <translation type="unfinished"/> + <translation>Ajouter un bloc</translation> </message> </context> <context> @@ -2899,42 +2917,42 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="35"/> + <location filename="../qt-ui/updatemanager.cpp" line="33"/> <source>Check for updates.</source> <translation>Cherche les mises à jours.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <location filename="../qt-ui/updatemanager.cpp" line="34"/> <source>Subsurface was unable to check for updates.</source> - <translation type="unfinished"/> + <translation>Subsurface n'a pas été en mesure de tester les mises à jour.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="41"/> + <location filename="../qt-ui/updatemanager.cpp" line="39"/> <source>The following error occurred:</source> - <translation type="unfinished"/> + <translation>L'erreur suivante est apparue :</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <location filename="../qt-ui/updatemanager.cpp" line="40"/> <source>Please check your internet connection.</source> <translation>Vérifiez votre connexion Internet </translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="51"/> + <location filename="../qt-ui/updatemanager.cpp" line="49"/> <source>You are using the latest version of subsurface.</source> <translation>Vous utilisez la dernière version de Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="53"/> + <location filename="../qt-ui/updatemanager.cpp" line="51"/> <source>A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Une nouvelle version de Subsurface est disponible.<br/>Téléchargez-là à</br/><a href="%1">%1</a>.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="56"/> + <location filename="../qt-ui/updatemanager.cpp" line="54"/> <source><b>A new version of subsurface is available.</b><br/><br/>%1</source> <translation><b>Une nouvelle version de Subsurface est disponible.</b><br/><br/>%1</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="57"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>Il y a eu une erreur lors de la recherche des mises à jours.<br/><br/>%1</translation> </message> @@ -2947,8 +2965,8 @@ p, li { white-space: pre-wrap; } <translation>Manuel utilisateur</translation> </message> <message> - <location filename="../qt-ui/usermanual.cpp" line="70"/> - <location filename="../qt-ui/usermanual.cpp" line="76"/> + <location filename="../qt-ui/usermanual.cpp" line="72"/> + <location filename="../qt-ui/usermanual.cpp" line="78"/> <source>Cannot find the Subsurface manual</source> <translation>Impossible de trouver le manuel de Subsurface</translation> </message> @@ -2963,22 +2981,22 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/usersurvey.ui" line="14"/> <source>User Survey</source> - <translation type="unfinished"/> + <translation>Sondage utilisateur</translation> </message> <message> <location filename="../qt-ui/usersurvey.ui" line="25"/> <source>Subsurface user survey</source> - <translation type="unfinished"/> + <translation>Sondage utilisateur Subsurface</translation> </message> <message> <location filename="../qt-ui/usersurvey.ui" line="52"/> <source>Recreational diver</source> - <translation type="unfinished"/> + <translation>Plongeur loisir</translation> </message> <message> <location filename="../qt-ui/usersurvey.ui" line="45"/> <source>Technical diver</source> - <translation type="unfinished"/> + <translation>Plongeur technique</translation> </message> <message> <location filename="../qt-ui/usersurvey.ui" line="59"/> @@ -3037,27 +3055,27 @@ Language: %1</source> Langue: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="74"/> + <location filename="../qt-ui/usersurvey.cpp" line="72"/> <source>Should we ask you later?</source> <translation>Devons-nous vous le demander ultérieurement ?</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="75"/> + <location filename="../qt-ui/usersurvey.cpp" line="73"/> <source>Don't ask me again</source> <translation>Ne me le demande plus</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="76"/> + <location filename="../qt-ui/usersurvey.cpp" line="74"/> <source>Ask later</source> - <translation type="unfinished"/> + <translation>Demander plus tard</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="96"/> + <location filename="../qt-ui/usersurvey.cpp" line="94"/> <source>Submit user survey.</source> - <translation type="unfinished"/> + <translation>Soumettre le sondage</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="77"/> + <location filename="../qt-ui/usersurvey.cpp" line="75"/> <source>Ask again?</source> <translation>Demander encore?</translation> </message> @@ -3065,30 +3083,32 @@ Langue: %1</translation> <location filename="../qt-ui/usersurvey.cpp" line="36"/> <source> OS CPU Architecture: %1</source> - <translation type="unfinished"/> + <translation> + +Architecture OS CPU: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="97"/> + <location filename="../qt-ui/usersurvey.cpp" line="95"/> <source>Subsurface was unable to submit the user survey.</source> - <translation type="unfinished"/> + <translation>Subsurface n'a pas pus soumettre le sondage.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="102"/> + <location filename="../qt-ui/usersurvey.cpp" line="100"/> <source>The following error occurred:</source> - <translation type="unfinished"/> + <translation>L'erreur suivante est apparue :</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="103"/> + <location filename="../qt-ui/usersurvey.cpp" line="101"/> <source>Please check your internet connection.</source> <translation>Vérifiez votre connexion Internet </translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="112"/> + <location filename="../qt-ui/usersurvey.cpp" line="110"/> <source>Survey successfully submitted.</source> <translation>Sondage soumis avec succès</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="117"/> + <location filename="../qt-ui/usersurvey.cpp" line="115"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>Il y a eu une erreur lors de la recherche des mises à jours.<br/><br/>%1</translation> </message> @@ -3111,7 +3131,7 @@ OS CPU Architecture: %1</source> <message> <location filename="../qt-ui/webservices.ui" line="14"/> <source>Web service connection</source> - <translation type="unfinished"/> + <translation>Connexion au Webservice</translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -3136,7 +3156,7 @@ OS CPU Architecture: %1</source> <message> <location filename="../qt-ui/webservices.ui" line="85"/> <source>Save user ID locally?</source> - <translation type="unfinished"/> + <translation>Sauvegarder l'identifiant de l'utilisateur?</translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="92"/> @@ -3174,7 +3194,7 @@ OS CPU Architecture: %1</source> <message> <location filename="../qt-ui/models.cpp" line="447"/> <source>Clicking here will remove this weight system.</source> - <translation type="unfinished"/> + <translation>Cliquer ici retirera ce système de poids.</translation> </message> </context> <context> @@ -3268,13 +3288,13 @@ Moyenne</translation> </message> <message> <location filename="../dive.c" line="128"/> - <location filename="../qt-gui.cpp" line="323"/> + <location filename="../qt-gui.cpp" line="329"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="132"/> - <location filename="../qt-gui.cpp" line="326"/> + <location filename="../qt-gui.cpp" line="332"/> <source>psi</source> <translation>psi</translation> </message> @@ -3285,16 +3305,16 @@ Moyenne</translation> </message> <message> <location filename="../dive.c" line="203"/> - <location filename="../qt-gui.cpp" line="205"/> - <location filename="../qt-gui.cpp" line="220"/> + <location filename="../qt-gui.cpp" line="211"/> + <location filename="../qt-gui.cpp" line="226"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="208"/> - <location filename="../qt-gui.cpp" line="208"/> - <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="214"/> + <location filename="../qt-gui.cpp" line="228"/> <source>ft</source> <translation>pied</translation> </message> @@ -3306,29 +3326,29 @@ Moyenne</translation> <message> <location filename="../dive.c" line="233"/> <source>m/s</source> - <translation type="unfinished"/> + <translation>m/s</translation> </message> <message> <location filename="../dive.c" line="238"/> <source>ft/min</source> - <translation type="unfinished"/> + <translation>ft/min</translation> </message> <message> <location filename="../dive.c" line="240"/> <source>ft/s</source> - <translation type="unfinished"/> + <translation>ft/s</translation> </message> <message> <location filename="../dive.c" line="259"/> - <location filename="../qt-gui.cpp" line="231"/> - <location filename="../qt-gui.cpp" line="241"/> + <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="247"/> <source>lbs</source> <translation>livre US</translation> </message> <message> <location filename="../dive.c" line="263"/> - <location filename="../qt-gui.cpp" line="229"/> - <location filename="../qt-gui.cpp" line="239"/> + <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="245"/> <source>kg</source> <translation>kg</translation> </message> @@ -3338,36 +3358,36 @@ Moyenne</translation> <translation>(%s) ou (%s)</translation> </message> <message> - <location filename="../divelist.c" line="467"/> - <location filename="../equipment.c" line="104"/> - <location filename="../planner.c" line="986"/> - <location filename="../planner.c" line="989"/> + <location filename="../divelist.c" line="460"/> + <location filename="../equipment.c" line="79"/> + <location filename="../planner.c" line="988"/> + <location filename="../planner.c" line="991"/> <location filename="../statistics.c" line="355"/> <source>air</source> <translation>air</translation> </message> <message> - <location filename="../equipment.c" line="210"/> + <location filename="../equipment.c" line="185"/> <source>integrated</source> <translation>intégré</translation> </message> <message> - <location filename="../equipment.c" line="211"/> + <location filename="../equipment.c" line="186"/> <source>belt</source> <translation>ceinture</translation> </message> <message> - <location filename="../equipment.c" line="212"/> + <location filename="../equipment.c" line="187"/> <source>ankle</source> <translation>cheville</translation> </message> <message> - <location filename="../equipment.c" line="213"/> + <location filename="../equipment.c" line="188"/> <source>backplate weight</source> <translation>poids dorsaux</translation> </message> <message> - <location filename="../equipment.c" line="214"/> + <location filename="../equipment.c" line="189"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -3678,131 +3698,130 @@ Moyenne</translation> <translation>Impossible d'ouvrir le feuille de style %s</translation> </message> <message> - <location filename="../equipment.c" line="106"/> + <location filename="../equipment.c" line="81"/> <source>EAN%d</source> <translation>Nitrox%d</translation> </message> <message> - <location filename="../planner.c" line="159"/> - <location filename="../planner.c" line="761"/> + <location filename="../planner.c" line="763"/> <source>Can't find gas %s</source> <translation>Ne peut pas trouver le gaz %s</translation> </message> <message> - <location filename="../planner.c" line="345"/> + <location filename="../planner.c" line="347"/> <source>Too many gas mixes</source> <translation>Trop de gaz différents</translation> </message> <message> - <location filename="../planner.c" line="526"/> + <location filename="../planner.c" line="528"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>ATTENTION : CECI EST UNE NOUVELLE IMPLÉMENTATION DE L'ALGORITHME DE BUHLMANN ET LE SIMULATEUR DE PLONGÉE N'A ÉTÉ TESTÉ QUE SOMMAIREMENT. IL EST FORTEMENT CONSEILLÉ DE NE PAS PLONGER EN SE BASANT UNIQUEMENT SUR LES INDICATIONS FOURNIES ICI.</translation> </message> <message> - <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="537"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>Basé sur GFbas = %d et GFhaut = %d</translation> </message> <message> - <location filename="../planner.c" line="538"/> + <location filename="../planner.c" line="540"/> <source>Subsurface dive plan</source> <translation>Dive plan Subsurface </translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="544"/> <source>depth</source> <translation>profondeur</translation> </message> <message> - <location filename="../planner.c" line="545"/> + <location filename="../planner.c" line="547"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="548"/> + <location filename="../planner.c" line="550"/> <source>duration</source> <translation>durée</translation> </message> <message> - <location filename="../planner.c" line="551"/> + <location filename="../planner.c" line="553"/> <source>gas</source> <translation>gaz</translation> </message> <message> - <location filename="../planner.c" line="585"/> + <location filename="../planner.c" line="587"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transition de %.*f %s en %d:%02d min - runtime %d:%02u sur %s</translation> </message> <message> - <location filename="../planner.c" line="595"/> + <location filename="../planner.c" line="597"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>restez à %.*f %s durant %d:%02d min - runtime %d:%02u sur %s</translation> </message> <message> - <location filename="../planner.c" line="606"/> + <location filename="../planner.c" line="608"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="609"/> - <location filename="../planner.c" line="613"/> + <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="615"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="629"/> + <location filename="../planner.c" line="631"/> <source>Switch gas to %s</source> <translation>Changer de gaz vers %s</translation> </message> <message> - <location filename="../planner.c" line="642"/> + <location filename="../planner.c" line="644"/> <source>CNS</source> - <translation type="unfinished"/> + <translation>SNC</translation> </message> <message> - <location filename="../planner.c" line="644"/> + <location filename="../planner.c" line="646"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="649"/> <source>Gas consumption:</source> <translation>Consommation de gaz:</translation> </message> <message> - <location filename="../planner.c" line="667"/> - <location filename="../planner.c" line="672"/> - <location filename="../planner.c" line="695"/> + <location filename="../planner.c" line="669"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="697"/> <source>Warning:</source> <translation>Avertissement:</translation> </message> <message> - <location filename="../planner.c" line="668"/> + <location filename="../planner.c" line="670"/> <source>this is more gas than available in the specified cylinder!</source> <translation>C'est plus de gaz que de disponible dans la bouteille spécifié</translation> </message> <message> - <location filename="../planner.c" line="673"/> + <location filename="../planner.c" line="675"/> <source>not enough reserve for gas sharing on ascent!</source> - <translation>pas assez de gaz en réserve pour un échange lors de la remonté</translation> + <translation>pas assez de gaz en réserve pour un échange lors de la remontée</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="677"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s dans la remonté planifiée)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="679"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durant la remonté planifiée) de %s</translation> </message> <message> - <location filename="../planner.c" line="692"/> + <location filename="../planner.c" line="694"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> - <translation type="unfinished"/> + <translation>valeur pO₂ haute %.2f à %d:%02u avec le gaz %s à la profondeur %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="990"/> + <location filename="../planner.c" line="992"/> <source>ean</source> <translation>ean</translation> </message> @@ -3883,8 +3902,8 @@ D: %.1f%s <source>EAD: %d%s EADD: %d%s </source> - <translation>EAD : %d%s -EADD : %d%s + <translation>PEA : %d%s +PEDA : %d%s </translation> </message> <message> @@ -3892,8 +3911,8 @@ EADD : %d%s <source>END: %d%s EADD: %d%s </source> - <translation>END : %d%s -EADD : %d%s + <translation>PEEA : %d%s +PEDA : %d%s </translation> </message> <message> @@ -3935,14 +3954,15 @@ EADD : %d%s <location filename="../profile.c" line="1317"/> <source>NDL: %umin </source> - <translation>NDL : %umin + <translation>LND : %umin </translation> </message> <message> <location filename="../profile.c" line="1320"/> <source>TTS: %umin </source> - <translation type="unfinished"/> + <translation>DTR: %umin +</translation> </message> <message> <location filename="../profile.c" line="1323"/> @@ -3963,6 +3983,7 @@ EADD : %d%s <source>NDL: %umin (calc) </source> <translation>LND:%umin (calc) + </translation> </message> <message> @@ -4036,22 +4057,22 @@ EADD : %d%s <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="281"/> + <location filename="../qt-gui.cpp" line="287"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="284"/> + <location filename="../qt-gui.cpp" line="290"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="417"/> + <location filename="../qt-gui.cpp" line="427"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 plongées)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="422"/> + <location filename="../qt-gui.cpp" line="432"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 plongée)</translation> </message> @@ -4153,7 +4174,7 @@ EADD : %d%s <message> <location filename="../dive.c" line="169"/> <source>ℓ</source> - <translation type="unfinished"/> + <translation>ℓ</translation> </message> <message> <location filename="../statistics.c" line="214"/> @@ -4201,97 +4222,97 @@ EADD : %d%s <translation>(pas de plongées)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sun</source> <translation>Dim.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Mon</source> <translation>Lun.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Tue</source> <translation>Mar.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Wed</source> <translation>Mer.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Thu</source> <translation>Jeu.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Fri</source> <translation>Ven.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sat</source> <translation>Sam.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jan</source> <translation>Janv.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Feb</source> <translation>Fév.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mar</source> <translation>Mar.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Apr</source> <translation>Avril</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jun</source> <translation>Juin</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Jul</source> <translation>Juil.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Aug</source> <translation>Août</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Sep</source> <translation>Sept.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Oct</source> <translation>Oct.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Nov</source> <translation>Nov.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Dec</source> <translation>Déc.</translation> </message> @@ -4539,7 +4560,7 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation> <message> <location filename="../worldmap-save.c" line="46"/> <source>Air Temp:</source> - <translation>Température de l'Air:</translation> + <translation>Température de l'air:</translation> </message> <message> <location filename="../worldmap-save.c" line="48"/> @@ -4613,21 +4634,6 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/plannerSettings.ui" line="94"/> - <source>75%-50% avg. depth</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="111"/> - <source>50% avg. depth - 6m/20ft</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="128"/> - <source>6m/20ft to surface</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/plannerSettings.ui" line="148"/> <source>Descent</source> <translation>Descente</translation> @@ -4659,8 +4665,8 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="288"/> - <source>Last Stop at 6m/20ft</source> - <translation>Dernier arrêt à 6m/20ft</translation> + <source>Last stop at 6m</source> + <translation>Dernier palier à 6m</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="295"/> @@ -4670,7 +4676,7 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation> <message> <location filename="../qt-ui/plannerSettings.ui" line="318"/> <source>Gas options</source> - <translation type="unfinished"/> + <translation>Option de gaz</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="339"/> @@ -4680,7 +4686,7 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation> <message> <location filename="../qt-ui/plannerSettings.ui" line="349"/> <source>Deco SAC</source> - <translation type="unfinished"/> + <translation>Consommation d'air de décompression</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="359"/> @@ -4690,12 +4696,12 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation> <message> <location filename="../qt-ui/plannerSettings.ui" line="382"/> <source>Deco pO₂</source> - <translation type="unfinished"/> + <translation>pO₂ de décompression</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="421"/> <source>Dive notes</source> - <translation type="unfinished"/> + <translation>Notes de plongée</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="445"/> @@ -4710,7 +4716,7 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation> <message> <location filename="../qt-ui/plannerSettings.ui" line="474"/> <source>Display transitions in deco</source> - <translation type="unfinished"/> + <translation>Afficher les transition dans la décompression</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="481"/> @@ -4724,6 +4730,21 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation> <translation>bar</translation> </message> <message> + <location filename="../qt-ui/plannerSettings.ui" line="94"/> + <source>75% to 50% avg. depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="111"/> + <source>50% avg. depth to 6m</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="128"/> + <source>6m to surface</source> + <translation>6m à la surface</translation> + </message> + <message> <location filename="../qt-ui/plannerSettings.ui" line="442"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index 1b9686778..9130619a0 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -103,18 +103,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="107"/> <source>Bailing out to OC</source> <translation>Neplanirani prelazak na OC sustav</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="103"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="109"/> <source> begin</source> <comment>Starts with space!</comment> <translation> započni</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="104"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="110"/> <source> end</source> <comment>Starts with space!</comment> <translation> završi</translation> @@ -136,87 +136,87 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="705"/> + <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>Expand all</source> <translation>Otvori sve</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="706"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>Collapse all</source> <translation>Zatvori sve grupe</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="707"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="709"/> + <location filename="../qt-ui/divelistview.cpp" line="711"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="712"/> <source>Create new trip above</source> <translation>Kreiraj novu grupu iznad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="726"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>Merge trip with trip above</source> <translation>Spoji s grupom iznad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="731"/> + <location filename="../qt-ui/divelistview.cpp" line="733"/> <source>Merge trip with trip below</source> <translation>Spoji s grupom ispod</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="737"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="737"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="741"/> + <location filename="../qt-ui/divelistview.cpp" line="743"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="745"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="746"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="747"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -224,59 +224,59 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="30"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="35"/> <source>Export format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="42"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="47"/> <source>Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="61"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="66"/> <source>UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="74"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="79"/> <source>divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="84"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="89"/> <source>CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="94"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="99"/> <source>Worldmap</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="112"/> <source>Selection</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="116"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="121"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="208"/> <source>Selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="126"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="131"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="234"/> <source>All dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="178"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="183"/> <source>HTML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="216"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="221"/> <source>Minimum Javascript</source> <translation type="unfinished"/> </message> @@ -286,87 +286,87 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="24"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="29"/> <source>General export</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="184"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>General settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="190"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="195"/> <source>Subsurface numbers</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="239"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export list only</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="252"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="257"/> <source>Style options</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="264"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="269"/> <source>Font</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="274"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="279"/> <source>Font size</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="285"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> <source>8</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> <source>10</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> <source>12</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>14</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> <source>16</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> <source>18</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="320"/> <source>20</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="323"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="328"/> <source>Theme</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> <source>Light</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Sand</source> <translation type="unfinished"/> </message> @@ -627,42 +627,42 @@ <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="137"/> + <location filename="../qt-ui/diveplanner.cpp" line="135"/> <source>unknown</source> <translation>nepoznato</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="622"/> + <location filename="../qt-ui/diveplanner.cpp" line="634"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="624"/> + <location filename="../qt-ui/diveplanner.cpp" line="636"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="626"/> + <location filename="../qt-ui/diveplanner.cpp" line="638"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="628"/> + <location filename="../qt-ui/diveplanner.cpp" line="640"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="630"/> + <location filename="../qt-ui/diveplanner.cpp" line="642"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="925"/> + <location filename="../qt-ui/diveplanner.cpp" line="938"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="926"/> + <location filename="../qt-ui/diveplanner.cpp" line="939"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -670,17 +670,17 @@ <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="255"/> + <location filename="../qt-ui/diveplanner.cpp" line="254"/> <source>Dive planner points</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="259"/> + <location filename="../qt-ui/diveplanner.cpp" line="258"/> <source>Available gases</source> <translation>Dostupni plinovi</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="282"/> + <location filename="../qt-ui/diveplanner.cpp" line="281"/> <source>Add dive data point</source> <translation type="unfinished"/> </message> @@ -854,69 +854,69 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="636"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="832"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="637"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="667"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="668"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="698"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="699"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="747"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="790"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="850"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="853"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="855"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="867"/> <source>Error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="834"/> <source>Upload finished</source> <translation type="unfinished"/> </message> @@ -1048,7 +1048,7 @@ <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="450"/> <source>Location</source> <translation>Lokacija</translation> </message> @@ -1089,27 +1089,27 @@ </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="415"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="607"/> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="245"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="626"/> - <location filename="../qt-ui/maintab.cpp" line="245"/> + <location filename="../qt-ui/maintab.cpp" line="246"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="440"/> + <location filename="../qt-ui/maintab.cpp" line="451"/> <source>Notes</source> <translation>Bilješke</translation> </message> @@ -1226,114 +1226,114 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="88"/> + <location filename="../qt-ui/maintab.cpp" line="89"/> <source>Cylinders</source> <translation>Boce</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="89"/> + <location filename="../qt-ui/maintab.cpp" line="90"/> <source>Add Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="93"/> <source>Weights</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="93"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Add Weight System</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="48"/> + <location filename="../qt-ui/maintab.cpp" line="49"/> <source>Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="52"/> + <location filename="../qt-ui/maintab.cpp" line="53"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="241"/> + <location filename="../qt-ui/maintab.cpp" line="242"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="242"/> + <location filename="../qt-ui/maintab.cpp" line="243"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="277"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="284"/> + <location filename="../qt-ui/maintab.cpp" line="285"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="286"/> + <location filename="../qt-ui/maintab.cpp" line="287"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="386"/> - <location filename="../qt-ui/maintab.cpp" line="410"/> + <location filename="../qt-ui/maintab.cpp" line="397"/> + <location filename="../qt-ui/maintab.cpp" line="421"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="408"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="461"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> - <location filename="../qt-ui/maintab.cpp" line="502"/> - <location filename="../qt-ui/maintab.cpp" line="503"/> - <location filename="../qt-ui/maintab.cpp" line="504"/> + <location filename="../qt-ui/maintab.cpp" line="472"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> + <location filename="../qt-ui/maintab.cpp" line="513"/> + <location filename="../qt-ui/maintab.cpp" line="514"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="463"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>unknown</source> <translation>nepoznato</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="500"/> + <location filename="../qt-ui/maintab.cpp" line="511"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="501"/> + <location filename="../qt-ui/maintab.cpp" line="512"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="556"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="549"/> + <location filename="../qt-ui/maintab.cpp" line="560"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="797"/> + <location filename="../qt-ui/maintab.cpp" line="808"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="798"/> + <location filename="../qt-ui/maintab.cpp" line="809"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -1809,70 +1809,70 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="421"/> + <location filename="../qt-ui/mainwindow.cpp" line="422"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="516"/> + <location filename="../qt-ui/mainwindow.cpp" line="522"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="701"/> + <location filename="../qt-ui/mainwindow.cpp" line="707"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="703"/> + <location filename="../qt-ui/mainwindow.cpp" line="709"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="708"/> + <location filename="../qt-ui/mainwindow.cpp" line="714"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1066"/> + <location filename="../qt-ui/mainwindow.cpp" line="1072"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1190"/> + <location filename="../qt-ui/mainwindow.cpp" line="1196"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1191"/> + <location filename="../qt-ui/mainwindow.cpp" line="1197"/> <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="709"/> + <location filename="../qt-ui/mainwindow.cpp" line="715"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="251"/> <location filename="../qt-ui/mainwindow.cpp" line="390"/> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="188"/> - <location filename="../qt-ui/mainwindow.cpp" line="1050"/> + <location filename="../qt-ui/mainwindow.cpp" line="1056"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1067"/> + <location filename="../qt-ui/mainwindow.cpp" line="1073"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -1880,15 +1880,45 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="444"/> - <source>Last stop at 20ft</source> + <location filename="../qt-ui/diveplanner.cpp" line="450"/> + <source>ft/min</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="451"/> + <source>Last stop at 20ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="452"/> + <source>50% avg. depth to 20ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="453"/> + <source>20ft to surface</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="455"/> + <source>m/min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="456"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="457"/> + <source>50% avg. depth to 6m</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="458"/> + <source>6m to surface</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesDialog</name> @@ -1934,146 +1964,151 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/preferences.ui" line="198"/> + <source>Use default</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="247"/> + <location filename="../qt-ui/preferences.ui" line="257"/> <source>Animations</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="253"/> + <location filename="../qt-ui/preferences.ui" line="263"/> <source>Speed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="312"/> + <location filename="../qt-ui/preferences.ui" line="322"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="341"/> + <location filename="../qt-ui/preferences.ui" line="351"/> <source>System</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="348"/> + <location filename="../qt-ui/preferences.ui" line="358"/> <source>Metric</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="358"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Imperial</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="368"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Personalize</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="392"/> + <location filename="../qt-ui/preferences.ui" line="402"/> <source>Depth</source> <translation>Dubina</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="399"/> + <location filename="../qt-ui/preferences.ui" line="409"/> <source>meter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="409"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>feet</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="426"/> + <location filename="../qt-ui/preferences.ui" line="436"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="436"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="453"/> + <location filename="../qt-ui/preferences.ui" line="463"/> <source>liter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="463"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>cu ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="490"/> <source>celsius</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="490"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>fahrenheit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="507"/> + <location filename="../qt-ui/preferences.ui" line="517"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="772"/> + <location filename="../qt-ui/preferences.ui" line="782"/> <source>System default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="811"/> + <location filename="../qt-ui/preferences.ui" line="821"/> <source>Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="817"/> + <location filename="../qt-ui/preferences.ui" line="827"/> <source>Proxy type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="830"/> + <location filename="../qt-ui/preferences.ui" line="840"/> <source>Host</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="856"/> + <location filename="../qt-ui/preferences.ui" line="866"/> <source>Port</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="882"/> + <location filename="../qt-ui/preferences.ui" line="892"/> <source>Requires authentication</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="912"/> <source>Username</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="925"/> + <location filename="../qt-ui/preferences.ui" line="935"/> <source>Password</source> <translation>Lozinka</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="802"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="419"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>Pressure</source> <translation>Pritisak</translation> </message> @@ -2088,82 +2123,82 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="207"/> + <location filename="../qt-ui/preferences.ui" line="217"/> <source>Display invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="224"/> + <location filename="../qt-ui/preferences.ui" line="234"/> <source>Default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="230"/> + <location filename="../qt-ui/preferences.ui" line="240"/> <source>Use default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="280"/> + <location filename="../qt-ui/preferences.ui" line="290"/> <source>Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="286"/> + <location filename="../qt-ui/preferences.ui" line="296"/> <source>Default user ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Save user ID locally?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="446"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>Volume</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="473"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="500"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>Weight</source> <translation>Težina</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="517"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="532"/> + <location filename="../qt-ui/preferences.ui" line="542"/> <source>Time units</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="545"/> + <location filename="../qt-ui/preferences.ui" line="555"/> <source>Minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="555"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Seconds</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="587"/> + <location filename="../qt-ui/preferences.ui" line="597"/> <source>Show</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="756"/> + <location filename="../qt-ui/preferences.ui" line="766"/> <source>GFLow at max depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="716"/> + <location filename="../qt-ui/preferences.ui" line="726"/> <source>Misc</source> <translation type="unfinished"/> </message> @@ -2173,52 +2208,52 @@ p, li { white-space: pre-wrap; } <translation>Postavke</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="538"/> + <location filename="../qt-ui/preferences.ui" line="548"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="598"/> + <location filename="../qt-ui/preferences.ui" line="608"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="619"/> + <location filename="../qt-ui/preferences.ui" line="629"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="640"/> + <location filename="../qt-ui/preferences.ui" line="650"/> <source>Threshold when showing pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="661"/> + <location filename="../qt-ui/preferences.ui" line="671"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="682"/> + <location filename="../qt-ui/preferences.ui" line="692"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="693"/> + <location filename="../qt-ui/preferences.ui" line="703"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="704"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Show average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="722"/> + <location filename="../qt-ui/preferences.ui" line="732"/> <source>GFLow</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="739"/> + <location filename="../qt-ui/preferences.ui" line="749"/> <source>GFHigh</source> <translation type="unfinished"/> </message> @@ -2243,32 +2278,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="245"/> + <location filename="../qt-ui/preferences.cpp" line="247"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="246"/> + <location filename="../qt-ui/preferences.cpp" line="248"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="395"/> + <location filename="../qt-ui/preferences.cpp" line="398"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="394"/> + <location filename="../qt-ui/preferences.cpp" line="397"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -2363,51 +2398,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/printoptions.ui" line="145"/> + <source>1 dive per page</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/printoptions.ui" line="158"/> <source>Table print</source> <translation>Tablični ispis</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="162"/> + <location filename="../qt-ui/printoptions.ui" line="175"/> <source>Ordering</source> <translation>Redosljed</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="180"/> + <location filename="../qt-ui/printoptions.ui" line="193"/> <source>Profile on top</source> <translation>Profil na vrhu</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="202"/> + <location filename="../qt-ui/printoptions.ui" line="215"/> <source>Notes on top</source> <translation>Bilješke na vrhu</translation> </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="219"/> - <source>Sizing heights (% of layout)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="256"/> - <source>Profile height (43% - 85%)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="278"/> - <source>Other data height (8% - 17%)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="338"/> - <source>Notes height (0% - 52%)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="354"/> - <location filename="../qt-ui/printoptions.ui" line="370"/> - <location filename="../qt-ui/printoptions.ui" line="386"/> - <source>0</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ProfilePrintModel</name> @@ -2485,77 +2498,77 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="520"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="515"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="898"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="895"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="900"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="897"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="907"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="918"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="915"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="922"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="919"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="930"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="947"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="944"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1016"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1013"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1017"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1014"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1082"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1086"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1083"/> <source>Custom name:</source> <translation type="unfinished"/> </message> @@ -2568,7 +2581,7 @@ p, li { white-space: pre-wrap; } <translation>Zrak</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="212"/> + <location filename="../qt-ui/diveplanner.cpp" line="210"/> <source>Remove this point</source> <translation type="unfinished"/> </message> @@ -2638,22 +2651,22 @@ p, li { white-space: pre-wrap; } <translation>cuft</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="529"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="575"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> @@ -2818,42 +2831,47 @@ p, li { white-space: pre-wrap; } <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="337"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="338"/> <source>Webservice</source> <translation>Web servis</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="401"/> <source>Connecting...</source> <translation>Spajanje...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="420"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="433"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="434"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/> <source>Connection error: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/> <source>Download successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="447"/> <source>Invalid user identifier!</source> <translation>Neispravna korisnička oznaka</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="321"/> + <source>Enter User ID and click Download</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/> <source>Cannot parse response!</source> <translation>Ne mogu obraditi odziv</translation> </message> @@ -2895,42 +2913,42 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="35"/> + <location filename="../qt-ui/updatemanager.cpp" line="33"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <location filename="../qt-ui/updatemanager.cpp" line="34"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="41"/> + <location filename="../qt-ui/updatemanager.cpp" line="39"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <location filename="../qt-ui/updatemanager.cpp" line="40"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="51"/> + <location filename="../qt-ui/updatemanager.cpp" line="49"/> <source>You are using the latest version of subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="53"/> + <location filename="../qt-ui/updatemanager.cpp" line="51"/> <source>A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="56"/> + <location filename="../qt-ui/updatemanager.cpp" line="54"/> <source><b>A new version of subsurface is available.</b><br/><br/>%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="57"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation type="unfinished"/> </message> @@ -2943,8 +2961,8 @@ p, li { white-space: pre-wrap; } <translation>Korisnički priručnik</translation> </message> <message> - <location filename="../qt-ui/usermanual.cpp" line="70"/> - <location filename="../qt-ui/usermanual.cpp" line="76"/> + <location filename="../qt-ui/usermanual.cpp" line="72"/> + <location filename="../qt-ui/usermanual.cpp" line="78"/> <source>Cannot find the Subsurface manual</source> <translation type="unfinished"/> </message> @@ -3030,27 +3048,27 @@ Language: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="74"/> + <location filename="../qt-ui/usersurvey.cpp" line="72"/> <source>Should we ask you later?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="75"/> + <location filename="../qt-ui/usersurvey.cpp" line="73"/> <source>Don't ask me again</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="76"/> + <location filename="../qt-ui/usersurvey.cpp" line="74"/> <source>Ask later</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="96"/> + <location filename="../qt-ui/usersurvey.cpp" line="94"/> <source>Submit user survey.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="77"/> + <location filename="../qt-ui/usersurvey.cpp" line="75"/> <source>Ask again?</source> <translation type="unfinished"/> </message> @@ -3061,27 +3079,27 @@ OS CPU Architecture: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="97"/> + <location filename="../qt-ui/usersurvey.cpp" line="95"/> <source>Subsurface was unable to submit the user survey.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="102"/> + <location filename="../qt-ui/usersurvey.cpp" line="100"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="103"/> + <location filename="../qt-ui/usersurvey.cpp" line="101"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="112"/> + <location filename="../qt-ui/usersurvey.cpp" line="110"/> <source>Survey successfully submitted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="117"/> + <location filename="../qt-ui/usersurvey.cpp" line="115"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation type="unfinished"/> </message> @@ -3251,13 +3269,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="128"/> - <location filename="../qt-gui.cpp" line="323"/> + <location filename="../qt-gui.cpp" line="329"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="132"/> - <location filename="../qt-gui.cpp" line="326"/> + <location filename="../qt-gui.cpp" line="332"/> <source>psi</source> <translation>psi</translation> </message> @@ -3268,16 +3286,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="203"/> - <location filename="../qt-gui.cpp" line="205"/> - <location filename="../qt-gui.cpp" line="220"/> + <location filename="../qt-gui.cpp" line="211"/> + <location filename="../qt-gui.cpp" line="226"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="208"/> - <location filename="../qt-gui.cpp" line="208"/> - <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="214"/> + <location filename="../qt-gui.cpp" line="228"/> <source>ft</source> <translation>ft</translation> </message> @@ -3303,15 +3321,15 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="259"/> - <location filename="../qt-gui.cpp" line="231"/> - <location filename="../qt-gui.cpp" line="241"/> + <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="247"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="263"/> - <location filename="../qt-gui.cpp" line="229"/> - <location filename="../qt-gui.cpp" line="239"/> + <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="245"/> <source>kg</source> <translation>kg</translation> </message> @@ -3321,36 +3339,36 @@ Maximum</source> <translation>(%s) ili (%s)</translation> </message> <message> - <location filename="../divelist.c" line="467"/> - <location filename="../equipment.c" line="104"/> - <location filename="../planner.c" line="986"/> - <location filename="../planner.c" line="989"/> + <location filename="../divelist.c" line="460"/> + <location filename="../equipment.c" line="79"/> + <location filename="../planner.c" line="988"/> + <location filename="../planner.c" line="991"/> <location filename="../statistics.c" line="355"/> <source>air</source> <translation>zrak</translation> </message> <message> - <location filename="../equipment.c" line="210"/> + <location filename="../equipment.c" line="185"/> <source>integrated</source> <translation>integrirani</translation> </message> <message> - <location filename="../equipment.c" line="211"/> + <location filename="../equipment.c" line="186"/> <source>belt</source> <translation>pojas</translation> </message> <message> - <location filename="../equipment.c" line="212"/> + <location filename="../equipment.c" line="187"/> <source>ankle</source> <translation>gležanj</translation> </message> <message> - <location filename="../equipment.c" line="213"/> + <location filename="../equipment.c" line="188"/> <source>backplate weight</source> <translation>backplate olova</translation> </message> <message> - <location filename="../equipment.c" line="214"/> + <location filename="../equipment.c" line="189"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -3657,131 +3675,130 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../equipment.c" line="106"/> + <location filename="../equipment.c" line="81"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="159"/> - <location filename="../planner.c" line="761"/> + <location filename="../planner.c" line="763"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="345"/> + <location filename="../planner.c" line="347"/> <source>Too many gas mixes</source> <translation>Previše mješavina plinova</translation> </message> <message> - <location filename="../planner.c" line="526"/> + <location filename="../planner.c" line="528"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>UPOZORENJE: OVO JE NOVA IMPLEMENTACIJA BUHLMANN ALGORITMA I PLANERA TEMELJENOG NA NJEMU KOJA JE SAMO DJELOMIČNO TESTIRANA. NIKAKO SE NE PREPORUČA PLANIRANJE URONA TEMELJEM SAMO OVIH INFORMACIJA.</translation> </message> <message> - <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="537"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="538"/> + <location filename="../planner.c" line="540"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="544"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="545"/> + <location filename="../planner.c" line="547"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="548"/> + <location filename="../planner.c" line="550"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="551"/> + <location filename="../planner.c" line="553"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="585"/> + <location filename="../planner.c" line="587"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="595"/> + <location filename="../planner.c" line="597"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="606"/> + <location filename="../planner.c" line="608"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="609"/> - <location filename="../planner.c" line="613"/> + <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="615"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="629"/> + <location filename="../planner.c" line="631"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="642"/> + <location filename="../planner.c" line="644"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="644"/> + <location filename="../planner.c" line="646"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="649"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="667"/> - <location filename="../planner.c" line="672"/> - <location filename="../planner.c" line="695"/> + <location filename="../planner.c" line="669"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="697"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="668"/> + <location filename="../planner.c" line="670"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="673"/> + <location filename="../planner.c" line="675"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="677"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="679"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="692"/> + <location filename="../planner.c" line="694"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="990"/> + <location filename="../planner.c" line="992"/> <source>ean</source> <translation>ean</translation> </message> @@ -3985,22 +4002,22 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="281"/> + <location filename="../qt-gui.cpp" line="287"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="284"/> + <location filename="../qt-gui.cpp" line="290"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="417"/> + <location filename="../qt-gui.cpp" line="427"/> <source>%1 %2 (%3 dives)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="422"/> + <location filename="../qt-gui.cpp" line="432"/> <source>%1 %2 (1 dive)</source> <translation type="unfinished"/> </message> @@ -4150,97 +4167,97 @@ EADD: %d%s <translation>(nema urona)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sun</source> <translation>Ned</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Mon</source> <translation>Pon</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Tue</source> <translation>Uto</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Wed</source> <translation>Sri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Thu</source> <translation>Čet</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Fri</source> <translation>Pet</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sat</source> <translation>Sub</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jan</source> <translation>Sij</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Feb</source> <translation>Velj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mar</source> <translation>Ožu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Apr</source> <translation>Tra</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>May</source> <translation>Svi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jun</source> <translation>Lip</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Jul</source> <translation>Srp</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Aug</source> <translation>Kol</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Sep</source> <translation>Ruj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Oct</source> <translation>Lis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Nov</source> <translation>Stu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Dec</source> <translation>Pro</translation> </message> @@ -4562,21 +4579,6 @@ Je li Uemis Zurich ispravno priključen?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/plannerSettings.ui" line="94"/> - <source>75%-50% avg. depth</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="111"/> - <source>50% avg. depth - 6m/20ft</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="128"/> - <source>6m/20ft to surface</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/plannerSettings.ui" line="148"/> <source>Descent</source> <translation type="unfinished"/> @@ -4608,7 +4610,7 @@ Je li Uemis Zurich ispravno priključen?</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="288"/> - <source>Last Stop at 6m/20ft</source> + <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> @@ -4673,6 +4675,21 @@ Je li Uemis Zurich ispravno priključen?</translation> <translation>bar</translation> </message> <message> + <location filename="../qt-ui/plannerSettings.ui" line="94"/> + <source>75% to 50% avg. depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="111"/> + <source>50% avg. depth to 6m</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="128"/> + <source>6m to surface</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/plannerSettings.ui" line="442"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index 66c0f64aa..2ebfe275c 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -103,18 +103,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="107"/> <source>Bailing out to OC</source> <translation>Bailing out untuk OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="103"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="109"/> <source> begin</source> <comment>Starts with space!</comment> <translation>Mulai</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="104"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="110"/> <source> end</source> <comment>Starts with space!</comment> <translation>Akhir</translation> @@ -136,87 +136,87 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="705"/> + <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="706"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="707"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="709"/> + <location filename="../qt-ui/divelistview.cpp" line="711"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="712"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="726"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="731"/> + <location filename="../qt-ui/divelistview.cpp" line="733"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="737"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="737"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="741"/> + <location filename="../qt-ui/divelistview.cpp" line="743"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="745"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="746"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="747"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -224,59 +224,59 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="30"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="35"/> <source>Export format</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="42"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="47"/> <source>Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="61"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="66"/> <source>UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="74"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="79"/> <source>divelogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="84"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="89"/> <source>CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="94"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="99"/> <source>Worldmap</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="112"/> <source>Selection</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="116"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="121"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="208"/> <source>Selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="126"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="131"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="234"/> <source>All dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="178"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="183"/> <source>HTML</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="216"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="221"/> <source>Minimum Javascript</source> <translation type="unfinished"/> </message> @@ -286,87 +286,87 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="24"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="29"/> <source>General export</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="184"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>General settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="190"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="195"/> <source>Subsurface numbers</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="239"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export list only</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="252"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="257"/> <source>Style options</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="264"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="269"/> <source>Font</source> <translation>Huruf</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="274"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="279"/> <source>Font size</source> <translation>Ukuran Huruf</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="285"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> <source>8</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> <source>10</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> <source>12</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>14</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> <source>16</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> <source>18</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="320"/> <source>20</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="323"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="328"/> <source>Theme</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> <source>Light</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Sand</source> <translation type="unfinished"/> </message> @@ -627,42 +627,42 @@ <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="137"/> + <location filename="../qt-ui/diveplanner.cpp" line="135"/> <source>unknown</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="622"/> + <location filename="../qt-ui/diveplanner.cpp" line="634"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="624"/> + <location filename="../qt-ui/diveplanner.cpp" line="636"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="626"/> + <location filename="../qt-ui/diveplanner.cpp" line="638"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="628"/> + <location filename="../qt-ui/diveplanner.cpp" line="640"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="630"/> + <location filename="../qt-ui/diveplanner.cpp" line="642"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="925"/> + <location filename="../qt-ui/diveplanner.cpp" line="938"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="926"/> + <location filename="../qt-ui/diveplanner.cpp" line="939"/> <source>You are about to discard your plan.</source> <translation>Kamu hendak mengabaikan Rencana</translation> </message> @@ -670,17 +670,17 @@ <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="255"/> + <location filename="../qt-ui/diveplanner.cpp" line="254"/> <source>Dive planner points</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="259"/> + <location filename="../qt-ui/diveplanner.cpp" line="258"/> <source>Available gases</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="282"/> + <location filename="../qt-ui/diveplanner.cpp" line="281"/> <source>Add dive data point</source> <translation type="unfinished"/> </message> @@ -854,69 +854,69 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="636"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="832"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="637"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="667"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="668"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="698"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="699"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="747"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="790"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="850"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="853"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="855"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="867"/> <source>Error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="834"/> <source>Upload finished</source> <translation type="unfinished"/> </message> @@ -1048,7 +1048,7 @@ <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="450"/> <source>Location</source> <translation>Lokasi</translation> </message> @@ -1089,27 +1089,27 @@ </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="415"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="607"/> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="245"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="626"/> - <location filename="../qt-ui/maintab.cpp" line="245"/> + <location filename="../qt-ui/maintab.cpp" line="246"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="440"/> + <location filename="../qt-ui/maintab.cpp" line="451"/> <source>Notes</source> <translation>Catatan</translation> </message> @@ -1226,114 +1226,114 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="88"/> + <location filename="../qt-ui/maintab.cpp" line="89"/> <source>Cylinders</source> <translation>Tabung</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="89"/> + <location filename="../qt-ui/maintab.cpp" line="90"/> <source>Add Cylinder</source> <translation>Tambah Tabung</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="93"/> <source>Weights</source> <translation>Berat</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="93"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Add Weight System</source> <translation>Tambah Sistem Berat</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="48"/> + <location filename="../qt-ui/maintab.cpp" line="49"/> <source>Save</source> <translation>Simpan</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="52"/> + <location filename="../qt-ui/maintab.cpp" line="53"/> <source>Cancel</source> <translation>Batal</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="241"/> + <location filename="../qt-ui/maintab.cpp" line="242"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="242"/> + <location filename="../qt-ui/maintab.cpp" line="243"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="277"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="284"/> + <location filename="../qt-ui/maintab.cpp" line="285"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="286"/> + <location filename="../qt-ui/maintab.cpp" line="287"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="386"/> - <location filename="../qt-ui/maintab.cpp" line="410"/> + <location filename="../qt-ui/maintab.cpp" line="397"/> + <location filename="../qt-ui/maintab.cpp" line="421"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="408"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="461"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> - <location filename="../qt-ui/maintab.cpp" line="502"/> - <location filename="../qt-ui/maintab.cpp" line="503"/> - <location filename="../qt-ui/maintab.cpp" line="504"/> + <location filename="../qt-ui/maintab.cpp" line="472"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> + <location filename="../qt-ui/maintab.cpp" line="513"/> + <location filename="../qt-ui/maintab.cpp" line="514"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> <source>/min</source> <translation>/menit</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="463"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>unknown</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="500"/> + <location filename="../qt-ui/maintab.cpp" line="511"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="501"/> + <location filename="../qt-ui/maintab.cpp" line="512"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="556"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="549"/> + <location filename="../qt-ui/maintab.cpp" line="560"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="797"/> + <location filename="../qt-ui/maintab.cpp" line="808"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="798"/> + <location filename="../qt-ui/maintab.cpp" line="809"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -1809,70 +1809,70 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="421"/> + <location filename="../qt-ui/mainwindow.cpp" line="422"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="516"/> + <location filename="../qt-ui/mainwindow.cpp" line="522"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="701"/> + <location filename="../qt-ui/mainwindow.cpp" line="707"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="703"/> + <location filename="../qt-ui/mainwindow.cpp" line="709"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="708"/> + <location filename="../qt-ui/mainwindow.cpp" line="714"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1066"/> + <location filename="../qt-ui/mainwindow.cpp" line="1072"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1190"/> + <location filename="../qt-ui/mainwindow.cpp" line="1196"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1191"/> + <location filename="../qt-ui/mainwindow.cpp" line="1197"/> <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="709"/> + <location filename="../qt-ui/mainwindow.cpp" line="715"/> <source>Changes will be lost if you don't save them.</source> <translation>Perubahan akan hilang jika anda tidak simpan.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="251"/> <location filename="../qt-ui/mainwindow.cpp" line="390"/> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="188"/> - <location filename="../qt-ui/mainwindow.cpp" line="1050"/> + <location filename="../qt-ui/mainwindow.cpp" line="1056"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1067"/> + <location filename="../qt-ui/mainwindow.cpp" line="1073"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -1880,15 +1880,45 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="444"/> - <source>Last stop at 20ft</source> + <location filename="../qt-ui/diveplanner.cpp" line="450"/> + <source>ft/min</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="451"/> + <source>Last stop at 20ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="452"/> + <source>50% avg. depth to 20ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="453"/> + <source>20ft to surface</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="455"/> + <source>m/min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="456"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="457"/> + <source>50% avg. depth to 6m</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="458"/> + <source>6m to surface</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesDialog</name> @@ -1934,146 +1964,151 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/preferences.ui" line="198"/> + <source>Use default</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="247"/> + <location filename="../qt-ui/preferences.ui" line="257"/> <source>Animations</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="253"/> + <location filename="../qt-ui/preferences.ui" line="263"/> <source>Speed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="312"/> + <location filename="../qt-ui/preferences.ui" line="322"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="341"/> + <location filename="../qt-ui/preferences.ui" line="351"/> <source>System</source> <translation>Sistem</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="348"/> + <location filename="../qt-ui/preferences.ui" line="358"/> <source>Metric</source> <translation>Metrik</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="358"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="368"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Personalize</source> <translation>Personalisasi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="392"/> + <location filename="../qt-ui/preferences.ui" line="402"/> <source>Depth</source> <translation>edalaman</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="399"/> + <location filename="../qt-ui/preferences.ui" line="409"/> <source>meter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="409"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>feet</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="426"/> + <location filename="../qt-ui/preferences.ui" line="436"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="436"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="453"/> + <location filename="../qt-ui/preferences.ui" line="463"/> <source>liter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="463"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>cu ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="490"/> <source>celsius</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="490"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>fahrenheit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="507"/> + <location filename="../qt-ui/preferences.ui" line="517"/> <source>kg</source> <translation>kgkg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="772"/> + <location filename="../qt-ui/preferences.ui" line="782"/> <source>System default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="811"/> + <location filename="../qt-ui/preferences.ui" line="821"/> <source>Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="817"/> + <location filename="../qt-ui/preferences.ui" line="827"/> <source>Proxy type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="830"/> + <location filename="../qt-ui/preferences.ui" line="840"/> <source>Host</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="856"/> + <location filename="../qt-ui/preferences.ui" line="866"/> <source>Port</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="882"/> + <location filename="../qt-ui/preferences.ui" line="892"/> <source>Requires authentication</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="912"/> <source>Username</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="925"/> + <location filename="../qt-ui/preferences.ui" line="935"/> <source>Password</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="802"/> <source>Filter</source> <translation>Saring</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="419"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>Pressure</source> <translation>Tekanan</translation> </message> @@ -2088,82 +2123,82 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="207"/> + <location filename="../qt-ui/preferences.ui" line="217"/> <source>Display invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="224"/> + <location filename="../qt-ui/preferences.ui" line="234"/> <source>Default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="230"/> + <location filename="../qt-ui/preferences.ui" line="240"/> <source>Use default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="280"/> + <location filename="../qt-ui/preferences.ui" line="290"/> <source>Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="286"/> + <location filename="../qt-ui/preferences.ui" line="296"/> <source>Default user ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Save user ID locally?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="446"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="473"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>Temperature</source> <translation>Suhu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="500"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>Weight</source> <translation>Berat</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="517"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="532"/> + <location filename="../qt-ui/preferences.ui" line="542"/> <source>Time units</source> <translation>Satuan Waktu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="545"/> + <location filename="../qt-ui/preferences.ui" line="555"/> <source>Minutes</source> <translation>Menit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="555"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Seconds</source> <translation>Detik</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="587"/> + <location filename="../qt-ui/preferences.ui" line="597"/> <source>Show</source> <translation>Tampilkan</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="756"/> + <location filename="../qt-ui/preferences.ui" line="766"/> <source>GFLow at max depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="716"/> + <location filename="../qt-ui/preferences.ui" line="726"/> <source>Misc</source> <translation>Lain-lain</translation> </message> @@ -2173,52 +2208,52 @@ p, li { white-space: pre-wrap; } <translation>Preferensi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="538"/> + <location filename="../qt-ui/preferences.ui" line="548"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="598"/> + <location filename="../qt-ui/preferences.ui" line="608"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="619"/> + <location filename="../qt-ui/preferences.ui" line="629"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="640"/> + <location filename="../qt-ui/preferences.ui" line="650"/> <source>Threshold when showing pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="661"/> + <location filename="../qt-ui/preferences.ui" line="671"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="682"/> + <location filename="../qt-ui/preferences.ui" line="692"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="693"/> + <location filename="../qt-ui/preferences.ui" line="703"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="704"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Show average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="722"/> + <location filename="../qt-ui/preferences.ui" line="732"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="739"/> + <location filename="../qt-ui/preferences.ui" line="749"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> @@ -2243,32 +2278,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="245"/> + <location filename="../qt-ui/preferences.cpp" line="247"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="246"/> + <location filename="../qt-ui/preferences.cpp" line="248"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="395"/> + <location filename="../qt-ui/preferences.cpp" line="398"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="394"/> + <location filename="../qt-ui/preferences.cpp" line="397"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -2363,51 +2398,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/printoptions.ui" line="145"/> + <source>1 dive per page</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/printoptions.ui" line="158"/> <source>Table print</source> <translation>Cetak Tabel</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="162"/> + <location filename="../qt-ui/printoptions.ui" line="175"/> <source>Ordering</source> <translation>Urutan</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="180"/> + <location filename="../qt-ui/printoptions.ui" line="193"/> <source>Profile on top</source> <translation>Profil di atas</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="202"/> + <location filename="../qt-ui/printoptions.ui" line="215"/> <source>Notes on top</source> <translation>Catatan di atas</translation> </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="219"/> - <source>Sizing heights (% of layout)</source> - <translation>Tinggi Pengukuran (% dari layout)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="256"/> - <source>Profile height (43% - 85%)</source> - <translation>Tinggi Profil (43% - 85%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="278"/> - <source>Other data height (8% - 17%)</source> - <translation>Berkas Ketinggian lain (8% - 17%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="338"/> - <source>Notes height (0% - 52%)</source> - <translation>Ketinggian Catatan (0% - 52%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="354"/> - <location filename="../qt-ui/printoptions.ui" line="370"/> - <location filename="../qt-ui/printoptions.ui" line="386"/> - <source>0</source> - <translation>0</translation> - </message> </context> <context> <name>ProfilePrintModel</name> @@ -2485,77 +2498,77 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="520"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="515"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="898"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="895"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="900"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="897"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="907"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="918"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="915"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="922"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="919"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="930"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="947"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="944"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1016"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1013"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1017"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1014"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1082"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1086"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1083"/> <source>Custom name:</source> <translation type="unfinished"/> </message> @@ -2568,7 +2581,7 @@ p, li { white-space: pre-wrap; } <translation>UDARA</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="212"/> + <location filename="../qt-ui/diveplanner.cpp" line="210"/> <source>Remove this point</source> <translation type="unfinished"/> </message> @@ -2638,22 +2651,22 @@ p, li { white-space: pre-wrap; } <translation>cuft</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="529"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="575"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> @@ -2818,42 +2831,47 @@ p, li { white-space: pre-wrap; } <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="337"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="338"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="401"/> <source>Connecting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="420"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="433"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="434"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/> <source>Connection error: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/> <source>Download successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="447"/> <source>Invalid user identifier!</source> <translation>identifikasi pengguna tidak cocok!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="321"/> + <source>Enter User ID and click Download</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/> <source>Cannot parse response!</source> <translation>Respon gagal di telaah!</translation> </message> @@ -2895,42 +2913,42 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="35"/> + <location filename="../qt-ui/updatemanager.cpp" line="33"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <location filename="../qt-ui/updatemanager.cpp" line="34"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="41"/> + <location filename="../qt-ui/updatemanager.cpp" line="39"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <location filename="../qt-ui/updatemanager.cpp" line="40"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="51"/> + <location filename="../qt-ui/updatemanager.cpp" line="49"/> <source>You are using the latest version of subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="53"/> + <location filename="../qt-ui/updatemanager.cpp" line="51"/> <source>A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="56"/> + <location filename="../qt-ui/updatemanager.cpp" line="54"/> <source><b>A new version of subsurface is available.</b><br/><br/>%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="57"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation type="unfinished"/> </message> @@ -2943,8 +2961,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usermanual.cpp" line="70"/> - <location filename="../qt-ui/usermanual.cpp" line="76"/> + <location filename="../qt-ui/usermanual.cpp" line="72"/> + <location filename="../qt-ui/usermanual.cpp" line="78"/> <source>Cannot find the Subsurface manual</source> <translation>Panduan Subsurface tak dapat ditemukan</translation> </message> @@ -3030,27 +3048,27 @@ Language: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="74"/> + <location filename="../qt-ui/usersurvey.cpp" line="72"/> <source>Should we ask you later?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="75"/> + <location filename="../qt-ui/usersurvey.cpp" line="73"/> <source>Don't ask me again</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="76"/> + <location filename="../qt-ui/usersurvey.cpp" line="74"/> <source>Ask later</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="96"/> + <location filename="../qt-ui/usersurvey.cpp" line="94"/> <source>Submit user survey.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="77"/> + <location filename="../qt-ui/usersurvey.cpp" line="75"/> <source>Ask again?</source> <translation type="unfinished"/> </message> @@ -3061,27 +3079,27 @@ OS CPU Architecture: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="97"/> + <location filename="../qt-ui/usersurvey.cpp" line="95"/> <source>Subsurface was unable to submit the user survey.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="102"/> + <location filename="../qt-ui/usersurvey.cpp" line="100"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="103"/> + <location filename="../qt-ui/usersurvey.cpp" line="101"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="112"/> + <location filename="../qt-ui/usersurvey.cpp" line="110"/> <source>Survey successfully submitted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="117"/> + <location filename="../qt-ui/usersurvey.cpp" line="115"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation type="unfinished"/> </message> @@ -3259,13 +3277,13 @@ Rata-rata</translation> </message> <message> <location filename="../dive.c" line="128"/> - <location filename="../qt-gui.cpp" line="323"/> + <location filename="../qt-gui.cpp" line="329"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="132"/> - <location filename="../qt-gui.cpp" line="326"/> + <location filename="../qt-gui.cpp" line="332"/> <source>psi</source> <translation>psi</translation> </message> @@ -3276,16 +3294,16 @@ Rata-rata</translation> </message> <message> <location filename="../dive.c" line="203"/> - <location filename="../qt-gui.cpp" line="205"/> - <location filename="../qt-gui.cpp" line="220"/> + <location filename="../qt-gui.cpp" line="211"/> + <location filename="../qt-gui.cpp" line="226"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="208"/> - <location filename="../qt-gui.cpp" line="208"/> - <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="214"/> + <location filename="../qt-gui.cpp" line="228"/> <source>ft</source> <translation>ft</translation> </message> @@ -3311,15 +3329,15 @@ Rata-rata</translation> </message> <message> <location filename="../dive.c" line="259"/> - <location filename="../qt-gui.cpp" line="231"/> - <location filename="../qt-gui.cpp" line="241"/> + <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="247"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="263"/> - <location filename="../qt-gui.cpp" line="229"/> - <location filename="../qt-gui.cpp" line="239"/> + <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="245"/> <source>kg</source> <translation>kg</translation> </message> @@ -3329,36 +3347,36 @@ Rata-rata</translation> <translation>(%s) or (%s)</translation> </message> <message> - <location filename="../divelist.c" line="467"/> - <location filename="../equipment.c" line="104"/> - <location filename="../planner.c" line="986"/> - <location filename="../planner.c" line="989"/> + <location filename="../divelist.c" line="460"/> + <location filename="../equipment.c" line="79"/> + <location filename="../planner.c" line="988"/> + <location filename="../planner.c" line="991"/> <location filename="../statistics.c" line="355"/> <source>air</source> <translation>udara</translation> </message> <message> - <location filename="../equipment.c" line="210"/> + <location filename="../equipment.c" line="185"/> <source>integrated</source> <translation>terintegrasi</translation> </message> <message> - <location filename="../equipment.c" line="211"/> + <location filename="../equipment.c" line="186"/> <source>belt</source> <translation>sabuk</translation> </message> <message> - <location filename="../equipment.c" line="212"/> + <location filename="../equipment.c" line="187"/> <source>ankle</source> <translation>Pergelangan kaki</translation> </message> <message> - <location filename="../equipment.c" line="213"/> + <location filename="../equipment.c" line="188"/> <source>backplate weight</source> <translation>berat plat-punggung</translation> </message> <message> - <location filename="../equipment.c" line="214"/> + <location filename="../equipment.c" line="189"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -3661,131 +3679,130 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../equipment.c" line="106"/> + <location filename="../equipment.c" line="81"/> <source>EAN%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="159"/> - <location filename="../planner.c" line="761"/> + <location filename="../planner.c" line="763"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="345"/> + <location filename="../planner.c" line="347"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="526"/> + <location filename="../planner.c" line="528"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="537"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="538"/> + <location filename="../planner.c" line="540"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="544"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="545"/> + <location filename="../planner.c" line="547"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="548"/> + <location filename="../planner.c" line="550"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="551"/> + <location filename="../planner.c" line="553"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="585"/> + <location filename="../planner.c" line="587"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="595"/> + <location filename="../planner.c" line="597"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="606"/> + <location filename="../planner.c" line="608"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="609"/> - <location filename="../planner.c" line="613"/> + <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="615"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="629"/> + <location filename="../planner.c" line="631"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="642"/> + <location filename="../planner.c" line="644"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="644"/> + <location filename="../planner.c" line="646"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="649"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="667"/> - <location filename="../planner.c" line="672"/> - <location filename="../planner.c" line="695"/> + <location filename="../planner.c" line="669"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="697"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="668"/> + <location filename="../planner.c" line="670"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="673"/> + <location filename="../planner.c" line="675"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="677"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="679"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="692"/> + <location filename="../planner.c" line="694"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="990"/> + <location filename="../planner.c" line="992"/> <source>ean</source> <translation type="unfinished"/> </message> @@ -3989,22 +4006,22 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="281"/> + <location filename="../qt-gui.cpp" line="287"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="284"/> + <location filename="../qt-gui.cpp" line="290"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="417"/> + <location filename="../qt-gui.cpp" line="427"/> <source>%1 %2 (%3 dives)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="422"/> + <location filename="../qt-gui.cpp" line="432"/> <source>%1 %2 (1 dive)</source> <translation type="unfinished"/> </message> @@ -4154,97 +4171,97 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sun</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Mon</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Tue</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Wed</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Thu</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Fri</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sat</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jan</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Feb</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mar</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Apr</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>May</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jun</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Jul</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Aug</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Sep</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Oct</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Nov</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Dec</source> <translation type="unfinished"/> </message> @@ -4561,21 +4578,6 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/plannerSettings.ui" line="94"/> - <source>75%-50% avg. depth</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="111"/> - <source>50% avg. depth - 6m/20ft</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="128"/> - <source>6m/20ft to surface</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/plannerSettings.ui" line="148"/> <source>Descent</source> <translation type="unfinished"/> @@ -4607,7 +4609,7 @@ Is the Uemis Zurich plugged in correctly?</source> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="288"/> - <source>Last Stop at 6m/20ft</source> + <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> @@ -4672,6 +4674,21 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>bar</translation> </message> <message> + <location filename="../qt-ui/plannerSettings.ui" line="94"/> + <source>75% to 50% avg. depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="111"/> + <source>50% avg. depth to 6m</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="128"/> + <source>6m to surface</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/plannerSettings.ui" line="442"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index 0cef5d8aa..d2a95c887 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -104,18 +104,18 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="107"/> <source>Bailing out to OC</source> <translation>Przejście na obieg otwarty</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="103"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="109"/> <source> begin</source> <comment>Starts with space!</comment> <translation> początek</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="104"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="110"/> <source> end</source> <comment>Starts with space!</comment> <translation> koniec</translation> @@ -137,87 +137,87 @@ wybrany komputer nurkowy?</translation> <translation>Pokaż okno wyszukiwania</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="705"/> + <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>Expand all</source> <translation>Rozwiń wszystkie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="706"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>Collapse all</source> <translation>Zwiń wszystkie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="707"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>Collapse others</source> <translation>Zwiń pozostałe</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="709"/> + <location filename="../qt-ui/divelistview.cpp" line="711"/> <source>Remove dive(s) from trip</source> <translation>Usuń nurkowanie(a) z grupy</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="712"/> <source>Create new trip above</source> <translation>Utwórz nową grupę powyżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>Add dive(s) to trip immediately above</source> <translation>Dodaj nurkowanie(a) do grupy powyżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="726"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>Add dive(s) to trip immediately below</source> <translation>Dodaj nurkowanie(a) do grupy poniżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>Merge trip with trip above</source> <translation>Połącz grupę z grupą powyżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="731"/> + <location filename="../qt-ui/divelistview.cpp" line="733"/> <source>Merge trip with trip below</source> <translation>Połącz grupę z grupą poniżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="737"/> <source>Delete dive(s)</source> <translation>Usuń nurkowanie(a)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="737"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>Mark dive(s) invalid</source> <translation>Oznacz nurkowanie(a) jak niepoprawne</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="741"/> + <location filename="../qt-ui/divelistview.cpp" line="743"/> <source>Merge selected dives</source> <translation>Połącz wybrane nurkowania</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="745"/> <source>Renumber dive(s)</source> <translation>Zmień numerację</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="746"/> <source>Shift times</source> <translation>Zmień czas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="747"/> <source>Load images</source> <translation>Dodaj zdjęcia</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Open image files</source> <translation>Dodawanie zdjęć</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -225,59 +225,59 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="30"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="35"/> <source>Export format</source> <translation>Format danych</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="42"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="47"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="61"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="66"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="74"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="79"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="84"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="89"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="94"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="99"/> <source>Worldmap</source> <translation>Mapa Świata</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="112"/> <source>Selection</source> <translation>Wybór</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="116"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="121"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="208"/> <source>Selected dives</source> <translation>Wybrane nurkowania</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="126"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="131"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="234"/> <source>All dives</source> <translation>Wszystkie nurkowania</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="178"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="183"/> <source>HTML</source> <translation>HTML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="216"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="221"/> <source>Minimum Javascript</source> <translation>Minimalny Javascript</translation> </message> @@ -287,87 +287,87 @@ wybrany komputer nurkowy?</translation> <translation>Eksportowanie nurkowań</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="24"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="29"/> <source>General export</source> <translation>Podstawowy eksport</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="184"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>General settings</source> <translation>Ogólne</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="190"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="195"/> <source>Subsurface numbers</source> <translation>Zachowaj numerację</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="239"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export list only</source> <translation>Eksportuj tylko listę</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="252"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="257"/> <source>Style options</source> <translation>Ustawienia stylu</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="264"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="269"/> <source>Font</source> <translation>Czcionka</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="274"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="279"/> <source>Font size</source> <translation>Rozmiar czcionki</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="285"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="320"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="323"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="328"/> <source>Theme</source> <translation>Motyw</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> <source>Light</source> - <translation>Lekki</translation> + <translation>Światło</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Sand</source> <translation>Piasek</translation> </message> @@ -628,42 +628,42 @@ wybrany komputer nurkowy?</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="137"/> + <location filename="../qt-ui/diveplanner.cpp" line="135"/> <source>unknown</source> <translation>nieznana</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="622"/> + <location filename="../qt-ui/diveplanner.cpp" line="634"/> <source>Final depth</source> <translation>Głębokość końcowa</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="624"/> + <location filename="../qt-ui/diveplanner.cpp" line="636"/> <source>Run time</source> <translation>Czas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="626"/> + <location filename="../qt-ui/diveplanner.cpp" line="638"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="628"/> + <location filename="../qt-ui/diveplanner.cpp" line="640"/> <source>Used gas</source> <translation>Używany gaz</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="630"/> + <location filename="../qt-ui/diveplanner.cpp" line="642"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="925"/> + <location filename="../qt-ui/diveplanner.cpp" line="938"/> <source>Discard the plan?</source> <translation>Porzucić plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="926"/> + <location filename="../qt-ui/diveplanner.cpp" line="939"/> <source>You are about to discard your plan.</source> <translation>Masz zamiar porzucić plan</translation> </message> @@ -671,17 +671,17 @@ wybrany komputer nurkowy?</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="255"/> + <location filename="../qt-ui/diveplanner.cpp" line="254"/> <source>Dive planner points</source> <translation>Plan nurkowy</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="259"/> + <location filename="../qt-ui/diveplanner.cpp" line="258"/> <source>Available gases</source> <translation>Dostępne gazy</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="282"/> + <location filename="../qt-ui/diveplanner.cpp" line="281"/> <source>Add dive data point</source> <translation>dodaj punkt do profilu</translation> </message> @@ -784,7 +784,7 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/models.cpp" line="1308"/> <source>Mins</source> - <translation>Minut</translation> + <translation>Czas</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1317"/> @@ -855,70 +855,70 @@ wybrany komputer nurkowy?</translation> <translation>błąd wewnętrzny</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="636"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="832"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="637"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> <source>Done</source> <translation>Zakończ</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="667"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="668"/> <source>Uploading dive list...</source> <translation>Wysyłanie listy nurkowań...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="698"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="699"/> <source>Downloading dive list...</source> <translation>Pobieranie listy nurkowań...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="747"/> <source>Downloading %1 dives...</source> <translation>Pobieranie %1 nurkowań...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="790"/> <source>Download finished - %1</source> <translation>Zakończono pobieranie - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> <source>Corrupted download</source> <translation>Pobrano uskodzone dane</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> <source>The archive could not be opened: %1</source> <translation>Archiwum nie mogło zostać otworzone: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/> <source>Upload failed</source> <translation>Wysyłanie nieudane</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="850"/> <source>Upload successful</source> <translation>Wysyłanie zakończone sukcesem</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="853"/> <source>Login failed</source> <translation>Błąd logowania</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="855"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/> <source>Cannot parse response</source> <translation>Nie można przetworzyć odpowiedzi</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="867"/> <source>Error: %1</source> <translation>Błąd: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="834"/> <source>Upload finished</source> <translation>Wysyłanie zakończone</translation> </message> @@ -1050,7 +1050,7 @@ wybrany komputer nurkowy?</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="450"/> <source>Location</source> <translation>Miejsce</translation> </message> @@ -1091,27 +1091,27 @@ wybrany komputer nurkowy?</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="415"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Dive notes</source> <translation>Notatki</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="607"/> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="245"/> <source>Air temp.</source> <translation>Temp. powietrza</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="626"/> - <location filename="../qt-ui/maintab.cpp" line="245"/> + <location filename="../qt-ui/maintab.cpp" line="246"/> <source>Water temp.</source> <translation>Temp. wody</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="440"/> + <location filename="../qt-ui/maintab.cpp" line="451"/> <source>Notes</source> <translation>Opis</translation> </message> @@ -1226,100 +1226,100 @@ wybrany komputer nurkowy?</translation> <message> <location filename="../qt-ui/maintab.ui" line="919"/> <source>Photos</source> - <translation>Zdjecia</translation> + <translation>Zdjęcia</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="88"/> + <location filename="../qt-ui/maintab.cpp" line="89"/> <source>Cylinders</source> <translation>Butle</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="89"/> + <location filename="../qt-ui/maintab.cpp" line="90"/> <source>Add Cylinder</source> <translation>Dodaj butlę</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="93"/> <source>Weights</source> <translation>Balast</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="93"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Add Weight System</source> <translation>Dodaj balast</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="48"/> + <location filename="../qt-ui/maintab.cpp" line="49"/> <source>Save</source> <translation>Zapisz</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="52"/> + <location filename="../qt-ui/maintab.cpp" line="53"/> <source>Cancel</source> <translation>Anuluj</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="241"/> + <location filename="../qt-ui/maintab.cpp" line="242"/> <source>Air temp. [%1]</source> <translation>Temp. powietrza [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="242"/> + <location filename="../qt-ui/maintab.cpp" line="243"/> <source>Water temp. [%1]</source> <translation>Temp. wody [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="277"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>This trip is being edited.</source> <translation>Ta grupa nurkowań jest obecnie edytowana.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="284"/> + <location filename="../qt-ui/maintab.cpp" line="285"/> <source>Multiple dives are being edited.</source> <translation>Kilka nurkowań jest obecnie edytowanych.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="286"/> + <location filename="../qt-ui/maintab.cpp" line="287"/> <source>This dive is being edited.</source> <translation>To nurkowanie jest obecnie edytowane.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="386"/> - <location filename="../qt-ui/maintab.cpp" line="410"/> + <location filename="../qt-ui/maintab.cpp" line="397"/> + <location filename="../qt-ui/maintab.cpp" line="421"/> <source>Trip notes</source> <translation>Opis nurkowań</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="408"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> <source>Trip location</source> <translation>Miejsce nurkowań</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="461"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> - <location filename="../qt-ui/maintab.cpp" line="502"/> - <location filename="../qt-ui/maintab.cpp" line="503"/> - <location filename="../qt-ui/maintab.cpp" line="504"/> + <location filename="../qt-ui/maintab.cpp" line="472"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> + <location filename="../qt-ui/maintab.cpp" line="513"/> + <location filename="../qt-ui/maintab.cpp" line="514"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="463"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>unknown</source> <translation>nieznana</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="500"/> + <location filename="../qt-ui/maintab.cpp" line="511"/> <source>Deepest dive</source> <translation>Najgłębsze nurkowanie</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="501"/> + <location filename="../qt-ui/maintab.cpp" line="512"/> <source>Shallowest dive</source> <translation>Najpłytsze nurkowanie</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="556"/> <source>These gases could be mixed from Air and using: </source> @@ -1328,17 +1328,17 @@ z powietrza przy użyciu: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="549"/> + <location filename="../qt-ui/maintab.cpp" line="560"/> <source> and </source> <translation>oraz </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="797"/> + <location filename="../qt-ui/maintab.cpp" line="808"/> <source>Discard the changes?</source> <translation>Porzucić zmiany?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="798"/> + <location filename="../qt-ui/maintab.cpp" line="809"/> <source>You are about to discard your changes.</source> <translation>Masz zamiar porzucić zmiany.</translation> </message> @@ -1818,70 +1818,70 @@ p, li { white-space: pre-wrap; } <translation>Zapisz zmiany lub anuluj edycję tego nurkowania przed dodaniem nowego.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="421"/> + <location filename="../qt-ui/mainwindow.cpp" line="422"/> <source>Print runtime table</source> <translation>Drukowanie planu nurkowego</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="516"/> + <location filename="../qt-ui/mainwindow.cpp" line="522"/> <source>Yearly statistics</source> <translation>Statystyka roczna</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="701"/> + <location filename="../qt-ui/mainwindow.cpp" line="707"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Czy chcesz zapisać zmiany dokonane w pliku %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="703"/> + <location filename="../qt-ui/mainwindow.cpp" line="709"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Czy chcesz zapisać wprowadzone zmiany?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="708"/> + <location filename="../qt-ui/mainwindow.cpp" line="714"/> <source>Save changes?</source> <translation>Zapisać zmiany?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1066"/> + <location filename="../qt-ui/mainwindow.cpp" line="1072"/> <source>Save file as</source> <translation>Zapisz plik jako</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1190"/> + <location filename="../qt-ui/mainwindow.cpp" line="1196"/> <source>Open dive log file</source> <translation>Otwórz plik z logiem</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1191"/> + <location filename="../qt-ui/mainwindow.cpp" line="1197"/> <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source> <translation>Logi nurkowe (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Pliki XML (*.xml);;Pliki UDDF/UDCF (*.uddf *.udcf);;Pliki JDiveLog (*.jlb);;Pliki Suunto(*.sde *.db);;Pliki CSV(*.csv);;Wszystkie pliki(*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="709"/> + <location filename="../qt-ui/mainwindow.cpp" line="715"/> <source>Changes will be lost if you don't save them.</source> <translation>Zmiany zostaną utracone jeśli ich nie za zapiszesz.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="251"/> <location filename="../qt-ui/mainwindow.cpp" line="390"/> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="188"/> - <location filename="../qt-ui/mainwindow.cpp" line="1050"/> + <location filename="../qt-ui/mainwindow.cpp" line="1056"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Zapisz zmiany lub anuluj to nurkowanie przez otwarciem nowego pliku.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1067"/> + <location filename="../qt-ui/mainwindow.cpp" line="1073"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Pliki Subsurface XML (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Proszę dokończyć edycję tego nurkowania przed rozpoczęciem kolejnej. </translation> </message> @@ -1889,15 +1889,45 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="444"/> + <location filename="../qt-ui/diveplanner.cpp" line="450"/> + <source>ft/min</source> + <translation>ft/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="451"/> <source>Last stop at 20ft</source> <translation>Ostatni przystanek na gł. 20 stóp</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="451"/> + <location filename="../qt-ui/diveplanner.cpp" line="452"/> + <source>50% avg. depth to 20ft</source> + <translation>50% śr. głębokości do 20ft</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="453"/> + <source>20ft to surface</source> + <translation>20ft do powierzchni</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="455"/> + <source>m/min</source> + <translation>m/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="456"/> <source>Last stop at 6m</source> <translation>Ostatni przystanek na 6m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="457"/> + <source>50% avg. depth to 6m</source> + <translation>50% śr. głębokości do 6m</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="458"/> + <source>6m to surface</source> + <translation>6m do powierzchni</translation> + </message> </context> <context> <name>PreferencesDialog</name> @@ -1943,146 +1973,151 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/preferences.ui" line="198"/> + <source>Use default</source> + <translation>Używaj domyślnego</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="247"/> + <location filename="../qt-ui/preferences.ui" line="257"/> <source>Animations</source> <translation>Animacje</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="253"/> + <location filename="../qt-ui/preferences.ui" line="263"/> <source>Speed</source> <translation>Prędkość</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Clear all settings</source> - <translation>Ustawienia fabryczne</translation> + <translation>Kasowanie ustawień</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="312"/> + <location filename="../qt-ui/preferences.ui" line="322"/> <source>Reset all settings to their default value</source> <translation>Przywróć wszystkie ustawienia do ich wartości domyślnych </translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="341"/> + <location filename="../qt-ui/preferences.ui" line="351"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="348"/> + <location filename="../qt-ui/preferences.ui" line="358"/> <source>Metric</source> <translation>Metryczny</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="358"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Imperial</source> <translation>Imperialny</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="368"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Personalize</source> <translation>Dostosuj</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="392"/> + <location filename="../qt-ui/preferences.ui" line="402"/> <source>Depth</source> <translation>Głębokość</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="399"/> + <location filename="../qt-ui/preferences.ui" line="409"/> <source>meter</source> <translation>metry</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="409"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>feet</source> <translation>stopy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="426"/> + <location filename="../qt-ui/preferences.ui" line="436"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="436"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="453"/> + <location filename="../qt-ui/preferences.ui" line="463"/> <source>liter</source> <translation>litry</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="463"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>cu ft</source> <translation>stopy sześcienne (cu ft)</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="490"/> <source>celsius</source> <translation>stopnie Celsjusza</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="490"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>fahrenheit</source> <translation>stopnie Fahrenheita</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="507"/> + <location filename="../qt-ui/preferences.ui" line="517"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="772"/> + <location filename="../qt-ui/preferences.ui" line="782"/> <source>System default</source> <translation>Domyślne ustawienia systemu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="811"/> + <location filename="../qt-ui/preferences.ui" line="821"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="817"/> + <location filename="../qt-ui/preferences.ui" line="827"/> <source>Proxy type</source> <translation>Rodzaj proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="830"/> + <location filename="../qt-ui/preferences.ui" line="840"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="856"/> + <location filename="../qt-ui/preferences.ui" line="866"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="882"/> + <location filename="../qt-ui/preferences.ui" line="892"/> <source>Requires authentication</source> <translation>Wymaga autentykacji</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="912"/> <source>Username</source> <translation>Użytkownik</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="925"/> + <location filename="../qt-ui/preferences.ui" line="935"/> <source>Password</source> <translation>Hasło</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="802"/> <source>Filter</source> <translation>Filtr</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="419"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>Pressure</source> <translation>Ciśnienie</translation> </message> @@ -2097,82 +2132,82 @@ p, li { white-space: pre-wrap; } <translation>Domyślny plik nurkowań</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="207"/> + <location filename="../qt-ui/preferences.ui" line="217"/> <source>Display invalid</source> - <translation>Pokazuj nurkowania oznaczone jako niepoprawne </translation> + <translation>Pokazuj niepoprawne nurkowania</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="224"/> + <location filename="../qt-ui/preferences.ui" line="234"/> <source>Default cylinder</source> <translation>Domyślna butla</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="230"/> + <location filename="../qt-ui/preferences.ui" line="240"/> <source>Use default cylinder</source> <translation>Użyj domyślnej butli</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="280"/> + <location filename="../qt-ui/preferences.ui" line="290"/> <source>Subsurface web service</source> <translation>Usługa Internetowa Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="286"/> + <location filename="../qt-ui/preferences.ui" line="296"/> <source>Default user ID</source> <translation>Domyślne ID Użytkownika</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Save user ID locally?</source> <translation>Zapisywać ID użytkownika do pliku?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="446"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>Volume</source> <translation>Objętość</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="473"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="500"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>Weight</source> <translation>Balast</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="517"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="532"/> + <location filename="../qt-ui/preferences.ui" line="542"/> <source>Time units</source> <translation>Jednostki czasu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="545"/> + <location filename="../qt-ui/preferences.ui" line="555"/> <source>Minutes</source> <translation>minuty</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="555"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Seconds</source> <translation>sekundy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="587"/> + <location filename="../qt-ui/preferences.ui" line="597"/> <source>Show</source> <translation>Pokaż</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="756"/> + <location filename="../qt-ui/preferences.ui" line="766"/> <source>GFLow at max depth</source> <translation>GFLow na maksymalnej głębokości</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="716"/> + <location filename="../qt-ui/preferences.ui" line="726"/> <source>Misc</source> <translation>Różne</translation> </message> @@ -2182,52 +2217,52 @@ p, li { white-space: pre-wrap; } <translation>Ustawienia</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="538"/> + <location filename="../qt-ui/preferences.ui" line="548"/> <source>Ascent/descent speed denominator</source> <translation>Mianownik szybkości zanurzania/wynurzania </translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="598"/> + <location filename="../qt-ui/preferences.ui" line="608"/> <source>Threshold when showing pO₂</source> <translation>Próg ostrzeżenia dla pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="619"/> + <location filename="../qt-ui/preferences.ui" line="629"/> <source>Threshold when showing pN₂</source> <translation>Próg ostrzeżenia dla pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="640"/> + <location filename="../qt-ui/preferences.ui" line="650"/> <source>Threshold when showing pHe</source> <translation>Próg ostrzeżenia dla pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="661"/> + <location filename="../qt-ui/preferences.ui" line="671"/> <source>Max pO₂ when showing MOD</source> <translation>Max ppO₂ gdy wyświetlany jest MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="682"/> + <location filename="../qt-ui/preferences.ui" line="692"/> <source>Draw dive computer reported ceiling red</source> <translation>Pokazuj sufit z komputera nurkowego na czerwono</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="693"/> + <location filename="../qt-ui/preferences.ui" line="703"/> <source>Show unused cylinders in Equipment tab</source> <translation>Pokazju nieużywane butle w zakładce Wyposażenie</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="704"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Show average depth</source> <translation>Pokazuj głębokość średnią</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="722"/> + <location filename="../qt-ui/preferences.ui" line="732"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="739"/> + <location filename="../qt-ui/preferences.ui" line="749"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> @@ -2252,32 +2287,32 @@ p, li { white-space: pre-wrap; } <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="245"/> + <location filename="../qt-ui/preferences.cpp" line="247"/> <source>Restart required</source> <translation>Wymagane ponowne uruchomienie</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="246"/> + <location filename="../qt-ui/preferences.cpp" line="248"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Aby użyć nowego języka musisz ponownie uruchomić Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="395"/> + <location filename="../qt-ui/preferences.cpp" line="398"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Jeśli klikniesz OK, wszystkie ustawienia Subsurface zostaną przywrócone do ich wartości początkowych - z natychmiastowym skutkiem.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Pliki Subsurface XML (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Open default log file</source> <translation>Otwórz domyślny plik</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="394"/> + <location filename="../qt-ui/preferences.cpp" line="397"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> @@ -2372,51 +2407,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/printoptions.ui" line="145"/> + <source>1 dive per page</source> + <translation>1 nurkowanie na stronę</translation> + </message> + <message> + <location filename="../qt-ui/printoptions.ui" line="158"/> <source>Table print</source> <translation>Tabela</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="162"/> + <location filename="../qt-ui/printoptions.ui" line="175"/> <source>Ordering</source> <translation>Kolejność</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="180"/> + <location filename="../qt-ui/printoptions.ui" line="193"/> <source>Profile on top</source> <translation>Profil na górze</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="202"/> + <location filename="../qt-ui/printoptions.ui" line="215"/> <source>Notes on top</source> <translation>Opis na górze</translation> </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="219"/> - <source>Sizing heights (% of layout)</source> - <translation>Wysokości drukowanych sekcji (% całości)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="256"/> - <source>Profile height (43% - 85%)</source> - <translation>Profil (43% - 85%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="278"/> - <source>Other data height (8% - 17%)</source> - <translation>Pozostałe dane (8% - 17%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="338"/> - <source>Notes height (0% - 52%)</source> - <translation>Opis (0% - 52%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="354"/> - <location filename="../qt-ui/printoptions.ui" line="370"/> - <location filename="../qt-ui/printoptions.ui" line="386"/> - <source>0</source> - <translation>0</translation> - </message> </context> <context> <name>ProfilePrintModel</name> @@ -2494,77 +2507,77 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="520"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="515"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="898"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="895"/> <source>Make first divecomputer</source> <translation>Ustaw jako pierwszy komputer nurkowy</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="900"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="897"/> <source>Delete this divecomputer</source> <translation>Usuń ten komputer nurkowy</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="907"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/> <source>Add gas change</source> <translation>Dodaj zmianę gazu</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="918"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="915"/> <source>Add bookmark</source> <translation>Dodaj notatkę</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="922"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="919"/> <source>Remove event</source> <translation>Usuń znacznik</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/> <source>Hide similar events</source> <translation>Ukryj podobne znaczniki</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="930"/> <source>Edit name</source> <translation>Zmień nazwę</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="947"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="944"/> <source>Unhide all events</source> <translation>Odkryj wszystkie znaczniki</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide events</source> <translation>Ukrywanie wydarzeń</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide all %1 events?</source> <translation>Ukyć wszystkie wydarzenia typu %1?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1016"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1013"/> <source>Remove the selected event?</source> <translation>Usunąć wybrane wydarzenie?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1017"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1014"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1082"/> <source>Edit name of bookmark</source> <translation>Zmień nazwę wydarzenia</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1086"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1083"/> <source>Custom name:</source> <translation>Własna nazwa:</translation> </message> @@ -2577,7 +2590,7 @@ p, li { white-space: pre-wrap; } <translation>POWIETRZE</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="212"/> + <location filename="../qt-ui/diveplanner.cpp" line="210"/> <source>Remove this point</source> <translation>Usuń ten punkt</translation> </message> @@ -2647,22 +2660,22 @@ p, li { white-space: pre-wrap; } <translation>cuft</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/> <source>Invalid response from server</source> <translation>Niepoprawna odpowiedź z serwera</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="529"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Oczekiwano tagu XML 'DiveDateReader', zamiast tego odczytano '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="575"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Oczekiwany tag XML 'DiveDates' nie został znaleziony</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> <source>Malformed XML response. Line %1: %2</source> <translation>Uszkodzona odpowiedź XML. Linia %1: %2</translation> </message> @@ -2827,42 +2840,47 @@ p, li { white-space: pre-wrap; } <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="337"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="338"/> <source>Webservice</source> <translation>Usługa Internetowa</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="401"/> <source>Connecting...</source> <translation>Łączenie...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="420"/> <source>Download finished</source> <translation>Pobieranie zakończone</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="433"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="434"/> <source>Download error: %1</source> <translation>Błąd pobierania: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/> <source>Connection error: </source> <translation>Błąd połączenia:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/> <source>Download successful</source> <translation>Pobieranie zakończone sukcesem</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="447"/> <source>Invalid user identifier!</source> <translation>Niepoprawny identyfikator użytkownika!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="321"/> + <source>Enter User ID and click Download</source> + <translation>Podaj ID użytkownika i wciśnij Pobierz</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/> <source>Cannot parse response!</source> <translation>Nie można przetworzyć odpowiedzi!</translation> </message> @@ -2904,42 +2922,42 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="35"/> + <location filename="../qt-ui/updatemanager.cpp" line="33"/> <source>Check for updates.</source> <translation>Sprawdzanie dostępności aktualizacji.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <location filename="../qt-ui/updatemanager.cpp" line="34"/> <source>Subsurface was unable to check for updates.</source> <translation>Nie udało się sprawdzić dostępności aktualizacji.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="41"/> + <location filename="../qt-ui/updatemanager.cpp" line="39"/> <source>The following error occurred:</source> <translation>Natrafiono na następujący błąd:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <location filename="../qt-ui/updatemanager.cpp" line="40"/> <source>Please check your internet connection.</source> <translation>Sprawdź proszę swoje połączenie z Internetem.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="51"/> + <location filename="../qt-ui/updatemanager.cpp" line="49"/> <source>You are using the latest version of subsurface.</source> <translation>Używasz najnowszej wersji Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="53"/> + <location filename="../qt-ui/updatemanager.cpp" line="51"/> <source>A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Nowa wersja Subsurface jest dostępna.<br/>Kliknij na:<br/><a href="%1">%1</a><br/> aby ją pobrać.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="56"/> + <location filename="../qt-ui/updatemanager.cpp" line="54"/> <source><b>A new version of subsurface is available.</b><br/><br/>%1</source> <translation><b>Nowsza wersja Subsurface jest dostępna.</b><br/><br/>%1</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="57"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>Wystapił błąd podczas sprawdzania dostępności aktualizaji.<br/><br/>%1</translation> </message> @@ -2952,8 +2970,8 @@ p, li { white-space: pre-wrap; } <translation>instrukcja obsługi</translation> </message> <message> - <location filename="../qt-ui/usermanual.cpp" line="70"/> - <location filename="../qt-ui/usermanual.cpp" line="76"/> + <location filename="../qt-ui/usermanual.cpp" line="72"/> + <location filename="../qt-ui/usermanual.cpp" line="78"/> <source>Cannot find the Subsurface manual</source> <translation>Nie można znaleźć dokumentacji Subsurface</translation> </message> @@ -3042,27 +3060,27 @@ Language: %1</source> Język: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="74"/> + <location filename="../qt-ui/usersurvey.cpp" line="72"/> <source>Should we ask you later?</source> <translation>Czy powinniśmy zapytać Cię ponownie?</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="75"/> + <location filename="../qt-ui/usersurvey.cpp" line="73"/> <source>Don't ask me again</source> <translation>Nie pytajcie mnie ponownie</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="76"/> + <location filename="../qt-ui/usersurvey.cpp" line="74"/> <source>Ask later</source> <translation>Zapytaj później</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="96"/> + <location filename="../qt-ui/usersurvey.cpp" line="94"/> <source>Submit user survey.</source> <translation>Wysyłanie ankiety.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="77"/> + <location filename="../qt-ui/usersurvey.cpp" line="75"/> <source>Ask again?</source> <translation>Zapytać ponownie?</translation> </message> @@ -3074,27 +3092,27 @@ OS CPU Architecture: %1</source> Architektura OS CPU: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="97"/> + <location filename="../qt-ui/usersurvey.cpp" line="95"/> <source>Subsurface was unable to submit the user survey.</source> <translation>Subsurface nie był w stanie wysłać ankiety.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="102"/> + <location filename="../qt-ui/usersurvey.cpp" line="100"/> <source>The following error occurred:</source> <translation>Natrafiono na następujący błąd:</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="103"/> + <location filename="../qt-ui/usersurvey.cpp" line="101"/> <source>Please check your internet connection.</source> <translation>Sprawdź proszę swoje połączenie z Internetem.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="112"/> + <location filename="../qt-ui/usersurvey.cpp" line="110"/> <source>Survey successfully submitted.</source> <translation>Ankieta pomyślnie wysłana.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="117"/> + <location filename="../qt-ui/usersurvey.cpp" line="115"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>Wystapił błąd podczas sprawdzania dostępności aktualizaji.<br/><br/>%1</translation> </message> @@ -3269,13 +3287,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="128"/> - <location filename="../qt-gui.cpp" line="323"/> + <location filename="../qt-gui.cpp" line="329"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="132"/> - <location filename="../qt-gui.cpp" line="326"/> + <location filename="../qt-gui.cpp" line="332"/> <source>psi</source> <translation>psi</translation> </message> @@ -3286,16 +3304,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="203"/> - <location filename="../qt-gui.cpp" line="205"/> - <location filename="../qt-gui.cpp" line="220"/> + <location filename="../qt-gui.cpp" line="211"/> + <location filename="../qt-gui.cpp" line="226"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="208"/> - <location filename="../qt-gui.cpp" line="208"/> - <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="214"/> + <location filename="../qt-gui.cpp" line="228"/> <source>ft</source> <translation>ft</translation> </message> @@ -3321,15 +3339,15 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="259"/> - <location filename="../qt-gui.cpp" line="231"/> - <location filename="../qt-gui.cpp" line="241"/> + <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="247"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="263"/> - <location filename="../qt-gui.cpp" line="229"/> - <location filename="../qt-gui.cpp" line="239"/> + <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="245"/> <source>kg</source> <translation>kg</translation> </message> @@ -3339,36 +3357,36 @@ Maximum</source> <translation>(%s) lub (%s)</translation> </message> <message> - <location filename="../divelist.c" line="467"/> - <location filename="../equipment.c" line="104"/> - <location filename="../planner.c" line="986"/> - <location filename="../planner.c" line="989"/> + <location filename="../divelist.c" line="460"/> + <location filename="../equipment.c" line="79"/> + <location filename="../planner.c" line="988"/> + <location filename="../planner.c" line="991"/> <location filename="../statistics.c" line="355"/> <source>air</source> <translation>powietrze</translation> </message> <message> - <location filename="../equipment.c" line="210"/> + <location filename="../equipment.c" line="185"/> <source>integrated</source> <translation>zintegrowany</translation> </message> <message> - <location filename="../equipment.c" line="211"/> + <location filename="../equipment.c" line="186"/> <source>belt</source> <translation>pas balastowy</translation> </message> <message> - <location filename="../equipment.c" line="212"/> + <location filename="../equipment.c" line="187"/> <source>ankle</source> <translation>na kostkach</translation> </message> <message> - <location filename="../equipment.c" line="213"/> + <location filename="../equipment.c" line="188"/> <source>backplate weight</source> <translation>na płycie</translation> </message> <message> - <location filename="../equipment.c" line="214"/> + <location filename="../equipment.c" line="189"/> <source>clip-on</source> <translation>doczepiany</translation> </message> @@ -3679,131 +3697,130 @@ Maximum</source> <translation>Nie można otworzyć arkusza stylów %s</translation> </message> <message> - <location filename="../equipment.c" line="106"/> + <location filename="../equipment.c" line="81"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="159"/> - <location filename="../planner.c" line="761"/> + <location filename="../planner.c" line="763"/> <source>Can't find gas %s</source> <translation>Nie można znaleźć gazu %s</translation> </message> <message> - <location filename="../planner.c" line="345"/> + <location filename="../planner.c" line="347"/> <source>Too many gas mixes</source> <translation>Zbyt wiele rodzajów gazu</translation> </message> <message> - <location filename="../planner.c" line="526"/> + <location filename="../planner.c" line="528"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>OSTRZEŻENIE: TEN PLANER POSŁUGUJE SIĘ IMPLEMENTACJĄ ALGORYTMU BUHLMANNA, KTÓRA JEST NOWA I ZOSTAŁA PRZETESTOWANA W BARDZO OGRANICZONYM ZAKRESIE. ZDECYDOWANIE ODRADZAMY PLANOWANIE NURKOWANIA JEDYNIE W OPARCIU O REZULTATY DZIAŁANIA TEGO PROGRAMU.</translation> </message> <message> - <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="537"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>w oparciu o GFlow = %d i GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="538"/> + <location filename="../planner.c" line="540"/> <source>Subsurface dive plan</source> <translation>Plan nurkowania Subsurface </translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="544"/> <source>depth</source> <translation>głębokość</translation> </message> <message> - <location filename="../planner.c" line="545"/> + <location filename="../planner.c" line="547"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="548"/> + <location filename="../planner.c" line="550"/> <source>duration</source> <translation>czas trwania</translation> </message> <message> - <location filename="../planner.c" line="551"/> + <location filename="../planner.c" line="553"/> <source>gas</source> <translation>gaz</translation> </message> <message> - <location filename="../planner.c" line="585"/> + <location filename="../planner.c" line="587"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Przejście do %.*f %s w %d:%02d min - runtime %d:%02u z %s</translation> </message> <message> - <location filename="../planner.c" line="595"/> + <location filename="../planner.c" line="597"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s</translation> </message> <message> - <location filename="../planner.c" line="606"/> + <location filename="../planner.c" line="608"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="609"/> - <location filename="../planner.c" line="613"/> + <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="615"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="629"/> + <location filename="../planner.c" line="631"/> <source>Switch gas to %s</source> <translation>Zmiana gazu na %s</translation> </message> <message> - <location filename="../planner.c" line="642"/> + <location filename="../planner.c" line="644"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="644"/> + <location filename="../planner.c" line="646"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="649"/> <source>Gas consumption:</source> <translation>Zużycie gazu:</translation> </message> <message> - <location filename="../planner.c" line="667"/> - <location filename="../planner.c" line="672"/> - <location filename="../planner.c" line="695"/> + <location filename="../planner.c" line="669"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="697"/> <source>Warning:</source> <translation>Ostrzeżenie:</translation> </message> <message> - <location filename="../planner.c" line="668"/> + <location filename="../planner.c" line="670"/> <source>this is more gas than available in the specified cylinder!</source> <translation>to więcej gazu niż masz w dostępnych butlach!</translation> </message> <message> - <location filename="../planner.c" line="673"/> + <location filename="../planner.c" line="675"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>brak rezerwy na dzielenie się gazem z partnerem przy wynurzaniu!</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="677"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s gazu %s (%.0f%s/%.0f%s podczas wynurzania)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="679"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s podczas wynurzania) gazu %s</translation> </message> <message> - <location filename="../planner.c" line="692"/> + <location filename="../planner.c" line="694"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>wysoki pO₂ o wartości %.2f w %d:%02u przy użyciu %s na głębokości %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="990"/> + <location filename="../planner.c" line="992"/> <source>ean</source> <translation>ean</translation> </message> @@ -4039,22 +4056,22 @@ EADD: %d%s <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="281"/> + <location filename="../qt-gui.cpp" line="287"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="284"/> + <location filename="../qt-gui.cpp" line="290"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="417"/> + <location filename="../qt-gui.cpp" line="427"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dives)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="422"/> + <location filename="../qt-gui.cpp" line="432"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 nurkowanie)</translation> </message> @@ -4204,97 +4221,97 @@ EADD: %d%s <translation>(brak nurkowań)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sun</source> <translation>Nie</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Mon</source> <translation>Pon</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Tue</source> <translation>Wto</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Wed</source> <translation>Śro</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Thu</source> <translation>Czw</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Fri</source> <translation>Pią</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sat</source> <translation>Sob</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jan</source> <translation>Sty</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Feb</source> <translation>Lut</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Apr</source> <translation>Kwi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>May</source> <translation>Maj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jun</source> <translation>Cze</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Jul</source> <translation>Lip</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Aug</source> <translation>Sie</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Sep</source> <translation>Wrz</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Oct</source> <translation>Paź</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Nov</source> <translation>Lis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Dec</source> <translation>Gru</translation> </message> @@ -4616,21 +4633,6 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/plannerSettings.ui" line="94"/> - <source>75%-50% avg. depth</source> - <translation>75%-50% śr. głębokości</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="111"/> - <source>50% avg. depth - 6m/20ft</source> - <translation>50% śr. głębokości - 6m/20ft</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="128"/> - <source>6m/20ft to surface</source> - <translation>6m/20ft do powierzchni</translation> - </message> - <message> <location filename="../qt-ui/plannerSettings.ui" line="148"/> <source>Descent</source> <translation>Zanurzania</translation> @@ -4662,8 +4664,8 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="288"/> - <source>Last Stop at 6m/20ft</source> - <translation>Ostatni przystanek na 6m/20ft</translation> + <source>Last stop at 6m</source> + <translation>Ostatni przystanek na 6m</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="295"/> @@ -4727,6 +4729,21 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <translation>bar</translation> </message> <message> + <location filename="../qt-ui/plannerSettings.ui" line="94"/> + <source>75% to 50% avg. depth</source> + <translation>75% do 50% śr. głębokości</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="111"/> + <source>50% avg. depth to 6m</source> + <translation>50% śr. głębokości do 6m</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="128"/> + <source>6m to surface</source> + <translation>6m do powierzchni</translation> + </message> + <message> <location filename="../qt-ui/plannerSettings.ui" line="442"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Pokazuj runtime, czyli całkowity czas dla przystanku</translation> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index dbdb601fe..9a1a42da2 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -104,18 +104,18 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="107"/> <source>Bailing out to OC</source> <translation>Troca de emergência para circuito aberto</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="103"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="109"/> <source> begin</source> <comment>Starts with space!</comment> <translation>iniciar</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="104"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="110"/> <source> end</source> <comment>Starts with space!</comment> <translation>fim</translation> @@ -137,87 +137,87 @@ remover o computador de mergulho seleccionado?</translation> <translation>Mostrar janela de pesquisa</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="705"/> + <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="706"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>Collapse all</source> - <translation>Colapsar</translation> + <translation>Colapsar todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="707"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>Collapse others</source> <translation>Colapsar outros</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="709"/> + <location filename="../qt-ui/divelistview.cpp" line="711"/> <source>Remove dive(s) from trip</source> - <translation>Remover mergulho(s) desta expedição</translation> + <translation>Remover mergulho(s) desta viagem</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="712"/> <source>Create new trip above</source> - <translation>Atribuir a uma nova expedição de mergulho</translation> + <translation>Criar uma nova viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>Add dive(s) to trip immediately above</source> <translation>Adicionar mergulho(s) à viagem imediatamente acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="726"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>Add dive(s) to trip immediately below</source> - <translation>Adicionar mergulho(s) à viagem imediatamente em baixo</translation> + <translation>Adicionar mergulho(s) à viagem imediatamente abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>Merge trip with trip above</source> - <translation>Integrar expedição à de cima</translation> + <translation>Juntar esta viagem com a viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="731"/> + <location filename="../qt-ui/divelistview.cpp" line="733"/> <source>Merge trip with trip below</source> - <translation>Integrar expedição à de baixo</translation> + <translation>Juntar esta viagem com a viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="737"/> <source>Delete dive(s)</source> <translation>Eliminar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="737"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>Mark dive(s) invalid</source> <translation>Marcar mergulho(s) como inválido(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="741"/> + <location filename="../qt-ui/divelistview.cpp" line="743"/> <source>Merge selected dives</source> <translation>Juntar os mergulhos seleccionados</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="745"/> <source>Renumber dive(s)</source> <translation>Renumerar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="746"/> <source>Shift times</source> <translation>Alterar tempos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="747"/> <source>Load images</source> <translation>Carregar imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Open image files</source> <translation>Abrir ficheiros de imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -225,59 +225,59 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="30"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="35"/> <source>Export format</source> <translation>Exportar formato</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="42"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="47"/> <source>Subsurface XML</source> <translation>Ficheiro XML do Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="61"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="66"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="74"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="79"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="84"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="89"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="94"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="99"/> <source>Worldmap</source> <translation>Mapa mundo</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="112"/> <source>Selection</source> - <translation>Selacção</translation> + <translation>Selecção</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="116"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="121"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="208"/> <source>Selected dives</source> <translation>Mergulhos seleccionados</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="126"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="131"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="234"/> <source>All dives</source> <translation>Todos os mergulhos</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="178"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="183"/> <source>HTML</source> <translation>HTML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="216"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="221"/> <source>Minimum Javascript</source> <translation>Javascript mínimo</translation> </message> @@ -287,87 +287,87 @@ remover o computador de mergulho seleccionado?</translation> <translation>Exportar ficheiros de registos de mergulho</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="24"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="29"/> <source>General export</source> - <translation>Exportar geral</translation> + <translation>Definições</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="184"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>General settings</source> <translation>Definições Gerais</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="190"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="195"/> <source>Subsurface numbers</source> <translation>Números do Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="239"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export list only</source> <translation>Exportar apenas a lista</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="252"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="257"/> <source>Style options</source> <translation>Opções de estilo</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="264"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="269"/> <source>Font</source> <translation>Fonte</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="274"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="279"/> <source>Font size</source> <translation>Tamanho da fonte</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="285"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="320"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="323"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="328"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> <source>Light</source> <translation>Leve</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Sand</source> <translation>Areia</translation> </message> @@ -533,7 +533,7 @@ remover o computador de mergulho seleccionado?</translation> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="296"/> <source>Manual dives</source> - <translation>Mergulhos manuais</translation> + <translation>Mergulhos inseridos manualmente</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="331"/> @@ -628,42 +628,42 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="137"/> + <location filename="../qt-ui/diveplanner.cpp" line="135"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="622"/> + <location filename="../qt-ui/diveplanner.cpp" line="634"/> <source>Final depth</source> <translation>Profundidade final</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="624"/> + <location filename="../qt-ui/diveplanner.cpp" line="636"/> <source>Run time</source> <translation>Tempo de mergulho</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="626"/> + <location filename="../qt-ui/diveplanner.cpp" line="638"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="628"/> + <location filename="../qt-ui/diveplanner.cpp" line="640"/> <source>Used gas</source> <translation>Gás usado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="630"/> + <location filename="../qt-ui/diveplanner.cpp" line="642"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="925"/> + <location filename="../qt-ui/diveplanner.cpp" line="938"/> <source>Discard the plan?</source> <translation>Eliminar o plano?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="926"/> + <location filename="../qt-ui/diveplanner.cpp" line="939"/> <source>You are about to discard your plan.</source> <translation>Está prestes a eliminar o plano.</translation> </message> @@ -671,17 +671,17 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="255"/> + <location filename="../qt-ui/diveplanner.cpp" line="254"/> <source>Dive planner points</source> <translation>Pontos do plano de mergulho</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="259"/> + <location filename="../qt-ui/diveplanner.cpp" line="258"/> <source>Available gases</source> <translation>Gases disponíveis</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="282"/> + <location filename="../qt-ui/diveplanner.cpp" line="281"/> <source>Add dive data point</source> <translation>Adicionar ponto ao mergulho</translation> </message> @@ -799,7 +799,7 @@ remover o computador de mergulho seleccionado?</translation> <message> <location filename="../qt-ui/models.cpp" line="1332"/> <source>Max CNS</source> - <translation>Máx CNS</translation> + <translation>CNS Máx</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="1335"/> @@ -842,7 +842,7 @@ remover o computador de mergulho seleccionado?</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/> <source>cannot create temporary file: %s</source> - <translation>não foi possível criar o ficheiro temporário: %1</translation> + <translation>não foi possível criar o ficheiro temporário: %s</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="163"/> @@ -855,70 +855,70 @@ remover o computador de mergulho seleccionado?</translation> <translation>erro interno</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="636"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="832"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="637"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> <source>Done</source> <translation>Concluído</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="667"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="668"/> <source>Uploading dive list...</source> <translation>A carregar a lista dos mergulhos...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="698"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="699"/> <source>Downloading dive list...</source> <translation>A descarregar a lista dos mergulhos...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="747"/> <source>Downloading %1 dives...</source> - <translation>A descarregar %1 mergulhos</translation> + <translation>A descarregar %1 mergulhos...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="790"/> <source>Download finished - %1</source> <translation>Descarga terminada - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> <source>Corrupted download</source> <translation>Descarga corrompida</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> <source>The archive could not be opened: %1</source> <translation>Não foi possível abrir o ficheiro: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/> <source>Upload failed</source> - <translation>Exportação falhou</translation> + <translation>A exportação falhou</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="850"/> <source>Upload successful</source> <translation>Exportação bem sucedida</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="853"/> <source>Login failed</source> <translation>O login falhou</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="855"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/> <source>Cannot parse response</source> <translation>Não foi possível analisar a resposta</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="867"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="834"/> <source>Upload finished</source> <translation>Carregamento terminado</translation> </message> @@ -940,7 +940,7 @@ remover o computador de mergulho seleccionado?</translation> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="143"/> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="167"/> <source>Retry</source> - <translation>Repetir</translation> + <translation>Tentar novamente</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="257"/> @@ -965,7 +965,7 @@ remover o computador de mergulho seleccionado?</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> - <translation>Gravar a descarga do libdivecomputer não irá descarregar os mergulhos para a lista</translation> + <translation>Gravar a descarga do libdivecomputer não descarrega os mergulhos para a lista</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="352"/> @@ -988,12 +988,12 @@ remover o computador de mergulho seleccionado?</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/> <source>Download from dive computer</source> - <translation>Transferir do Computador de Mergulho</translation> + <translation>Transferir do computador de mergulho</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/> <source>Device or mount point</source> - <translation>Dispositivo ou "mount point"</translation> + <translation>Dispositivo ou ponto de montagem</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/> @@ -1050,7 +1050,7 @@ remover o computador de mergulho seleccionado?</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="450"/> <source>Location</source> <translation>Local</translation> </message> @@ -1091,27 +1091,27 @@ remover o computador de mergulho seleccionado?</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="415"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Dive notes</source> <translation>Notas do mergulho</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="607"/> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="245"/> <source>Air temp.</source> <translation>Temp. do ar</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="626"/> - <location filename="../qt-ui/maintab.cpp" line="245"/> + <location filename="../qt-ui/maintab.cpp" line="246"/> <source>Water temp.</source> <translation>Temp. da água</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="440"/> + <location filename="../qt-ui/maintab.cpp" line="451"/> <source>Notes</source> <translation>Notas</translation> </message> @@ -1169,7 +1169,7 @@ remover o computador de mergulho seleccionado?</translation> <message> <location filename="../qt-ui/maintab.ui" line="391"/> <source>Dive info</source> - <translation>Informação do mergulho</translation> + <translation>Informações sobre o mergulho</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="455"/> @@ -1228,116 +1228,116 @@ remover o computador de mergulho seleccionado?</translation> <translation>Fotos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="88"/> + <location filename="../qt-ui/maintab.cpp" line="89"/> <source>Cylinders</source> <translation>Garrafas</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="89"/> + <location filename="../qt-ui/maintab.cpp" line="90"/> <source>Add Cylinder</source> <translation>Adicionar garrafa</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="93"/> <source>Weights</source> <translation>Lastro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="93"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Add Weight System</source> <translation>Adicionar sistema de lastro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="48"/> + <location filename="../qt-ui/maintab.cpp" line="49"/> <source>Save</source> <translation>Gravar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="52"/> + <location filename="../qt-ui/maintab.cpp" line="53"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="241"/> + <location filename="../qt-ui/maintab.cpp" line="242"/> <source>Air temp. [%1]</source> <translation>Temp. do ar [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="242"/> + <location filename="../qt-ui/maintab.cpp" line="243"/> <source>Water temp. [%1]</source> <translation>Temp. da água [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="277"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>This trip is being edited.</source> <translation>Esta viagem está a ser editada.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="284"/> + <location filename="../qt-ui/maintab.cpp" line="285"/> <source>Multiple dives are being edited.</source> <translation>Estão a ser editados vários mergulhos.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="286"/> + <location filename="../qt-ui/maintab.cpp" line="287"/> <source>This dive is being edited.</source> <translation>Este mergulho está a ser editado.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="386"/> - <location filename="../qt-ui/maintab.cpp" line="410"/> + <location filename="../qt-ui/maintab.cpp" line="397"/> + <location filename="../qt-ui/maintab.cpp" line="421"/> <source>Trip notes</source> <translation>Notas sobre a viagem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="408"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> <source>Trip location</source> <translation>Local da viagem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="461"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> - <location filename="../qt-ui/maintab.cpp" line="502"/> - <location filename="../qt-ui/maintab.cpp" line="503"/> - <location filename="../qt-ui/maintab.cpp" line="504"/> + <location filename="../qt-ui/maintab.cpp" line="472"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> + <location filename="../qt-ui/maintab.cpp" line="513"/> + <location filename="../qt-ui/maintab.cpp" line="514"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="463"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="500"/> + <location filename="../qt-ui/maintab.cpp" line="511"/> <source>Deepest dive</source> <translation>Mergulho mais fundo</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="501"/> + <location filename="../qt-ui/maintab.cpp" line="512"/> <source>Shallowest dive</source> - <translation>Mergulho mais baixo</translation> + <translation>Mergulho menos fundo</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="556"/> <source>These gases could be mixed from Air and using: </source> <translation>Estes gases podem ser -obtidos a partir do ar e usando: +obtidos a partir do ar usando: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="549"/> + <location filename="../qt-ui/maintab.cpp" line="560"/> <source> and </source> <translation>e</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="797"/> + <location filename="../qt-ui/maintab.cpp" line="808"/> <source>Discard the changes?</source> <translation>Eliminar as alterações?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="798"/> + <location filename="../qt-ui/maintab.cpp" line="809"/> <source>You are about to discard your changes.</source> <translation>Está prestes a eliminar as alterações.</translation> </message> @@ -1352,7 +1352,7 @@ obtidos a partir do ar e usando: <message> <location filename="../qt-ui/mainwindow.ui" line="128"/> <source>Toggle pHe graph</source> - <translation>Mostrar/esconder gráfico de pHe</translation> + <translation>Mostrar/ocultar gráfico de pHe</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="154"/> @@ -1392,7 +1392,7 @@ obtidos a partir do ar e usando: <message> <location filename="../qt-ui/mainwindow.ui" line="342"/> <source>Toggle EAD, END, EADD</source> - <translation>Ligar/desligar EAD, END, EADD</translation> + <translation>Mostrar/ocultar EAD, END, EADD</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="368"/> @@ -1402,7 +1402,7 @@ obtidos a partir do ar e usando: <message> <location filename="../qt-ui/mainwindow.ui" line="420"/> <source>Toggle ruler</source> - <translation>Ligar/ocultar régua</translation> + <translation>Mostrar/ocultar régua</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="501"/> @@ -1505,7 +1505,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="780"/> <source>Save as</source> - <translation>Guardar como...</translation> + <translation>Guardar como</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="783"/> @@ -1585,7 +1585,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="984"/> <source>Toggle full screen</source> - <translation>Ligar ecrã completo</translation> + <translation>Ligar/desligar ecrã completo</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="1012"/> @@ -1817,70 +1817,70 @@ p, li { white-space: pre-wrap; } <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de adicionar outro mergulho.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="421"/> + <location filename="../qt-ui/mainwindow.cpp" line="422"/> <source>Print runtime table</source> <translation>Imprimir tabela de runtime</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="516"/> + <location filename="../qt-ui/mainwindow.cpp" line="522"/> <source>Yearly statistics</source> <translation>Estatísticas anuais</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="701"/> + <location filename="../qt-ui/mainwindow.cpp" line="707"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Deseja gravar as alterações feitas no ficheiro %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="703"/> + <location filename="../qt-ui/mainwindow.cpp" line="709"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Deseja gravar as alterações feitas no ficheiro de dados?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="708"/> + <location filename="../qt-ui/mainwindow.cpp" line="714"/> <source>Save changes?</source> <translation>Guardar alterações?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1066"/> + <location filename="../qt-ui/mainwindow.cpp" line="1072"/> <source>Save file as</source> <translation>Guardar ficheiro como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1190"/> + <location filename="../qt-ui/mainwindow.cpp" line="1196"/> <source>Open dive log file</source> <translation>Abrir ficheiro de registo de mergulhos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1191"/> + <location filename="../qt-ui/mainwindow.cpp" line="1197"/> <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source> - <translation>Ficheiros de registo de mergulho (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation> + <translation>Ficheiros de registo de mergulhos (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Ficheiros XML (*.xml);;Ficheiros UDDF/UDCF(*.uddf *.udcf);;Ficheiros do JDiveLog (*.jlb);;Ficheiros Suunto(*.sde *.db);;Ficheiros CSV(*.csv);;Todos os fiicheiros(*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="709"/> + <location filename="../qt-ui/mainwindow.cpp" line="715"/> <source>Changes will be lost if you don't save them.</source> <translation>As alterações serão perdidas se não forem gravadas.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="251"/> <location filename="../qt-ui/mainwindow.cpp" line="390"/> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="188"/> - <location filename="../qt-ui/mainwindow.cpp" line="1050"/> + <location filename="../qt-ui/mainwindow.cpp" line="1056"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de abrir um novo ficheiro.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1067"/> + <location filename="../qt-ui/mainwindow.cpp" line="1073"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Por favor, termine a edição em curso antes de iniciar outra.</translation> </message> @@ -1888,15 +1888,45 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="444"/> + <location filename="../qt-ui/diveplanner.cpp" line="450"/> + <source>ft/min</source> + <translation>ft/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="451"/> <source>Last stop at 20ft</source> <translation>Última paragem aos 20 ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="451"/> + <location filename="../qt-ui/diveplanner.cpp" line="452"/> + <source>50% avg. depth to 20ft</source> + <translation>50% da profundidade média para 6 m/20 ft</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="453"/> + <source>20ft to surface</source> + <translation>6 m/20 ft para a superfície</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="455"/> + <source>m/min</source> + <translation>m/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="456"/> <source>Last stop at 6m</source> <translation>Última paragem aos 6 m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="457"/> + <source>50% avg. depth to 6m</source> + <translation>50% da profundidade média para 6 m</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="458"/> + <source>6m to surface</source> + <translation>6 m para a superfície</translation> + </message> </context> <context> <name>PreferencesDialog</name> @@ -1942,146 +1972,151 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/preferences.ui" line="198"/> + <source>Use default</source> + <translation>Use o padrão</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="247"/> + <location filename="../qt-ui/preferences.ui" line="257"/> <source>Animations</source> <translation>Animações</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="253"/> + <location filename="../qt-ui/preferences.ui" line="263"/> <source>Speed</source> <translation>Velocidade</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Clear all settings</source> <translation>Limpar todas as definições</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="312"/> + <location filename="../qt-ui/preferences.ui" line="322"/> <source>Reset all settings to their default value</source> <translation>Restaurar todas as definições para o seu valor padrão</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="341"/> + <location filename="../qt-ui/preferences.ui" line="351"/> <source>System</source> <translation>Sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="348"/> + <location filename="../qt-ui/preferences.ui" line="358"/> <source>Metric</source> <translation>Métrico</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="358"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="368"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Personalize</source> <translation>Personalizar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="392"/> + <location filename="../qt-ui/preferences.ui" line="402"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="399"/> + <location filename="../qt-ui/preferences.ui" line="409"/> <source>meter</source> <translation>metro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="409"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>feet</source> <translation>pés</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="426"/> + <location filename="../qt-ui/preferences.ui" line="436"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="436"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="453"/> + <location filename="../qt-ui/preferences.ui" line="463"/> <source>liter</source> <translation>litro</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="463"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>cu ft</source> <translation>pés cúbicos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="490"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="490"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="507"/> + <location filename="../qt-ui/preferences.ui" line="517"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="772"/> + <location filename="../qt-ui/preferences.ui" line="782"/> <source>System default</source> - <translation>Usar a por omissão no sistema</translation> + <translation>Linguagem do sistema</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="811"/> + <location filename="../qt-ui/preferences.ui" line="821"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="817"/> + <location filename="../qt-ui/preferences.ui" line="827"/> <source>Proxy type</source> <translation>Tipo de proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="830"/> + <location filename="../qt-ui/preferences.ui" line="840"/> <source>Host</source> <translation>Servidor</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="856"/> + <location filename="../qt-ui/preferences.ui" line="866"/> <source>Port</source> <translation>Porta</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="882"/> + <location filename="../qt-ui/preferences.ui" line="892"/> <source>Requires authentication</source> <translation>Requer autenticação</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="912"/> <source>Username</source> <translation>Nome de utilizador</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="925"/> + <location filename="../qt-ui/preferences.ui" line="935"/> <source>Password</source> <translation>Palavra-passe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="802"/> <source>Filter</source> <translation>Filtros</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="419"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>Pressure</source> <translation>Pressão</translation> </message> @@ -2096,82 +2131,82 @@ p, li { white-space: pre-wrap; } <translation>Ficheiro de mergulho por defeito</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="207"/> + <location filename="../qt-ui/preferences.ui" line="217"/> <source>Display invalid</source> <translation>Mostrar inválidos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="224"/> + <location filename="../qt-ui/preferences.ui" line="234"/> <source>Default cylinder</source> <translation>Garrafa padrão</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="230"/> + <location filename="../qt-ui/preferences.ui" line="240"/> <source>Use default cylinder</source> <translation>Usar a garrafa padrão</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="280"/> + <location filename="../qt-ui/preferences.ui" line="290"/> <source>Subsurface web service</source> <translation>Serviço web do Subsurface</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="286"/> + <location filename="../qt-ui/preferences.ui" line="296"/> <source>Default user ID</source> <translation>ID do utilizador por defeito</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Save user ID locally?</source> <translation>Gravar a ID do utilizador localmente?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="446"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="473"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="500"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="517"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>lbs</source> <translation>libra</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="532"/> + <location filename="../qt-ui/preferences.ui" line="542"/> <source>Time units</source> <translation>Unidades de tempo</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="545"/> + <location filename="../qt-ui/preferences.ui" line="555"/> <source>Minutes</source> <translation>Minutos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="555"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Seconds</source> <translation>Segundos</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="587"/> + <location filename="../qt-ui/preferences.ui" line="597"/> <source>Show</source> <translation>Mostrar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="756"/> + <location filename="../qt-ui/preferences.ui" line="766"/> <source>GFLow at max depth</source> <translation>GFlow à profundidade máxima</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="716"/> + <location filename="../qt-ui/preferences.ui" line="726"/> <source>Misc</source> <translation>Diversos</translation> </message> @@ -2181,52 +2216,52 @@ p, li { white-space: pre-wrap; } <translation>Preferências</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="538"/> + <location filename="../qt-ui/preferences.ui" line="548"/> <source>Ascent/descent speed denominator</source> <translation>Denominador para a velocidades de subida/descida</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="598"/> + <location filename="../qt-ui/preferences.ui" line="608"/> <source>Threshold when showing pO₂</source> <translation>Limite quando mostrar pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="619"/> + <location filename="../qt-ui/preferences.ui" line="629"/> <source>Threshold when showing pN₂</source> <translation>Limite quando mostrar pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="640"/> + <location filename="../qt-ui/preferences.ui" line="650"/> <source>Threshold when showing pHe</source> <translation>Limite quando mostrar pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="661"/> + <location filename="../qt-ui/preferences.ui" line="671"/> <source>Max pO₂ when showing MOD</source> <translation>pO₂ Max quando mostrar MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="682"/> + <location filename="../qt-ui/preferences.ui" line="692"/> <source>Draw dive computer reported ceiling red</source> <translation>Desenhar a vermelho o tecto calculado pelo computador de mergulho </translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="693"/> + <location filename="../qt-ui/preferences.ui" line="703"/> <source>Show unused cylinders in Equipment tab</source> <translation>Mostrar garrafas não usadas na tab do equipamento</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="704"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Show average depth</source> <translation>Mostrar profundidade média</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="722"/> + <location filename="../qt-ui/preferences.ui" line="732"/> <source>GFLow</source> <translation>GFlow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="739"/> + <location filename="../qt-ui/preferences.ui" line="749"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> @@ -2251,32 +2286,32 @@ p, li { white-space: pre-wrap; } <translation>Proxy SOCKS</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="245"/> + <location filename="../qt-ui/preferences.cpp" line="247"/> <source>Restart required</source> <translation>É necessário reiniciar a aplicação</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="246"/> + <location filename="../qt-ui/preferences.cpp" line="248"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Para alterar a linguagem é necessário reiniciar o Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="395"/> + <location filename="../qt-ui/preferences.cpp" line="398"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> - <translation>Se clicar OK, todas as definições do Subsurface serão reinicializadas para os seus valores padrão. Isto terá um efeito imediato.</translation> + <translation>Se clicar OK, todas as definições do Subsurface serão reinicializadas para os seus valores padrão. Isto será aplicado imediatamente.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Open default log file</source> <translation>Abrir ficheiro de registo de mergulhos padrão</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="394"/> + <location filename="../qt-ui/preferences.cpp" line="397"/> <source>Warning</source> <translation>Aviso</translation> </message> @@ -2371,51 +2406,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/printoptions.ui" line="145"/> + <source>1 dive per page</source> + <translation>1 merg. por página</translation> + </message> + <message> + <location filename="../qt-ui/printoptions.ui" line="158"/> <source>Table print</source> <translation>Imprimir tabela</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="162"/> + <location filename="../qt-ui/printoptions.ui" line="175"/> <source>Ordering</source> <translation>Ordenar</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="180"/> + <location filename="../qt-ui/printoptions.ui" line="193"/> <source>Profile on top</source> <translation>Perfil no topo</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="202"/> + <location filename="../qt-ui/printoptions.ui" line="215"/> <source>Notes on top</source> <translation>Notas no topo</translation> </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="219"/> - <source>Sizing heights (% of layout)</source> - <translation>Configurar alturas (% da janela)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="256"/> - <source>Profile height (43% - 85%)</source> - <translation>Altura do perfil (43% - 85%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="278"/> - <source>Other data height (8% - 17%)</source> - <translation>Altura dos restantes dados (8% - 17%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="338"/> - <source>Notes height (0% - 52%)</source> - <translation>Altura das notas (0% - 52%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="354"/> - <location filename="../qt-ui/printoptions.ui" line="370"/> - <location filename="../qt-ui/printoptions.ui" line="386"/> - <source>0</source> - <translation>0</translation> - </message> </context> <context> <name>ProfilePrintModel</name> @@ -2493,77 +2506,77 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="520"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="515"/> <source> (#%1 of %2)</source> <translation>(#%1 of %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="898"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="895"/> <source>Make first divecomputer</source> - <translation>Criar primeiro computador de mergulho</translation> + <translation>Tornar como primeiro computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="900"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="897"/> <source>Delete this divecomputer</source> <translation>Eliminar este computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="907"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/> <source>Add gas change</source> <translation>Adicionar mudança de gás</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="918"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="915"/> <source>Add bookmark</source> <translation>Adicionar marcador</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="922"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="919"/> <source>Remove event</source> <translation>Remover evento</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/> <source>Hide similar events</source> <translation>Esconder eventos semelhantes</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="930"/> <source>Edit name</source> <translation>Editar nome</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="947"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="944"/> <source>Unhide all events</source> <translation>Mostrar todos os eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide all %1 events?</source> <translation>Ocultar todos os %1 eventos?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1016"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1013"/> <source>Remove the selected event?</source> <translation>Remover o evento seleccionado?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1017"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1014"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1082"/> <source>Edit name of bookmark</source> - <translation>Editar nome da marcação</translation> + <translation>Editar nome do marcador</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1086"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1083"/> <source>Custom name:</source> <translation>Nome personalizado:</translation> </message> @@ -2576,7 +2589,7 @@ p, li { white-space: pre-wrap; } <translation>Ar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="212"/> + <location filename="../qt-ui/diveplanner.cpp" line="210"/> <source>Remove this point</source> <translation>Remover este ponto</translation> </message> @@ -2618,7 +2631,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/models.cpp" line="497"/> <source>ft</source> - <translation>pés</translation> + <translation>pé</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="498"/> @@ -2643,25 +2656,25 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/models.cpp" line="547"/> <source>cuft</source> - <translation>pés^3</translation> + <translation>pé cúbico</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/> <source>Invalid response from server</source> <translation>Resposta inválida do servidor</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="529"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Esperada a tag XML 'DiveDateReader'. Em vez disso recebemos '%1</translation> + <translation>Esperada a tag XML 'DiveDateReader'. Em vez disso foi recebida a '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="575"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>A tag XML esperada 'DiveDates' não foi encontrada</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> <source>Malformed XML response. Line %1: %2</source> <translation>Resposta XML mal formada. Linha %1: %2</translation> </message> @@ -2713,12 +2726,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/shiftimagetimes.ui" line="105"/> <source>Earlier</source> - <translation>mais cedo</translation> + <translation>Mais cedo</translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="112"/> <source>Later</source> - <translation>mais tarde</translation> + <translation>Mais tarde</translation> </message> <message> <location filename="../qt-ui/shiftimagetimes.ui" line="148"/> @@ -2743,7 +2756,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="224"/> <source>Open image file</source> - <translation>Abrir ficheiros de imagens</translation> + <translation>Abrir imagem</translation> </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="226"/> @@ -2787,12 +2800,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/shifttimes.ui" line="136"/> <source>Earlier</source> - <translation>mais cedo</translation> + <translation>Mais cedo</translation> </message> <message> <location filename="../qt-ui/shifttimes.ui" line="143"/> <source>Later</source> - <translation>mais tarde</translation> + <translation>Mais tarde</translation> </message> </context> <context> @@ -2810,7 +2823,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/about.ui" line="87"/> <source>&Website</source> - <translation>%Website</translation> + <translation>&Website</translation> </message> <message> <location filename="../qt-ui/about.ui" line="94"/> @@ -2826,44 +2839,49 @@ p, li { white-space: pre-wrap; } <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="337"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="338"/> <source>Webservice</source> <translation>Serviço web</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="401"/> <source>Connecting...</source> - <translation>Ligar ...</translation> + <translation>A ligar ...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="420"/> <source>Download finished</source> <translation>Descarga terminada</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="433"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="434"/> <source>Download error: %1</source> <translation>Erro na descarga: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/> <source>Connection error: </source> <translation>Erro de ligação:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/> <source>Download successful</source> <translation>Transferência bem sucedida</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="447"/> <source>Invalid user identifier!</source> <translation>Identificação de utilizador inválida !</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="321"/> + <source>Enter User ID and click Download</source> + <translation>Introduza o ID do utilizador e clique em "Download"</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/> <source>Cannot parse response!</source> - <translation>Não é possível analisar a resposta !</translation> + <translation>Não foi possível analisar a resposta !</translation> </message> </context> <context> @@ -2903,42 +2921,42 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="35"/> + <location filename="../qt-ui/updatemanager.cpp" line="33"/> <source>Check for updates.</source> <translation>Procurar actualizações</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <location filename="../qt-ui/updatemanager.cpp" line="34"/> <source>Subsurface was unable to check for updates.</source> <translation>Não foi possível encontrar actualizações para o Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="41"/> + <location filename="../qt-ui/updatemanager.cpp" line="39"/> <source>The following error occurred:</source> <translation>Ocorreu o seguinte erro :</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <location filename="../qt-ui/updatemanager.cpp" line="40"/> <source>Please check your internet connection.</source> <translation>Por favor, verifique a ligação à Internet</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="51"/> + <location filename="../qt-ui/updatemanager.cpp" line="49"/> <source>You are using the latest version of subsurface.</source> <translation>Está a usar a versão mais recente do Subsurface</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="53"/> + <location filename="../qt-ui/updatemanager.cpp" line="51"/> <source>A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Está disponível uma nova versão do Subsurface.<br/>Clique em:<br/><a href="%1">%1</a><br/> para a descarregar.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="56"/> + <location filename="../qt-ui/updatemanager.cpp" line="54"/> <source><b>A new version of subsurface is available.</b><br/><br/>%1</source> <translation><b>Está disponível uma nova versão do Subsurface.</b><br/><br/>%1</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="57"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>Ocorreu um erro na tentativa de procura de actualizações.<br/><br/>%1</translation> </message> @@ -2951,8 +2969,8 @@ p, li { white-space: pre-wrap; } <translation>Manual do utilizador</translation> </message> <message> - <location filename="../qt-ui/usermanual.cpp" line="70"/> - <location filename="../qt-ui/usermanual.cpp" line="76"/> + <location filename="../qt-ui/usermanual.cpp" line="72"/> + <location filename="../qt-ui/usermanual.cpp" line="78"/> <source>Cannot find the Subsurface manual</source> <translation>Não foi possível encontrar o manual do Subsurface</translation> </message> @@ -3041,27 +3059,27 @@ Language: %1</source> Linguagem: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="74"/> + <location filename="../qt-ui/usersurvey.cpp" line="72"/> <source>Should we ask you later?</source> <translation>Deveríamos perguntar-lhe mais tarde?</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="75"/> + <location filename="../qt-ui/usersurvey.cpp" line="73"/> <source>Don't ask me again</source> <translation>Não me voltem a perguntar</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="76"/> + <location filename="../qt-ui/usersurvey.cpp" line="74"/> <source>Ask later</source> <translation>Perguntar mais tarde</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="96"/> + <location filename="../qt-ui/usersurvey.cpp" line="94"/> <source>Submit user survey.</source> <translation>Enviar questionário do utilizador.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="77"/> + <location filename="../qt-ui/usersurvey.cpp" line="75"/> <source>Ask again?</source> <translation>Perguntar novamente?</translation> </message> @@ -3073,27 +3091,27 @@ OS CPU Architecture: %1</source> Arquitectura do CPU e SO: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="97"/> + <location filename="../qt-ui/usersurvey.cpp" line="95"/> <source>Subsurface was unable to submit the user survey.</source> <translation>Não foi possível enviar o questionário do utilizador.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="102"/> + <location filename="../qt-ui/usersurvey.cpp" line="100"/> <source>The following error occurred:</source> <translation>Ocorreu o seguinte erro:</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="103"/> + <location filename="../qt-ui/usersurvey.cpp" line="101"/> <source>Please check your internet connection.</source> <translation>Por favor, verifique a sua ligação à internet.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="112"/> + <location filename="../qt-ui/usersurvey.cpp" line="110"/> <source>Survey successfully submitted.</source> <translation>Questionário enviado.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="117"/> + <location filename="../qt-ui/usersurvey.cpp" line="115"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>Ocorreu um erro na tentativa de procura de actualizações.<br/><br/>%1</translation> </message> @@ -3126,7 +3144,7 @@ Arquitectura do CPU e SO: %1</translation> <message> <location filename="../qt-ui/webservices.ui" line="32"/> <source>Enter your ID here</source> - <translation>Inserir a sua ID aqui</translation> + <translation>Insira a sua ID aqui</translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="44"/> @@ -3273,13 +3291,13 @@ Média</translation> </message> <message> <location filename="../dive.c" line="128"/> - <location filename="../qt-gui.cpp" line="323"/> + <location filename="../qt-gui.cpp" line="329"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="132"/> - <location filename="../qt-gui.cpp" line="326"/> + <location filename="../qt-gui.cpp" line="332"/> <source>psi</source> <translation>psi</translation> </message> @@ -3290,16 +3308,16 @@ Média</translation> </message> <message> <location filename="../dive.c" line="203"/> - <location filename="../qt-gui.cpp" line="205"/> - <location filename="../qt-gui.cpp" line="220"/> + <location filename="../qt-gui.cpp" line="211"/> + <location filename="../qt-gui.cpp" line="226"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="208"/> - <location filename="../qt-gui.cpp" line="208"/> - <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="214"/> + <location filename="../qt-gui.cpp" line="228"/> <source>ft</source> <translation>pés</translation> </message> @@ -3325,15 +3343,15 @@ Média</translation> </message> <message> <location filename="../dive.c" line="259"/> - <location filename="../qt-gui.cpp" line="231"/> - <location filename="../qt-gui.cpp" line="241"/> + <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="247"/> <source>lbs</source> <translation>libras</translation> </message> <message> <location filename="../dive.c" line="263"/> - <location filename="../qt-gui.cpp" line="229"/> - <location filename="../qt-gui.cpp" line="239"/> + <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="245"/> <source>kg</source> <translation>kg</translation> </message> @@ -3343,36 +3361,36 @@ Média</translation> <translation>(%s) ou (%s)</translation> </message> <message> - <location filename="../divelist.c" line="467"/> - <location filename="../equipment.c" line="104"/> - <location filename="../planner.c" line="986"/> - <location filename="../planner.c" line="989"/> + <location filename="../divelist.c" line="460"/> + <location filename="../equipment.c" line="79"/> + <location filename="../planner.c" line="988"/> + <location filename="../planner.c" line="991"/> <location filename="../statistics.c" line="355"/> <source>air</source> <translation>ar</translation> </message> <message> - <location filename="../equipment.c" line="210"/> + <location filename="../equipment.c" line="185"/> <source>integrated</source> <translation>integrado</translation> </message> <message> - <location filename="../equipment.c" line="211"/> + <location filename="../equipment.c" line="186"/> <source>belt</source> <translation>cinto</translation> </message> <message> - <location filename="../equipment.c" line="212"/> + <location filename="../equipment.c" line="187"/> <source>ankle</source> <translation>tornozelo</translation> </message> <message> - <location filename="../equipment.c" line="213"/> + <location filename="../equipment.c" line="188"/> <source>backplate weight</source> <translation>lastro no arnês</translation> </message> <message> - <location filename="../equipment.c" line="214"/> + <location filename="../equipment.c" line="189"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -3431,7 +3449,7 @@ Média</translation> <message> <location filename="../libdivecomputer.c" line="145"/> <source>bookmark</source> - <translation>marcação</translation> + <translation>marcador</translation> </message> <message> <location filename="../libdivecomputer.c" line="145"/> @@ -3472,7 +3490,7 @@ Média</translation> <message> <location filename="../libdivecomputer.c" line="147"/> <source>divetime</source> - <translation>duração do mergulho</translation> + <translation>Tempo de mergulho</translation> </message> <message> <location filename="../libdivecomputer.c" line="147"/> @@ -3483,7 +3501,7 @@ Média</translation> <message> <location filename="../libdivecomputer.c" line="148"/> <source>maxdepth</source> - <translation>Profundidade Máx</translation> + <translation>Profundidade máxima</translation> </message> <message> <location filename="../libdivecomputer.c" line="148"/> @@ -3498,7 +3516,7 @@ Média</translation> <message> <location filename="../libdivecomputer.c" line="148"/> <source>airtime</source> - <translation>tempo de ar</translation> + <translation>autonomia</translation> </message> <message> <location filename="../libdivecomputer.c" line="148"/> @@ -3513,7 +3531,7 @@ Média</translation> <message> <location filename="../libdivecomputer.c" line="149"/> <source>tissue level warning</source> - <translation>Alarme do nível nos tecidos</translation> + <translation>Alarme de tensão de azoto nos tecidos</translation> </message> <message> <location filename="../libdivecomputer.c" line="149"/> @@ -3684,131 +3702,130 @@ Média</translation> <translation>Não é possível abrir a folha de estilos %s</translation> </message> <message> - <location filename="../equipment.c" line="106"/> + <location filename="../equipment.c" line="81"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="159"/> - <location filename="../planner.c" line="761"/> + <location filename="../planner.c" line="763"/> <source>Can't find gas %s</source> <translation>Não foi possível encontrar o gás %s</translation> </message> <message> - <location filename="../planner.c" line="345"/> + <location filename="../planner.c" line="347"/> <source>Too many gas mixes</source> <translation>Demasiadas misturas de gás</translation> </message> <message> - <location filename="../planner.c" line="526"/> + <location filename="../planner.c" line="528"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>AVISO:ESTA É UMA IMPLEMENTAÇÃO DO ALGORITMO BUEHLMANN PARA PLANIFICAR MERGULHOS. CONTUDO ESTE PLANIFICADOR SÓ FOI TESTADO DE FORMA LIMITADA. RECOMENDAMOS QUE NÃO SE BASEIE UNICAMENTE NOS RESULTADOS OBTIDOS AQUI PARA PLANEAR OS SEUS MERGULHOS.</translation> </message> <message> - <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="537"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>Baseado num GFlow = %d e GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="538"/> + <location filename="../planner.c" line="540"/> <source>Subsurface dive plan</source> <translation>Plano de mergulho Subsurface</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="544"/> <source>depth</source> <translation>profundidade</translation> </message> <message> - <location filename="../planner.c" line="545"/> + <location filename="../planner.c" line="547"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="548"/> + <location filename="../planner.c" line="550"/> <source>duration</source> <translation>duração</translation> </message> <message> - <location filename="../planner.c" line="551"/> + <location filename="../planner.c" line="553"/> <source>gas</source> <translation>gás</translation> </message> <message> - <location filename="../planner.c" line="585"/> + <location filename="../planner.c" line="587"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> - <translation>Transição para %.*f %s em %d:%02d min - runtime %d:%02u on %s</translation> + <translation>Transição para %.*f %s em %d:%02d min - runtime %d:%02u com %s</translation> </message> <message> - <location filename="../planner.c" line="595"/> + <location filename="../planner.c" line="597"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> - <translation>Permanecer a %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation> + <translation>Permanecer a %.*f %s for %d:%02d min - runtime %d:%02u com %s</translation> </message> <message> - <location filename="../planner.c" line="606"/> + <location filename="../planner.c" line="608"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="609"/> - <location filename="../planner.c" line="613"/> + <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="615"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="629"/> + <location filename="../planner.c" line="631"/> <source>Switch gas to %s</source> <translation>Mudar para %s</translation> </message> <message> - <location filename="../planner.c" line="642"/> + <location filename="../planner.c" line="644"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="644"/> + <location filename="../planner.c" line="646"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="649"/> <source>Gas consumption:</source> <translation>Consumo de gás:</translation> </message> <message> - <location filename="../planner.c" line="667"/> - <location filename="../planner.c" line="672"/> - <location filename="../planner.c" line="695"/> + <location filename="../planner.c" line="669"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="697"/> <source>Warning:</source> <translation>Aviso:</translation> </message> <message> - <location filename="../planner.c" line="668"/> + <location filename="../planner.c" line="670"/> <source>this is more gas than available in the specified cylinder!</source> <translation>a quantidade de gás necessária excede a quantidade disponível na garrafa!</translation> </message> <message> - <location filename="../planner.c" line="673"/> + <location filename="../planner.c" line="675"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>a reserva de gás não é suficiente para ser partilhada durante a subida!</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="677"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> - <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s no plano de subida)</translation> + <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s na subida planeada)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="679"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante a subida planeada) de %s</translation> </message> <message> - <location filename="../planner.c" line="692"/> + <location filename="../planner.c" line="694"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> - <translation>valor pO₂ elevado %.2f em %d:%02u com gás %s na profundidade %.*f %s</translation> + <translation>valor pO₂ elevado %.2f em %d:%02u com gás %s à profundidade de %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="990"/> + <location filename="../planner.c" line="992"/> <source>ean</source> <translation>ean</translation> </message> @@ -4046,22 +4063,22 @@ EADD: %d%s <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="281"/> + <location filename="../qt-gui.cpp" line="287"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="284"/> + <location filename="../qt-gui.cpp" line="290"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="417"/> + <location filename="../qt-gui.cpp" line="427"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 mergulhos)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="422"/> + <location filename="../qt-gui.cpp" line="432"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 mergulho)</translation> </message> @@ -4211,97 +4228,97 @@ EADD: %d%s <translation>(nenhum mergulho)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sun</source> <translation>Dom</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Mon</source> <translation>Seg</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Tue</source> <translation>Ter</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Wed</source> <translation>Qua</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Thu</source> <translation>Qui</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Fri</source> <translation>Sex</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sat</source> <translation>Sáb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Feb</source> <translation>Fev</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Oct</source> <translation>Out</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Dec</source> <translation>Dez</translation> </message> @@ -4448,12 +4465,12 @@ O Uemis Zurich está bem ligado?</translation> <message> <location filename="../uemis.c" line="206"/> <source>pO₂ Ascend Warning</source> - <translation>pO₂ Aviso Subida</translation> + <translation>pO₂ Aviso de subida</translation> </message> <message> <location filename="../uemis.c" line="208"/> <source>pO₂ Ascend Alarm</source> - <translation>pO₂ Alarme Subida</translation> + <translation>pO₂ Alarme de subida</translation> </message> <message> <location filename="../uemis.c" line="212"/> @@ -4623,21 +4640,6 @@ O Uemis Zurich está bem ligado?</translation> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/plannerSettings.ui" line="94"/> - <source>75%-50% avg. depth</source> - <translation>75%-50% da profundidade média</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="111"/> - <source>50% avg. depth - 6m/20ft</source> - <translation>50% da profundidade média - 6 m/20 ft</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="128"/> - <source>6m/20ft to surface</source> - <translation>6 m/20 ft para a superfície</translation> - </message> - <message> <location filename="../qt-ui/plannerSettings.ui" line="148"/> <source>Descent</source> <translation>Descida</translation> @@ -4645,7 +4647,7 @@ O Uemis Zurich está bem ligado?</translation> <message> <location filename="../qt-ui/plannerSettings.ui" line="200"/> <source>surface to the bottom</source> - <translation>superfície para o fundo</translation> + <translation>da superfície para o fundo</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="226"/> @@ -4669,13 +4671,13 @@ O Uemis Zurich está bem ligado?</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="288"/> - <source>Last Stop at 6m/20ft</source> - <translation>Última paragem aos 6 m/20 ft</translation> + <source>Last stop at 6m</source> + <translation>Última paragem aos 6 m</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="295"/> <source>Plan backgas breaks</source> - <translation>planear intervalos na mistura de fundo</translation> + <translation>Planear intervalos na mistura de fundo</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="318"/> @@ -4705,7 +4707,7 @@ O Uemis Zurich está bem ligado?</translation> <message> <location filename="../qt-ui/plannerSettings.ui" line="421"/> <source>Dive notes</source> - <translation>Notas do mergulho</translation> + <translation>Notas</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="445"/> @@ -4734,6 +4736,21 @@ O Uemis Zurich está bem ligado?</translation> <translation>bar</translation> </message> <message> + <location filename="../qt-ui/plannerSettings.ui" line="94"/> + <source>75% to 50% avg. depth</source> + <translation>75%-50% da profundidade média</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="111"/> + <source>50% avg. depth to 6m</source> + <translation>50% da profundidade média para 6 m</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="128"/> + <source>6m to surface</source> + <translation>6 m para a superfície</translation> + </message> + <message> <location filename="../qt-ui/plannerSettings.ui" line="442"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Mostrar runtime (tempo absoluto) das paragens no plano de mergulho </translation> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index acb5e6fed..40baefb3b 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -104,18 +104,18 @@ radera den valda dykdatorn?</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="107"/> <source>Bailing out to OC</source> <translation>Bailout till öppet system</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="103"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="109"/> <source> begin</source> <comment>Starts with space!</comment> <translation>start</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="104"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="110"/> <source> end</source> <comment>Starts with space!</comment> <translation>slut</translation> @@ -137,87 +137,87 @@ radera den valda dykdatorn?</translation> <translation>Visa sökruta</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="705"/> + <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>Expand all</source> <translation>Expandera alla</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="706"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>Collapse all</source> <translation>Sammanslå alla</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="707"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>Collapse others</source> <translation>Fäll samman andra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="709"/> + <location filename="../qt-ui/divelistview.cpp" line="711"/> <source>Remove dive(s) from trip</source> <translation>Ta bort dyk från resa</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="712"/> <source>Create new trip above</source> <translation>Ny resa innan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>Add dive(s) to trip immediately above</source> <translation>Lägg till dyk(en) till resan ovan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="726"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>Add dive(s) to trip immediately below</source> <translation>Lägg till dyk(en) till resan nedanför</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>Merge trip with trip above</source> <translation>Sammanfoga resa med tidigare resa</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="731"/> + <location filename="../qt-ui/divelistview.cpp" line="733"/> <source>Merge trip with trip below</source> <translation>Sammanfoga resa med senare resa</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="737"/> <source>Delete dive(s)</source> <translation>Radera dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="737"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>Mark dive(s) invalid</source> <translation>Markera dyk som ogiltiga</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="741"/> + <location filename="../qt-ui/divelistview.cpp" line="743"/> <source>Merge selected dives</source> <translation>Slå samman valda dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="745"/> <source>Renumber dive(s)</source> <translation>Uppdatera numrering</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="746"/> <source>Shift times</source> <translation>Förskjut tid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="747"/> <source>Load images</source> <translation>Ladda bilder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Open image files</source> <translation>Öppna bildfler</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -225,59 +225,59 @@ radera den valda dykdatorn?</translation> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="30"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="35"/> <source>Export format</source> <translation>Exportformat</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="42"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="47"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="61"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="66"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="74"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="79"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="84"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="89"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="94"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="99"/> <source>Worldmap</source> <translation>Värdskarta</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="112"/> <source>Selection</source> <translation>Markering</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="116"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="121"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="208"/> <source>Selected dives</source> <translation>Markerade dyk</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="126"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="131"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="234"/> <source>All dives</source> <translation>Alla dyk</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="178"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="183"/> <source>HTML</source> <translation>HTML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="216"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="221"/> <source>Minimum Javascript</source> <translation>Minimalt med Javascript</translation> </message> @@ -287,87 +287,87 @@ radera den valda dykdatorn?</translation> <translation>Exportera dykloggar</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="24"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="29"/> <source>General export</source> <translation>Exportera</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="184"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>General settings</source> <translation>Allmänna inställningar</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="190"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="195"/> <source>Subsurface numbers</source> <translation>Subsurface siffror</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="239"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export list only</source> <translation>Exportera enbart listan</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="252"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="257"/> <source>Style options</source> <translation>Utseende</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="264"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="269"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="274"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="279"/> <source>Font size</source> <translation>Fontstorlek</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="285"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="320"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="323"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="328"/> <source>Theme</source> <translation>Tema</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> <source>Light</source> <translation>Ljus</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Sand</source> <translation>Sand</translation> </message> @@ -628,42 +628,42 @@ radera den valda dykdatorn?</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="137"/> + <location filename="../qt-ui/diveplanner.cpp" line="135"/> <source>unknown</source> <translation>okänd</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="622"/> + <location filename="../qt-ui/diveplanner.cpp" line="634"/> <source>Final depth</source> <translation>Slutdjup</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="624"/> + <location filename="../qt-ui/diveplanner.cpp" line="636"/> <source>Run time</source> <translation>Löptid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="626"/> + <location filename="../qt-ui/diveplanner.cpp" line="638"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="628"/> + <location filename="../qt-ui/diveplanner.cpp" line="640"/> <source>Used gas</source> <translation>Använd gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="630"/> + <location filename="../qt-ui/diveplanner.cpp" line="642"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="925"/> + <location filename="../qt-ui/diveplanner.cpp" line="938"/> <source>Discard the plan?</source> <translation>Kassera plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="926"/> + <location filename="../qt-ui/diveplanner.cpp" line="939"/> <source>You are about to discard your plan.</source> <translation>Du kommer kassera din plan</translation> </message> @@ -671,17 +671,17 @@ radera den valda dykdatorn?</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="255"/> + <location filename="../qt-ui/diveplanner.cpp" line="254"/> <source>Dive planner points</source> <translation>Dykplaneringspunkter</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="259"/> + <location filename="../qt-ui/diveplanner.cpp" line="258"/> <source>Available gases</source> <translation>Tillgänglig gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="282"/> + <location filename="../qt-ui/diveplanner.cpp" line="281"/> <source>Add dive data point</source> <translation>lägg till dykdatapunkt</translation> </message> @@ -855,70 +855,70 @@ radera den valda dykdatorn?</translation> <translation>internt fel</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="636"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="832"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="637"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> <source>Done</source> <translation>Klar</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="667"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="668"/> <source>Uploading dive list...</source> <translation>Laddar upp dyklista...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="698"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="699"/> <source>Downloading dive list...</source> <translation>Laddar ner dyklista...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="747"/> <source>Downloading %1 dives...</source> <translation>Laddar ner %1 dyk...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="790"/> <source>Download finished - %1</source> <translation>Nedladdning klar - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> <source>Corrupted download</source> <translation>Misslyckad nedladdning</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> <source>The archive could not be opened: %1</source> <translation>Arkivet kunde inte öppnas: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/> <source>Upload failed</source> <translation>Uppladdning misslyckades</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="850"/> <source>Upload successful</source> <translation>Uppladdningen lyckades</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="853"/> <source>Login failed</source> <translation>Inloggning misslyckades</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="855"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/> <source>Cannot parse response</source> <translation>Kan inte tolka respons</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="867"/> <source>Error: %1</source> <translation>Fel: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="834"/> <source>Upload finished</source> <translation>Uppladdning klar</translation> </message> @@ -1050,7 +1050,7 @@ radera den valda dykdatorn?</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="450"/> <source>Location</source> <translation>Plats</translation> </message> @@ -1091,27 +1091,27 @@ radera den valda dykdatorn?</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="415"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Dive notes</source> <translation>Dykanteckningar</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="607"/> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="245"/> <source>Air temp.</source> <translation>Lufttemp</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="626"/> - <location filename="../qt-ui/maintab.cpp" line="245"/> + <location filename="../qt-ui/maintab.cpp" line="246"/> <source>Water temp.</source> <translation>Vattentemperatur</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="440"/> + <location filename="../qt-ui/maintab.cpp" line="451"/> <source>Notes</source> <translation>Anteckningar</translation> </message> @@ -1228,97 +1228,97 @@ radera den valda dykdatorn?</translation> <translation>Bilder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="88"/> + <location filename="../qt-ui/maintab.cpp" line="89"/> <source>Cylinders</source> <translation>Flaskor</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="89"/> + <location filename="../qt-ui/maintab.cpp" line="90"/> <source>Add Cylinder</source> <translation>Lägg till flaska</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="93"/> <source>Weights</source> <translation>Vikter</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="93"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Add Weight System</source> <translation>Lägg till Viktsystem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="48"/> + <location filename="../qt-ui/maintab.cpp" line="49"/> <source>Save</source> <translation>Spara</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="52"/> + <location filename="../qt-ui/maintab.cpp" line="53"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="241"/> + <location filename="../qt-ui/maintab.cpp" line="242"/> <source>Air temp. [%1]</source> <translation>Lufttemperatur [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="242"/> + <location filename="../qt-ui/maintab.cpp" line="243"/> <source>Water temp. [%1]</source> <translation>Vattentemperatur [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="277"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>This trip is being edited.</source> <translation>Detta resmål håller på och ändras.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="284"/> + <location filename="../qt-ui/maintab.cpp" line="285"/> <source>Multiple dives are being edited.</source> <translation>Flera dyk håller på och ändras.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="286"/> + <location filename="../qt-ui/maintab.cpp" line="287"/> <source>This dive is being edited.</source> <translation>Detta dyk håller på och ändras.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="386"/> - <location filename="../qt-ui/maintab.cpp" line="410"/> + <location filename="../qt-ui/maintab.cpp" line="397"/> + <location filename="../qt-ui/maintab.cpp" line="421"/> <source>Trip notes</source> <translation>Resmålsanteckningar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="408"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> <source>Trip location</source> <translation>Resmål</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="461"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> - <location filename="../qt-ui/maintab.cpp" line="502"/> - <location filename="../qt-ui/maintab.cpp" line="503"/> - <location filename="../qt-ui/maintab.cpp" line="504"/> + <location filename="../qt-ui/maintab.cpp" line="472"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> + <location filename="../qt-ui/maintab.cpp" line="513"/> + <location filename="../qt-ui/maintab.cpp" line="514"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="463"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>unknown</source> <translation>okänd</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="500"/> + <location filename="../qt-ui/maintab.cpp" line="511"/> <source>Deepest dive</source> <translation>Djupaste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="501"/> + <location filename="../qt-ui/maintab.cpp" line="512"/> <source>Shallowest dive</source> <translation>Grundaste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="556"/> <source>These gases could be mixed from Air and using: </source> @@ -1327,17 +1327,17 @@ mixas av luft och: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="549"/> + <location filename="../qt-ui/maintab.cpp" line="560"/> <source> and </source> <translation>och</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="797"/> + <location filename="../qt-ui/maintab.cpp" line="808"/> <source>Discard the changes?</source> <translation>Kassera ändringarna?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="798"/> + <location filename="../qt-ui/maintab.cpp" line="809"/> <source>You are about to discard your changes.</source> <translation>Du är påväg att kasta bort dina förändringar</translation> </message> @@ -1817,70 +1817,70 @@ p, li { white-space: pre-wrap; } <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker lägga till ett dyk.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="421"/> + <location filename="../qt-ui/mainwindow.cpp" line="422"/> <source>Print runtime table</source> <translation>Skriv ut körtidstabell</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="516"/> + <location filename="../qt-ui/mainwindow.cpp" line="522"/> <source>Yearly statistics</source> <translation>Årsstatistik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="701"/> + <location filename="../qt-ui/mainwindow.cpp" line="707"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vill du spara ändringarna som du gjort i filen %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="703"/> + <location filename="../qt-ui/mainwindow.cpp" line="709"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vill du spara ändringarna som du gjort i filen?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="708"/> + <location filename="../qt-ui/mainwindow.cpp" line="714"/> <source>Save changes?</source> <translation>Spara ändringar?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1066"/> + <location filename="../qt-ui/mainwindow.cpp" line="1072"/> <source>Save file as</source> <translation>Spara fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1190"/> + <location filename="../qt-ui/mainwindow.cpp" line="1196"/> <source>Open dive log file</source> <translation>Öppna dyklogg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1191"/> + <location filename="../qt-ui/mainwindow.cpp" line="1197"/> <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source> <translation>Dykloggfiler (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML filer (*.xml);;UDDF/UDCF filer(*.uddf *.udcf);;JDiveLog filer(*.jlb);;Suunto filer(*.sde *.db);;CSV Files(*.csv);;Alla filer(*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="709"/> + <location filename="../qt-ui/mainwindow.cpp" line="715"/> <source>Changes will be lost if you don't save them.</source> <translation>Ändringar förloras om du inte sparar dom.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="251"/> <location filename="../qt-ui/mainwindow.cpp" line="390"/> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Warning</source> <translation>Varning</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="188"/> - <location filename="../qt-ui/mainwindow.cpp" line="1050"/> + <location filename="../qt-ui/mainwindow.cpp" line="1056"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker öppna en ny fil.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1067"/> + <location filename="../qt-ui/mainwindow.cpp" line="1073"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Först avsluta den aktuella ändringen innan du försöker göra en annan.</translation> </message> @@ -1888,15 +1888,45 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="444"/> + <location filename="../qt-ui/diveplanner.cpp" line="450"/> + <source>ft/min</source> + <translation>ft/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="451"/> <source>Last stop at 20ft</source> <translation>Sista stoppet på 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="451"/> + <location filename="../qt-ui/diveplanner.cpp" line="452"/> + <source>50% avg. depth to 20ft</source> + <translation>50% av snittdjup till 20ft</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="453"/> + <source>20ft to surface</source> + <translation>20ft till ytan</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="455"/> + <source>m/min</source> + <translation>m/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="456"/> <source>Last stop at 6m</source> <translation>Sista stoppet på 6m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="457"/> + <source>50% avg. depth to 6m</source> + <translation>50% av snittdjup till 6m</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="458"/> + <source>6m to surface</source> + <translation>6m till ytan</translation> + </message> </context> <context> <name>PreferencesDialog</name> @@ -1942,146 +1972,151 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/preferences.ui" line="198"/> + <source>Use default</source> + <translation>Använd standardvärden</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="247"/> + <location filename="../qt-ui/preferences.ui" line="257"/> <source>Animations</source> <translation>Animationer</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="253"/> + <location filename="../qt-ui/preferences.ui" line="263"/> <source>Speed</source> <translation>Hastighet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Clear all settings</source> <translation>Rensa alla inställningar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="312"/> + <location filename="../qt-ui/preferences.ui" line="322"/> <source>Reset all settings to their default value</source> <translation>Återställ alla inställningar till deras standardvärde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="341"/> + <location filename="../qt-ui/preferences.ui" line="351"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="348"/> + <location filename="../qt-ui/preferences.ui" line="358"/> <source>Metric</source> <translation>Metrisk</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="358"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="368"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Personalize</source> <translation>Personifiera</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="392"/> + <location filename="../qt-ui/preferences.ui" line="402"/> <source>Depth</source> <translation>Djup</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="399"/> + <location filename="../qt-ui/preferences.ui" line="409"/> <source>meter</source> <translation>meter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="409"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>feet</source> <translation>fot</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="426"/> + <location filename="../qt-ui/preferences.ui" line="436"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="436"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="453"/> + <location filename="../qt-ui/preferences.ui" line="463"/> <source>liter</source> <translation>liter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="463"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>cu ft</source> <translation>ft³</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="490"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="490"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="507"/> + <location filename="../qt-ui/preferences.ui" line="517"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="772"/> + <location filename="../qt-ui/preferences.ui" line="782"/> <source>System default</source> <translation>Systemets standardvärde</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="811"/> + <location filename="../qt-ui/preferences.ui" line="821"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="817"/> + <location filename="../qt-ui/preferences.ui" line="827"/> <source>Proxy type</source> <translation>Proxy typ</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="830"/> + <location filename="../qt-ui/preferences.ui" line="840"/> <source>Host</source> <translation>Värd</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="856"/> + <location filename="../qt-ui/preferences.ui" line="866"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="882"/> + <location filename="../qt-ui/preferences.ui" line="892"/> <source>Requires authentication</source> <translation>Kräver authentisering</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="912"/> <source>Username</source> <translation>Användarnamn</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="925"/> + <location filename="../qt-ui/preferences.ui" line="935"/> <source>Password</source> <translation>Lösenord</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="802"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="419"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>Pressure</source> <translation>Tryck</translation> </message> @@ -2096,82 +2131,82 @@ p, li { white-space: pre-wrap; } <translation>Standard dykloggfil</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="207"/> + <location filename="../qt-ui/preferences.ui" line="217"/> <source>Display invalid</source> <translation>Display ogiltig</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="224"/> + <location filename="../qt-ui/preferences.ui" line="234"/> <source>Default cylinder</source> <translation>Standardflaska</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="230"/> + <location filename="../qt-ui/preferences.ui" line="240"/> <source>Use default cylinder</source> <translation>Använd standardflaska</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="280"/> + <location filename="../qt-ui/preferences.ui" line="290"/> <source>Subsurface web service</source> <translation>Subsurface webbtjänst</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="286"/> + <location filename="../qt-ui/preferences.ui" line="296"/> <source>Default user ID</source> <translation>Förvalt användarid</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Save user ID locally?</source> <translation>Spara användarid lokalt?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="446"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>Volume</source> <translation>Volym</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="473"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="500"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>Weight</source> <translation>Vikt</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="517"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="532"/> + <location filename="../qt-ui/preferences.ui" line="542"/> <source>Time units</source> <translation>Tidsenheter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="545"/> + <location filename="../qt-ui/preferences.ui" line="555"/> <source>Minutes</source> <translation>Minuter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="555"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Seconds</source> <translation>Sekunder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="587"/> + <location filename="../qt-ui/preferences.ui" line="597"/> <source>Show</source> <translation>Visa</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="756"/> + <location filename="../qt-ui/preferences.ui" line="766"/> <source>GFLow at max depth</source> <translation>GFLow på maxdjup</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="716"/> + <location filename="../qt-ui/preferences.ui" line="726"/> <source>Misc</source> <translation>Blandat</translation> </message> @@ -2181,52 +2216,52 @@ p, li { white-space: pre-wrap; } <translation>Inställningar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="538"/> + <location filename="../qt-ui/preferences.ui" line="548"/> <source>Ascent/descent speed denominator</source> <translation>Hastighetsnämnare</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="598"/> + <location filename="../qt-ui/preferences.ui" line="608"/> <source>Threshold when showing pO₂</source> <translation>Tröskelvärde vid visning av pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="619"/> + <location filename="../qt-ui/preferences.ui" line="629"/> <source>Threshold when showing pN₂</source> <translation>Tröskelvärde vid visning av pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="640"/> + <location filename="../qt-ui/preferences.ui" line="650"/> <source>Threshold when showing pHe</source> <translation>Tröskelvärde vid visning av pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="661"/> + <location filename="../qt-ui/preferences.ui" line="671"/> <source>Max pO₂ when showing MOD</source> <translation>Maximalt pO₂, för visning av MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="682"/> + <location filename="../qt-ui/preferences.ui" line="692"/> <source>Draw dive computer reported ceiling red</source> <translation>Visa dykdatorrapporterad takinformation i rött</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="693"/> + <location filename="../qt-ui/preferences.ui" line="703"/> <source>Show unused cylinders in Equipment tab</source> <translation>Visa oanvända flaskor i utrustningsfliken</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="704"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Show average depth</source> <translation>Visa medeldjup</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="722"/> + <location filename="../qt-ui/preferences.ui" line="732"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="739"/> + <location filename="../qt-ui/preferences.ui" line="749"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> @@ -2251,32 +2286,32 @@ p, li { white-space: pre-wrap; } <translation>SOCKS proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="245"/> + <location filename="../qt-ui/preferences.cpp" line="247"/> <source>Restart required</source> <translation>Omstart krävs</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="246"/> + <location filename="../qt-ui/preferences.cpp" line="248"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>För att ladda nytt språk fullständigt måste Subsurface startas om.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="395"/> + <location filename="../qt-ui/preferences.cpp" line="398"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>Om du klickar OK, alla inställningar i Subsurface kommer att återställas till deras standardvärden. Det här kommer att hända omedelbart.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Open default log file</source> <translation>Öppna standarddykloggen</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="394"/> + <location filename="../qt-ui/preferences.cpp" line="397"/> <source>Warning</source> <translation>Varning</translation> </message> @@ -2371,51 +2406,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/printoptions.ui" line="145"/> + <source>1 dive per page</source> + <translation>Ett dyk per sida</translation> + </message> + <message> + <location filename="../qt-ui/printoptions.ui" line="158"/> <source>Table print</source> <translation>Tabellutskrift</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="162"/> + <location filename="../qt-ui/printoptions.ui" line="175"/> <source>Ordering</source> <translation>Sortering</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="180"/> + <location filename="../qt-ui/printoptions.ui" line="193"/> <source>Profile on top</source> <translation>Profil ovanpå</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="202"/> + <location filename="../qt-ui/printoptions.ui" line="215"/> <source>Notes on top</source> <translation>Anteckningar ovanpå</translation> </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="219"/> - <source>Sizing heights (% of layout)</source> - <translation>Dimensionering av höjder (% av layout)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="256"/> - <source>Profile height (43% - 85%)</source> - <translation>Profilhöjd (43% - 85%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="278"/> - <source>Other data height (8% - 17%)</source> - <translation>Höjd på övriga uppgifter (8% - 17%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="338"/> - <source>Notes height (0% - 52%)</source> - <translation>Anteckningar höjd (0% - 52%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="354"/> - <location filename="../qt-ui/printoptions.ui" line="370"/> - <location filename="../qt-ui/printoptions.ui" line="386"/> - <source>0</source> - <translation>0</translation> - </message> </context> <context> <name>ProfilePrintModel</name> @@ -2493,77 +2506,77 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="520"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="515"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="898"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="895"/> <source>Make first divecomputer</source> <translation>Gör till första dykdator</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="900"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="897"/> <source>Delete this divecomputer</source> <translation>Ta bort den här dykdatorn</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="907"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/> <source>Add gas change</source> <translation>Lägg till gasbyte</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="918"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="915"/> <source>Add bookmark</source> <translation>Lägg till bokmärke</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="922"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="919"/> <source>Remove event</source> <translation>Ta bort händelse</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/> <source>Hide similar events</source> <translation>Göm liknande händelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="930"/> <source>Edit name</source> <translation>Ändra namn</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="947"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="944"/> <source>Unhide all events</source> <translation>Visa alla händelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide events</source> <translation>Göm händelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide all %1 events?</source> <translation>Göm alla %1händelser</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1016"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1013"/> <source>Remove the selected event?</source> <translation>Ta bort markerad händelse</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1017"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1014"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1082"/> <source>Edit name of bookmark</source> <translation>Ändra namnet på bokmärket</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1086"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1083"/> <source>Custom name:</source> <translation>Valt namn:</translation> </message> @@ -2576,7 +2589,7 @@ p, li { white-space: pre-wrap; } <translation>LUFT</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="212"/> + <location filename="../qt-ui/diveplanner.cpp" line="210"/> <source>Remove this point</source> <translation>Ta bort denna punkt</translation> </message> @@ -2646,22 +2659,22 @@ p, li { white-space: pre-wrap; } <translation>ft³</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/> <source>Invalid response from server</source> <translation>Ogiltigt svar från server</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="529"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Förväntade XML tag 'DiveDateReader' men fick istället '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="575"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Förväntad XML tagg 'DiveDates' gick ej att finna</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> <source>Malformed XML response. Line %1: %2</source> <translation>Felformaterat XML svar. Rad %1: %2</translation> </message> @@ -2826,42 +2839,47 @@ p, li { white-space: pre-wrap; } <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="337"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="338"/> <source>Webservice</source> <translation>Webbtjänst</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="401"/> <source>Connecting...</source> <translation>Ansluter...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="420"/> <source>Download finished</source> <translation>Nedladdning klar</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="433"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="434"/> <source>Download error: %1</source> <translation>Nedladdningsfel: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/> <source>Connection error: </source> <translation>Kontaktfel:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/> <source>Download successful</source> <translation>Nedladdningen lyckades</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="447"/> <source>Invalid user identifier!</source> <translation>Ogiltigt användarid!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="321"/> + <source>Enter User ID and click Download</source> + <translation>Mata in användarid och klicka på nerladdning</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/> <source>Cannot parse response!</source> <translation>Kan inte tolka respons</translation> </message> @@ -2903,42 +2921,42 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="35"/> + <location filename="../qt-ui/updatemanager.cpp" line="33"/> <source>Check for updates.</source> <translation>Sök efter uppdateringar</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <location filename="../qt-ui/updatemanager.cpp" line="34"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface kunde inte kolla efter uppdateringar.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="41"/> + <location filename="../qt-ui/updatemanager.cpp" line="39"/> <source>The following error occurred:</source> <translation>Följande fel inträffade:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <location filename="../qt-ui/updatemanager.cpp" line="40"/> <source>Please check your internet connection.</source> <translation>Verifiera att du har en fungerande uppkoppling till internet.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="51"/> + <location filename="../qt-ui/updatemanager.cpp" line="49"/> <source>You are using the latest version of subsurface.</source> <translation>Du använder den senaste versionen av Subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="53"/> + <location filename="../qt-ui/updatemanager.cpp" line="51"/> <source>A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>Det finns en ny version av Subsurface tillgänglig.<br/>Klicka på:<br/><a href="%1">%1</a><br/> för att ladda ner den.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="56"/> + <location filename="../qt-ui/updatemanager.cpp" line="54"/> <source><b>A new version of subsurface is available.</b><br/><br/>%1</source> <translation><b>Det finns en ny version av Subsurface tillgänglig.</b><br/><br/>%1</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="57"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>Ett fel uppstod vid sökningen efter uppdateringar.<br/><br/>%1</translation> </message> @@ -2951,8 +2969,8 @@ p, li { white-space: pre-wrap; } <translation>Användarmanual</translation> </message> <message> - <location filename="../qt-ui/usermanual.cpp" line="70"/> - <location filename="../qt-ui/usermanual.cpp" line="76"/> + <location filename="../qt-ui/usermanual.cpp" line="72"/> + <location filename="../qt-ui/usermanual.cpp" line="78"/> <source>Cannot find the Subsurface manual</source> <translation>Kan inte hitta Subsurface manualen</translation> </message> @@ -3038,27 +3056,27 @@ Language: %1</source> <translation>Språk: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="74"/> + <location filename="../qt-ui/usersurvey.cpp" line="72"/> <source>Should we ask you later?</source> <translation>Ska vi fråga dig senare?</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="75"/> + <location filename="../qt-ui/usersurvey.cpp" line="73"/> <source>Don't ask me again</source> <translation>Fråga inte mig igen</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="76"/> + <location filename="../qt-ui/usersurvey.cpp" line="74"/> <source>Ask later</source> <translation>Fråga senare</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="96"/> + <location filename="../qt-ui/usersurvey.cpp" line="94"/> <source>Submit user survey.</source> <translation>Skicka in användarundersökningen.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="77"/> + <location filename="../qt-ui/usersurvey.cpp" line="75"/> <source>Ask again?</source> <translation>Fråga igen?</translation> </message> @@ -3070,27 +3088,27 @@ OS CPU Architecture: %1</source> OS CPU Arkitektur: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="97"/> + <location filename="../qt-ui/usersurvey.cpp" line="95"/> <source>Subsurface was unable to submit the user survey.</source> <translation>Subsurface kunde inte skicka in användarundersökningen.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="102"/> + <location filename="../qt-ui/usersurvey.cpp" line="100"/> <source>The following error occurred:</source> <translation>Följande fel inträffade:</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="103"/> + <location filename="../qt-ui/usersurvey.cpp" line="101"/> <source>Please check your internet connection.</source> <translation>Verifiera att du har en fungerande uppkoppling till internet.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="112"/> + <location filename="../qt-ui/usersurvey.cpp" line="110"/> <source>Survey successfully submitted.</source> <translation>Undersökningen har blivit inskickad.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="117"/> + <location filename="../qt-ui/usersurvey.cpp" line="115"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>Ett fel uppstod vid sökningen efter uppdateringar.<br/><br/>%1</translation> </message> @@ -3267,13 +3285,13 @@ Medel</translation> </message> <message> <location filename="../dive.c" line="128"/> - <location filename="../qt-gui.cpp" line="323"/> + <location filename="../qt-gui.cpp" line="329"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="132"/> - <location filename="../qt-gui.cpp" line="326"/> + <location filename="../qt-gui.cpp" line="332"/> <source>psi</source> <translation>psi</translation> </message> @@ -3284,16 +3302,16 @@ Medel</translation> </message> <message> <location filename="../dive.c" line="203"/> - <location filename="../qt-gui.cpp" line="205"/> - <location filename="../qt-gui.cpp" line="220"/> + <location filename="../qt-gui.cpp" line="211"/> + <location filename="../qt-gui.cpp" line="226"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="208"/> - <location filename="../qt-gui.cpp" line="208"/> - <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="214"/> + <location filename="../qt-gui.cpp" line="228"/> <source>ft</source> <translation>ft</translation> </message> @@ -3319,15 +3337,15 @@ Medel</translation> </message> <message> <location filename="../dive.c" line="259"/> - <location filename="../qt-gui.cpp" line="231"/> - <location filename="../qt-gui.cpp" line="241"/> + <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="247"/> <source>lbs</source> <translation>pund</translation> </message> <message> <location filename="../dive.c" line="263"/> - <location filename="../qt-gui.cpp" line="229"/> - <location filename="../qt-gui.cpp" line="239"/> + <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="245"/> <source>kg</source> <translation>kg</translation> </message> @@ -3337,36 +3355,36 @@ Medel</translation> <translation>(%s) eller (%s)</translation> </message> <message> - <location filename="../divelist.c" line="467"/> - <location filename="../equipment.c" line="104"/> - <location filename="../planner.c" line="986"/> - <location filename="../planner.c" line="989"/> + <location filename="../divelist.c" line="460"/> + <location filename="../equipment.c" line="79"/> + <location filename="../planner.c" line="988"/> + <location filename="../planner.c" line="991"/> <location filename="../statistics.c" line="355"/> <source>air</source> <translation>luft</translation> </message> <message> - <location filename="../equipment.c" line="210"/> + <location filename="../equipment.c" line="185"/> <source>integrated</source> <translation>integrerat</translation> </message> <message> - <location filename="../equipment.c" line="211"/> + <location filename="../equipment.c" line="186"/> <source>belt</source> <translation>bälte</translation> </message> <message> - <location filename="../equipment.c" line="212"/> + <location filename="../equipment.c" line="187"/> <source>ankle</source> <translation>ankel</translation> </message> <message> - <location filename="../equipment.c" line="213"/> + <location filename="../equipment.c" line="188"/> <source>backplate weight</source> <translation>Ryggplattans vikt</translation> </message> <message> - <location filename="../equipment.c" line="214"/> + <location filename="../equipment.c" line="189"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -3677,131 +3695,130 @@ Medel</translation> <translation>Kunde inte öppna formatmall %s</translation> </message> <message> - <location filename="../equipment.c" line="106"/> + <location filename="../equipment.c" line="81"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="159"/> - <location filename="../planner.c" line="761"/> + <location filename="../planner.c" line="763"/> <source>Can't find gas %s</source> <translation>Kan inte hitta gas %s</translation> </message> <message> - <location filename="../planner.c" line="345"/> + <location filename="../planner.c" line="347"/> <source>Too many gas mixes</source> <translation>För många gasblandningar</translation> </message> <message> - <location filename="../planner.c" line="526"/> + <location filename="../planner.c" line="528"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>VARNING: DETTA ÄR EN NY IMPLEMENTATION AV BÜHLMANN'S DEKO ALGORITM OCH EN DYKPLANERARE BASERAD PÅ DEN, OCH KODEN HAR SETT ENDAST LITE TESTNING. VI FÖRESLÅR ATT MAN INTE GÖR DYK BASERADE ENBART PÅ RESULTATEN AV DENNA PLAN!</translation> </message> <message> - <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="537"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>baserad på GFlow = %d och GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="538"/> + <location filename="../planner.c" line="540"/> <source>Subsurface dive plan</source> <translation>Subsurface dykplan</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="544"/> <source>depth</source> <translation>djup</translation> </message> <message> - <location filename="../planner.c" line="545"/> + <location filename="../planner.c" line="547"/> <source>runtime</source> <translation>körtid</translation> </message> <message> - <location filename="../planner.c" line="548"/> + <location filename="../planner.c" line="550"/> <source>duration</source> <translation>varaktighet</translation> </message> <message> - <location filename="../planner.c" line="551"/> + <location filename="../planner.c" line="553"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="585"/> + <location filename="../planner.c" line="587"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Förflytta till %.*f %s på %d:%02d min - körtid %d:%02u på %s</translation> </message> <message> - <location filename="../planner.c" line="595"/> + <location filename="../planner.c" line="597"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Stanna vid %.*f %s för %d:%02d min - körtid %d:%02u på %s</translation> </message> <message> - <location filename="../planner.c" line="606"/> + <location filename="../planner.c" line="608"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="609"/> - <location filename="../planner.c" line="613"/> + <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="615"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="629"/> + <location filename="../planner.c" line="631"/> <source>Switch gas to %s</source> <translation>Byt gas till %s</translation> </message> <message> - <location filename="../planner.c" line="642"/> + <location filename="../planner.c" line="644"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="644"/> + <location filename="../planner.c" line="646"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="649"/> <source>Gas consumption:</source> <translation>Gasförbrukning:</translation> </message> <message> - <location filename="../planner.c" line="667"/> - <location filename="../planner.c" line="672"/> - <location filename="../planner.c" line="695"/> + <location filename="../planner.c" line="669"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="697"/> <source>Warning:</source> <translation>Varning:</translation> </message> <message> - <location filename="../planner.c" line="668"/> + <location filename="../planner.c" line="670"/> <source>this is more gas than available in the specified cylinder!</source> <translation>det här är mer gas än vad som finns tillgängligt i angiven cylinder!</translation> </message> <message> - <location filename="../planner.c" line="673"/> + <location filename="../planner.c" line="675"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>inte nog med reserver för att kunna dela gas under uppstigningen!</translation> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="677"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s vid planerad uppstigning)</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="679"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planerad uppstigning) av %s</translation> </message> <message> - <location filename="../planner.c" line="692"/> + <location filename="../planner.c" line="694"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>högt pO₂ %.2f vid %d:%02u med gas %s på djup %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="990"/> + <location filename="../planner.c" line="992"/> <source>ean</source> <translation>ean</translation> </message> @@ -4036,22 +4053,22 @@ EADD: %d%s <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="281"/> + <location filename="../qt-gui.cpp" line="287"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="284"/> + <location filename="../qt-gui.cpp" line="290"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="417"/> + <location filename="../qt-gui.cpp" line="427"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dyk)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="422"/> + <location filename="../qt-gui.cpp" line="432"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 dyk)</translation> </message> @@ -4201,97 +4218,97 @@ EADD: %d%s <translation>(inga dyk)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sun</source> <translation>sön</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Mon</source> <translation>mån</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Tue</source> <translation>tis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Wed</source> <translation>ons</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Thu</source> <translation>tor</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Fri</source> <translation>fre</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sat</source> <translation>lör</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>May</source> <translation>maj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Dec</source> <translation>dec</translation> </message> @@ -4613,21 +4630,6 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/plannerSettings.ui" line="94"/> - <source>75%-50% avg. depth</source> - <translation>75%-50% av snittdjup</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="111"/> - <source>50% avg. depth - 6m/20ft</source> - <translation>50% av snittdjup - 6m/20ft</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="128"/> - <source>6m/20ft to surface</source> - <translation>6m/20ft till ytan</translation> - </message> - <message> <location filename="../qt-ui/plannerSettings.ui" line="148"/> <source>Descent</source> <translation>Nedstigning</translation> @@ -4659,8 +4661,8 @@ Is the Uemis Zurich plugged in correctly?</source> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="288"/> - <source>Last Stop at 6m/20ft</source> - <translation>Sista stop på 6m/20ft</translation> + <source>Last stop at 6m</source> + <translation>Sista stoppet på 6m</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="295"/> @@ -4724,6 +4726,21 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>bar</translation> </message> <message> + <location filename="../qt-ui/plannerSettings.ui" line="94"/> + <source>75% to 50% avg. depth</source> + <translation>75% till 50% av snittdjup</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="111"/> + <source>50% avg. depth to 6m</source> + <translation>50% av snittdjup till 6m</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="128"/> + <source>6m to surface</source> + <translation>6m till ytan</translation> + </message> + <message> <location filename="../qt-ui/plannerSettings.ui" line="442"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>I dykplanen, visa körtid (absolut tid) av stop</translation> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index cb14100a5..8cb47405a 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -25,17 +25,17 @@ <message> <location filename="../qt-ui/models.cpp" line="69"/> <source>Work press.</source> - <translation type="unfinished"/> + <translation>Ấn làm việc.</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="69"/> <source>Start press.</source> - <translation type="unfinished"/> + <translation>Ấn bắt đầu.</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="69"/> <source>End press.</source> - <translation type="unfinished"/> + <translation>Ấn kết thúc.</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="70"/> @@ -50,12 +50,12 @@ <message> <location filename="../qt-ui/models.cpp" line="365"/> <source>Cylinder cannot be removed</source> - <translation type="unfinished"/> + <translation>Xi lanh không thể được gỡ bỏ</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="366"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> - <translation type="unfinished"/> + <translation>Khí này hiện đang được sử dụng. Chỉ các xi lanh không được sử dụng khi lặn có thể được gỡ bỏ.</translation> </message> </context> <context> @@ -63,7 +63,7 @@ <message> <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/> <source>Remove the selected dive computer?</source> - <translation type="unfinished"/> + <translation>Loại bỏ các Máy Lặn đã chọn?</translation> </message> <message> <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/> @@ -75,7 +75,7 @@ bỏ các máy lặn đã được chọn?</translation> <message> <location filename="../qt-ui/divecomputermanagementdialog.ui" line="17"/> <source>Edit dive computer nicknames</source> - <translation type="unfinished"/> + <translation>Chỉnh sửa tên thiết bị lặn</translation> </message> </context> <context> @@ -98,24 +98,24 @@ bỏ các máy lặn đã được chọn?</translation> <message> <location filename="../qt-ui/models.cpp" line="1452"/> <source>Clicking here will remove this dive computer.</source> - <translation type="unfinished"/> + <translation>Click vào đây sẽ loại bỏ thông tin về máy lặn này.</translation> </message> </context> <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="107"/> <source>Bailing out to OC</source> <translation>Thoát đến OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="103"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="109"/> <source> begin</source> <comment>Starts with space!</comment> <translation>bắt đầu</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="104"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="110"/> <source> end</source> <comment>Starts with space!</comment> <translation>kết thúc</translation> @@ -134,240 +134,240 @@ bỏ các máy lặn đã được chọn?</translation> <message> <location filename="../qt-ui/divelistview.cpp" line="53"/> <source>Show search box</source> - <translation type="unfinished"/> + <translation>Hiển thị hộp tìm kiếm</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="705"/> + <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>Expand all</source> <translation>Mở rộng tất cả</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="706"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>Collapse all</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="707"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>Collapse others</source> - <translation type="unfinished"/> + <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="709"/> + <location filename="../qt-ui/divelistview.cpp" line="711"/> <source>Remove dive(s) from trip</source> - <translation type="unfinished"/> + <translation>Loại bỏ (các)máy lặn từ chuyến đi</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="712"/> <source>Create new trip above</source> <translation>Tạo một chuyến đi mới phía trước</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>Add dive(s) to trip immediately above</source> - <translation type="unfinished"/> + <translation>Thêm (các)chuyến đi lặn ngay lập tức ở trên</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="726"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>Add dive(s) to trip immediately below</source> - <translation type="unfinished"/> + <translation>Thêm (các)chuyến đi lặn ngay lập tức ở dưới</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="730"/> + <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>Merge trip with trip above</source> <translation>Gập chuyến đi với chuyến đi trước</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="731"/> + <location filename="../qt-ui/divelistview.cpp" line="733"/> <source>Merge trip with trip below</source> <translation>Gộp chuyến đi với chuyến đi bên dưới</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="737"/> <source>Delete dive(s)</source> - <translation type="unfinished"/> + <translation>Xóa (các)lần lặn</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="737"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>Mark dive(s) invalid</source> - <translation type="unfinished"/> + <translation>Đánh dấu (các)lần lặn không hợp lệ</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="741"/> + <location filename="../qt-ui/divelistview.cpp" line="743"/> <source>Merge selected dives</source> - <translation type="unfinished"/> + <translation>Hợp nhất các lần lặn được chọn</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="745"/> <source>Renumber dive(s)</source> - <translation type="unfinished"/> + <translation>Đánh dấu lại (các)lần lặn</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="746"/> <source>Shift times</source> - <translation type="unfinished"/> + <translation>Chuyển thời gian</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="747"/> <source>Load images</source> - <translation type="unfinished"/> + <translation>Tải hình ảnh</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Open image files</source> - <translation type="unfinished"/> + <translation>Mở tập tin hình ảnh</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> - <translation type="unfinished"/> + <translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> </context> <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="30"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="35"/> <source>Export format</source> <translation>Định dạng của dữ liệu xuất</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="42"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="47"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="61"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="66"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="74"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="79"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="84"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="89"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="94"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="99"/> <source>Worldmap</source> <translation>Bản đồ thế giới</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="112"/> <source>Selection</source> <translation>Lựa chọn</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="116"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="121"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="208"/> <source>Selected dives</source> <translation>Các lần lặn đã được chọn</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="126"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="131"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="234"/> <source>All dives</source> <translation>Tất cả các lần lặn</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="178"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="183"/> <source>HTML</source> <translation>HTML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="216"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="221"/> <source>Minimum Javascript</source> <translation>Minimum Javascript</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="14"/> <source>Export dive log files</source> - <translation type="unfinished"/> + <translation>Xuất dữ liệu tập tin lưu trữ lần lặn</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="24"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="29"/> <source>General export</source> - <translation type="unfinished"/> + <translation>Chỉnh sửa chung cho xuất dữ liệu</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="184"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>General settings</source> - <translation type="unfinished"/> + <translation>Cài đặt chung</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="190"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="195"/> <source>Subsurface numbers</source> - <translation type="unfinished"/> + <translation>Số hiệu Subsurface</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="239"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export list only</source> - <translation type="unfinished"/> + <translation>Chỉ danh sách xuất dữ liệu</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="252"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="257"/> <source>Style options</source> - <translation type="unfinished"/> + <translation>Chỉnh phần trang trí</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="264"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="269"/> <source>Font</source> <translation>Kiểu chữ</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="274"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="279"/> <source>Font size</source> <translation>Kích thước kiểu chữ</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="285"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="320"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="323"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="328"/> <source>Theme</source> <translation>Giao diện</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> <source>Light</source> <translation>Sáng</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Sand</source> <translation>Cát</translation> </message> @@ -628,42 +628,42 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="137"/> + <location filename="../qt-ui/diveplanner.cpp" line="135"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="622"/> + <location filename="../qt-ui/diveplanner.cpp" line="634"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="624"/> + <location filename="../qt-ui/diveplanner.cpp" line="636"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="626"/> + <location filename="../qt-ui/diveplanner.cpp" line="638"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="628"/> + <location filename="../qt-ui/diveplanner.cpp" line="640"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="630"/> + <location filename="../qt-ui/diveplanner.cpp" line="642"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="925"/> + <location filename="../qt-ui/diveplanner.cpp" line="938"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="926"/> + <location filename="../qt-ui/diveplanner.cpp" line="939"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -671,17 +671,17 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="255"/> + <location filename="../qt-ui/diveplanner.cpp" line="254"/> <source>Dive planner points</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="259"/> + <location filename="../qt-ui/diveplanner.cpp" line="258"/> <source>Available gases</source> <translation>Dưỡng khí hiện có</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="282"/> + <location filename="../qt-ui/diveplanner.cpp" line="281"/> <source>Add dive data point</source> <translation type="unfinished"/> </message> @@ -855,69 +855,69 @@ bỏ các máy lặn đã được chọn?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="636"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="832"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="637"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="667"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="668"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="698"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="699"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="747"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="790"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="850"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="853"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="855"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="867"/> <source>Error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="834"/> <source>Upload finished</source> <translation type="unfinished"/> </message> @@ -1049,7 +1049,7 @@ bỏ các máy lặn đã được chọn?</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="450"/> <source>Location</source> <translation>Địa điểm</translation> </message> @@ -1090,27 +1090,27 @@ bỏ các máy lặn đã được chọn?</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="415"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="607"/> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="245"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="626"/> - <location filename="../qt-ui/maintab.cpp" line="245"/> + <location filename="../qt-ui/maintab.cpp" line="246"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="440"/> + <location filename="../qt-ui/maintab.cpp" line="451"/> <source>Notes</source> <translation>Ghi chú</translation> </message> @@ -1227,114 +1227,114 @@ bỏ các máy lặn đã được chọn?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="88"/> + <location filename="../qt-ui/maintab.cpp" line="89"/> <source>Cylinders</source> <translation>Xilanh</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="89"/> + <location filename="../qt-ui/maintab.cpp" line="90"/> <source>Add Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="93"/> <source>Weights</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="93"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Add Weight System</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="48"/> + <location filename="../qt-ui/maintab.cpp" line="49"/> <source>Save</source> <translation>Lưu lại</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="52"/> + <location filename="../qt-ui/maintab.cpp" line="53"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="241"/> + <location filename="../qt-ui/maintab.cpp" line="242"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="242"/> + <location filename="../qt-ui/maintab.cpp" line="243"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="277"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="284"/> + <location filename="../qt-ui/maintab.cpp" line="285"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="286"/> + <location filename="../qt-ui/maintab.cpp" line="287"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="386"/> - <location filename="../qt-ui/maintab.cpp" line="410"/> + <location filename="../qt-ui/maintab.cpp" line="397"/> + <location filename="../qt-ui/maintab.cpp" line="421"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="408"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="461"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> - <location filename="../qt-ui/maintab.cpp" line="502"/> - <location filename="../qt-ui/maintab.cpp" line="503"/> - <location filename="../qt-ui/maintab.cpp" line="504"/> + <location filename="../qt-ui/maintab.cpp" line="472"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> + <location filename="../qt-ui/maintab.cpp" line="513"/> + <location filename="../qt-ui/maintab.cpp" line="514"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> <source>/min</source> <translation>/nhỏ nhất</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="463"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="500"/> + <location filename="../qt-ui/maintab.cpp" line="511"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="501"/> + <location filename="../qt-ui/maintab.cpp" line="512"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="556"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="549"/> + <location filename="../qt-ui/maintab.cpp" line="560"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="797"/> + <location filename="../qt-ui/maintab.cpp" line="808"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="798"/> + <location filename="../qt-ui/maintab.cpp" line="809"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -1810,70 +1810,70 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="421"/> + <location filename="../qt-ui/mainwindow.cpp" line="422"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="516"/> + <location filename="../qt-ui/mainwindow.cpp" line="522"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="701"/> + <location filename="../qt-ui/mainwindow.cpp" line="707"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="703"/> + <location filename="../qt-ui/mainwindow.cpp" line="709"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="708"/> + <location filename="../qt-ui/mainwindow.cpp" line="714"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1066"/> + <location filename="../qt-ui/mainwindow.cpp" line="1072"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1190"/> + <location filename="../qt-ui/mainwindow.cpp" line="1196"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1191"/> + <location filename="../qt-ui/mainwindow.cpp" line="1197"/> <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="709"/> + <location filename="../qt-ui/mainwindow.cpp" line="715"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="251"/> <location filename="../qt-ui/mainwindow.cpp" line="390"/> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="188"/> - <location filename="../qt-ui/mainwindow.cpp" line="1050"/> + <location filename="../qt-ui/mainwindow.cpp" line="1056"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1067"/> + <location filename="../qt-ui/mainwindow.cpp" line="1073"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -1881,15 +1881,45 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="444"/> - <source>Last stop at 20ft</source> + <location filename="../qt-ui/diveplanner.cpp" line="450"/> + <source>ft/min</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="451"/> + <source>Last stop at 20ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="452"/> + <source>50% avg. depth to 20ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="453"/> + <source>20ft to surface</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="455"/> + <source>m/min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="456"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="457"/> + <source>50% avg. depth to 6m</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="458"/> + <source>6m to surface</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesDialog</name> @@ -1935,146 +1965,151 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/preferences.ui" line="198"/> + <source>Use default</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="247"/> + <location filename="../qt-ui/preferences.ui" line="257"/> <source>Animations</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="253"/> + <location filename="../qt-ui/preferences.ui" line="263"/> <source>Speed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Clear all settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="312"/> + <location filename="../qt-ui/preferences.ui" line="322"/> <source>Reset all settings to their default value</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="341"/> + <location filename="../qt-ui/preferences.ui" line="351"/> <source>System</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="348"/> + <location filename="../qt-ui/preferences.ui" line="358"/> <source>Metric</source> <translation>Số liệu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="358"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Imperial</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="368"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Personalize</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="392"/> + <location filename="../qt-ui/preferences.ui" line="402"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="399"/> + <location filename="../qt-ui/preferences.ui" line="409"/> <source>meter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="409"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>feet</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="426"/> + <location filename="../qt-ui/preferences.ui" line="436"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="436"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="453"/> + <location filename="../qt-ui/preferences.ui" line="463"/> <source>liter</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="463"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>cu ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="490"/> <source>celsius</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="490"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>fahrenheit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="507"/> + <location filename="../qt-ui/preferences.ui" line="517"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="772"/> + <location filename="../qt-ui/preferences.ui" line="782"/> <source>System default</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="811"/> + <location filename="../qt-ui/preferences.ui" line="821"/> <source>Proxy</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="817"/> + <location filename="../qt-ui/preferences.ui" line="827"/> <source>Proxy type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="830"/> + <location filename="../qt-ui/preferences.ui" line="840"/> <source>Host</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="856"/> + <location filename="../qt-ui/preferences.ui" line="866"/> <source>Port</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="882"/> + <location filename="../qt-ui/preferences.ui" line="892"/> <source>Requires authentication</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="912"/> <source>Username</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="925"/> + <location filename="../qt-ui/preferences.ui" line="935"/> <source>Password</source> <translation>Mật khẩu</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="802"/> <source>Filter</source> <translation>Bộ lọc</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="419"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>Pressure</source> <translation>Áp suất</translation> </message> @@ -2089,82 +2124,82 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="207"/> + <location filename="../qt-ui/preferences.ui" line="217"/> <source>Display invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="224"/> + <location filename="../qt-ui/preferences.ui" line="234"/> <source>Default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="230"/> + <location filename="../qt-ui/preferences.ui" line="240"/> <source>Use default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="280"/> + <location filename="../qt-ui/preferences.ui" line="290"/> <source>Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="286"/> + <location filename="../qt-ui/preferences.ui" line="296"/> <source>Default user ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Save user ID locally?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="446"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>Volume</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="473"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>Temperature</source> <translation>Nhiệt độ</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="500"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="517"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="532"/> + <location filename="../qt-ui/preferences.ui" line="542"/> <source>Time units</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="545"/> + <location filename="../qt-ui/preferences.ui" line="555"/> <source>Minutes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="555"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Seconds</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="587"/> + <location filename="../qt-ui/preferences.ui" line="597"/> <source>Show</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="756"/> + <location filename="../qt-ui/preferences.ui" line="766"/> <source>GFLow at max depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="716"/> + <location filename="../qt-ui/preferences.ui" line="726"/> <source>Misc</source> <translation type="unfinished"/> </message> @@ -2174,52 +2209,52 @@ p, li { white-space: pre-wrap; } <translation>Tùy biến</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="538"/> + <location filename="../qt-ui/preferences.ui" line="548"/> <source>Ascent/descent speed denominator</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="598"/> + <location filename="../qt-ui/preferences.ui" line="608"/> <source>Threshold when showing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="619"/> + <location filename="../qt-ui/preferences.ui" line="629"/> <source>Threshold when showing pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="640"/> + <location filename="../qt-ui/preferences.ui" line="650"/> <source>Threshold when showing pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="661"/> + <location filename="../qt-ui/preferences.ui" line="671"/> <source>Max pO₂ when showing MOD</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="682"/> + <location filename="../qt-ui/preferences.ui" line="692"/> <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="693"/> + <location filename="../qt-ui/preferences.ui" line="703"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="704"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Show average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="722"/> + <location filename="../qt-ui/preferences.ui" line="732"/> <source>GFLow</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.ui" line="739"/> + <location filename="../qt-ui/preferences.ui" line="749"/> <source>GFHigh</source> <translation type="unfinished"/> </message> @@ -2244,32 +2279,32 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="245"/> + <location filename="../qt-ui/preferences.cpp" line="247"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="246"/> + <location filename="../qt-ui/preferences.cpp" line="248"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="395"/> + <location filename="../qt-ui/preferences.cpp" line="398"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Open default log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="394"/> + <location filename="../qt-ui/preferences.cpp" line="397"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -2364,51 +2399,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/printoptions.ui" line="145"/> + <source>1 dive per page</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/printoptions.ui" line="158"/> <source>Table print</source> <translation>In bảng</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="162"/> + <location filename="../qt-ui/printoptions.ui" line="175"/> <source>Ordering</source> <translation>Đang sắp trật tự</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="180"/> + <location filename="../qt-ui/printoptions.ui" line="193"/> <source>Profile on top</source> <translation>Hồ sơ trên cùng</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="202"/> + <location filename="../qt-ui/printoptions.ui" line="215"/> <source>Notes on top</source> <translation>Ghi chú trên cùng</translation> </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="219"/> - <source>Sizing heights (% of layout)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="256"/> - <source>Profile height (43% - 85%)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="278"/> - <source>Other data height (8% - 17%)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="338"/> - <source>Notes height (0% - 52%)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="354"/> - <location filename="../qt-ui/printoptions.ui" line="370"/> - <location filename="../qt-ui/printoptions.ui" line="386"/> - <source>0</source> - <translation type="unfinished"/> - </message> </context> <context> <name>ProfilePrintModel</name> @@ -2486,77 +2499,77 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="520"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="515"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="898"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="895"/> <source>Make first divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="900"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="897"/> <source>Delete this divecomputer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="907"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="918"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="915"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="922"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="919"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="930"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="947"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="944"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1016"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1013"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1017"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1014"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1082"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1086"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1083"/> <source>Custom name:</source> <translation type="unfinished"/> </message> @@ -2569,7 +2582,7 @@ p, li { white-space: pre-wrap; } <translation>KHÔNG KHÍ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="212"/> + <location filename="../qt-ui/diveplanner.cpp" line="210"/> <source>Remove this point</source> <translation type="unfinished"/> </message> @@ -2639,22 +2652,22 @@ p, li { white-space: pre-wrap; } <translation>cuft</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="529"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="575"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> @@ -2741,7 +2754,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="226"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> - <translation type="unfinished"/> + <translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> </context> <context> @@ -2819,42 +2832,47 @@ p, li { white-space: pre-wrap; } <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="337"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="338"/> <source>Webservice</source> <translation>Dịch vụ web</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="401"/> <source>Connecting...</source> <translation>Đang kết nối...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="420"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="433"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="434"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/> <source>Connection error: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/> <source>Download successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="447"/> <source>Invalid user identifier!</source> <translation>Nhận dạng người dùng không hợp lệ!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="321"/> + <source>Enter User ID and click Download</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/> <source>Cannot parse response!</source> <translation>Không nhận được trả lời!</translation> </message> @@ -2896,42 +2914,42 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="35"/> + <location filename="../qt-ui/updatemanager.cpp" line="33"/> <source>Check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <location filename="../qt-ui/updatemanager.cpp" line="34"/> <source>Subsurface was unable to check for updates.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="41"/> + <location filename="../qt-ui/updatemanager.cpp" line="39"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <location filename="../qt-ui/updatemanager.cpp" line="40"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="51"/> + <location filename="../qt-ui/updatemanager.cpp" line="49"/> <source>You are using the latest version of subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="53"/> + <location filename="../qt-ui/updatemanager.cpp" line="51"/> <source>A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="56"/> + <location filename="../qt-ui/updatemanager.cpp" line="54"/> <source><b>A new version of subsurface is available.</b><br/><br/>%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="57"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation type="unfinished"/> </message> @@ -2944,8 +2962,8 @@ p, li { white-space: pre-wrap; } <translation>Hướng dẫn sử dụng</translation> </message> <message> - <location filename="../qt-ui/usermanual.cpp" line="70"/> - <location filename="../qt-ui/usermanual.cpp" line="76"/> + <location filename="../qt-ui/usermanual.cpp" line="72"/> + <location filename="../qt-ui/usermanual.cpp" line="78"/> <source>Cannot find the Subsurface manual</source> <translation type="unfinished"/> </message> @@ -3031,27 +3049,27 @@ Language: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="74"/> + <location filename="../qt-ui/usersurvey.cpp" line="72"/> <source>Should we ask you later?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="75"/> + <location filename="../qt-ui/usersurvey.cpp" line="73"/> <source>Don't ask me again</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="76"/> + <location filename="../qt-ui/usersurvey.cpp" line="74"/> <source>Ask later</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="96"/> + <location filename="../qt-ui/usersurvey.cpp" line="94"/> <source>Submit user survey.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="77"/> + <location filename="../qt-ui/usersurvey.cpp" line="75"/> <source>Ask again?</source> <translation type="unfinished"/> </message> @@ -3062,27 +3080,27 @@ OS CPU Architecture: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="97"/> + <location filename="../qt-ui/usersurvey.cpp" line="95"/> <source>Subsurface was unable to submit the user survey.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="102"/> + <location filename="../qt-ui/usersurvey.cpp" line="100"/> <source>The following error occurred:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="103"/> + <location filename="../qt-ui/usersurvey.cpp" line="101"/> <source>Please check your internet connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="112"/> + <location filename="../qt-ui/usersurvey.cpp" line="110"/> <source>Survey successfully submitted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="117"/> + <location filename="../qt-ui/usersurvey.cpp" line="115"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation type="unfinished"/> </message> @@ -3252,13 +3270,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="128"/> - <location filename="../qt-gui.cpp" line="323"/> + <location filename="../qt-gui.cpp" line="329"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="132"/> - <location filename="../qt-gui.cpp" line="326"/> + <location filename="../qt-gui.cpp" line="332"/> <source>psi</source> <translation>psi</translation> </message> @@ -3269,16 +3287,16 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="203"/> - <location filename="../qt-gui.cpp" line="205"/> - <location filename="../qt-gui.cpp" line="220"/> + <location filename="../qt-gui.cpp" line="211"/> + <location filename="../qt-gui.cpp" line="226"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="208"/> - <location filename="../qt-gui.cpp" line="208"/> - <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="214"/> + <location filename="../qt-gui.cpp" line="228"/> <source>ft</source> <translation>ft</translation> </message> @@ -3304,15 +3322,15 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="259"/> - <location filename="../qt-gui.cpp" line="231"/> - <location filename="../qt-gui.cpp" line="241"/> + <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="247"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="263"/> - <location filename="../qt-gui.cpp" line="229"/> - <location filename="../qt-gui.cpp" line="239"/> + <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="245"/> <source>kg</source> <translation>ký</translation> </message> @@ -3322,36 +3340,36 @@ Maximum</source> <translation>(%s) hoặc (%s)</translation> </message> <message> - <location filename="../divelist.c" line="467"/> - <location filename="../equipment.c" line="104"/> - <location filename="../planner.c" line="986"/> - <location filename="../planner.c" line="989"/> + <location filename="../divelist.c" line="460"/> + <location filename="../equipment.c" line="79"/> + <location filename="../planner.c" line="988"/> + <location filename="../planner.c" line="991"/> <location filename="../statistics.c" line="355"/> <source>air</source> <translation>không khí</translation> </message> <message> - <location filename="../equipment.c" line="210"/> + <location filename="../equipment.c" line="185"/> <source>integrated</source> <translation>được tích hợp</translation> </message> <message> - <location filename="../equipment.c" line="211"/> + <location filename="../equipment.c" line="186"/> <source>belt</source> <translation>dây ràng</translation> </message> <message> - <location filename="../equipment.c" line="212"/> + <location filename="../equipment.c" line="187"/> <source>ankle</source> <translation>mắt cá chân</translation> </message> <message> - <location filename="../equipment.c" line="213"/> + <location filename="../equipment.c" line="188"/> <source>backplate weight</source> <translation>cân nặng giáp che</translation> </message> <message> - <location filename="../equipment.c" line="214"/> + <location filename="../equipment.c" line="189"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -3658,131 +3676,130 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../equipment.c" line="106"/> + <location filename="../equipment.c" line="81"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="159"/> - <location filename="../planner.c" line="761"/> + <location filename="../planner.c" line="763"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="345"/> + <location filename="../planner.c" line="347"/> <source>Too many gas mixes</source> <translation>Quá nhiều dưỡng khí được trộn</translation> </message> <message> - <location filename="../planner.c" line="526"/> + <location filename="../planner.c" line="528"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>THẬN TRỌNG / CẢNH BÁO: ĐÂY LÀ PHẦN HOÀN THIỆN MỚI CỦA THUẬT TOÁN BUHLMANN VÀ DỰ TOÁN VỀ VIỆC LẶN DỰA TRÊN CÁC THÔNG SỐ NHẬN ĐƯỢC TỪ MỘT SỐ HỮU HẠN CÁC CUỘC THỬ NGHIỆM. CHÚNG TÔI MẠNH MẼ KHUYẾN CÁO BẠN KHÔNG NÊN HOÀN TOÀN DỰA VÀO CÁC THÔNG SỐ NÀY.</translation> </message> <message> - <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="537"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="538"/> + <location filename="../planner.c" line="540"/> <source>Subsurface dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="544"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="545"/> + <location filename="../planner.c" line="547"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="548"/> + <location filename="../planner.c" line="550"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="551"/> + <location filename="../planner.c" line="553"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="585"/> + <location filename="../planner.c" line="587"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="595"/> + <location filename="../planner.c" line="597"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="606"/> + <location filename="../planner.c" line="608"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="609"/> - <location filename="../planner.c" line="613"/> + <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="615"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="629"/> + <location filename="../planner.c" line="631"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="642"/> + <location filename="../planner.c" line="644"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="644"/> + <location filename="../planner.c" line="646"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="649"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="667"/> - <location filename="../planner.c" line="672"/> - <location filename="../planner.c" line="695"/> + <location filename="../planner.c" line="669"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="697"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="668"/> + <location filename="../planner.c" line="670"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="673"/> + <location filename="../planner.c" line="675"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="675"/> + <location filename="../planner.c" line="677"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="679"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="692"/> + <location filename="../planner.c" line="694"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="990"/> + <location filename="../planner.c" line="992"/> <source>ean</source> <translation>ean</translation> </message> @@ -3986,22 +4003,22 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="281"/> + <location filename="../qt-gui.cpp" line="287"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="284"/> + <location filename="../qt-gui.cpp" line="290"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="417"/> + <location filename="../qt-gui.cpp" line="427"/> <source>%1 %2 (%3 dives)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="422"/> + <location filename="../qt-gui.cpp" line="432"/> <source>%1 %2 (1 dive)</source> <translation type="unfinished"/> </message> @@ -4151,97 +4168,97 @@ EADD: %d%s <translation>(không có cuộc lặn nào)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sun</source> <translation>CN</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Mon</source> <translation>T2</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Tue</source> <translation>T3</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Wed</source> <translation>T4</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Thu</source> <translation>T5</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Fri</source> <translation>T6</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sat</source> <translation>T7</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jan</source> <translation>Th1</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Feb</source> <translation>Th2</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mar</source> <translation>Th3</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>May</source> <translation>Th5</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jun</source> <translation>Th6</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Jul</source> <translation>Th7</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Aug</source> <translation>Th8</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Sep</source> <translation>Th9</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Oct</source> <translation>Th10</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Nov</source> <translation>Th11</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Dec</source> <translation>Th12</translation> </message> @@ -4563,21 +4580,6 @@ Uemis Zurich đã được gắn vào đúng cách chưa?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/plannerSettings.ui" line="94"/> - <source>75%-50% avg. depth</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="111"/> - <source>50% avg. depth - 6m/20ft</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="128"/> - <source>6m/20ft to surface</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/plannerSettings.ui" line="148"/> <source>Descent</source> <translation type="unfinished"/> @@ -4609,7 +4611,7 @@ Uemis Zurich đã được gắn vào đúng cách chưa?</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="288"/> - <source>Last Stop at 6m/20ft</source> + <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> @@ -4674,6 +4676,21 @@ Uemis Zurich đã được gắn vào đúng cách chưa?</translation> <translation>bar</translation> </message> <message> + <location filename="../qt-ui/plannerSettings.ui" line="94"/> + <source>75% to 50% avg. depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="111"/> + <source>50% avg. depth to 6m</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="128"/> + <source>6m to surface</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/plannerSettings.ui" line="442"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> |